SERVER-18826 Rename WorkingSet State Names from LOC to RID

Also renamed:
 * WorkingSetMember::hasLoc() -> WorkingSetMember::hasRecordId
 * WorkingSetMember::loc -> WorkingSetMember::recordId

1 files changed, 11 insertions, 11 deletions

diff --git a/src/mongo/db/exec/near.cpp b/src/mongo/db/exec/near.cpp
index 1eedc41c1ba..e3f0ed7781d 100644
--- a/src/mongo/db/exec/near.cpp
+++ b/src/mongo/db/exec/near.cpp
@@ -186,8 +186,8 @@ PlanStage::StageState NearStage::bufferNext(WorkingSetID* toReturn, Status* erro
     WorkingSetMember* nextMember = _workingSet->get(nextMemberID);
 
     // The child stage may not dedup so we must dedup them ourselves.
-    if (_nextInterval->dedupCovering && nextMember->hasLoc()) {
-        if (_seenDocuments.end() != _seenDocuments.find(nextMember->loc)) {
+    if (_nextInterval->dedupCovering && nextMember->hasRecordId()) {
+        if (_seenDocuments.end() != _seenDocuments.find(nextMember->recordId)) {
             _workingSet->free(nextMemberID);
             return PlanStage::NEED_TIME;
         }
@@ -212,8 +212,8 @@ PlanStage::StageState NearStage::bufferNext(WorkingSetID* toReturn, Status* erro
     _resultBuffer.push(SearchResult(nextMemberID, memberDistance));
 
     // Store the member's RecordId, if available, for quick invalidation
-    if (nextMember->hasLoc()) {
-        _seenDocuments.insert(std::make_pair(nextMember->loc, nextMemberID));
+    if (nextMember->hasRecordId()) {
+        _seenDocuments.insert(std::make_pair(nextMember->recordId, nextMemberID));
     }
 
     return PlanStage::NEED_TIME;
@@ -235,8 +235,8 @@ PlanStage::StageState NearStage::advanceNext(WorkingSetID* toReturn) {
         // Throw out all documents with memberDistance < minDistance
         if (memberDistance < _nextInterval->minDistance) {
             WorkingSetMember* member = _workingSet->get(result.resultID);
-            if (member->hasLoc()) {
-                _seenDocuments.erase(member->loc);
+            if (member->hasRecordId()) {
+                _seenDocuments.erase(member->recordId);
             }
             _resultBuffer.pop();
             _workingSet->free(result.resultID);
@@ -269,8 +269,8 @@ PlanStage::StageState NearStage::advanceNext(WorkingSetID* toReturn) {
     // calls to invalidate don't cause us to take action for a RecordId we're done with.
     *toReturn = resultID;
     WorkingSetMember* member = _workingSet->get(*toReturn);
-    if (member->hasLoc()) {
-        _seenDocuments.erase(member->loc);
+    if (member->hasRecordId()) {
+        _seenDocuments.erase(member->recordId);
     }
 
     // This value is used by nextInterval() to determine the size of the next interval.
@@ -291,9 +291,9 @@ void NearStage::doInvalidate(OperationContext* txn, const RecordId& dl, Invalida
 
     if (seenIt != _seenDocuments.end()) {
         WorkingSetMember* member = _workingSet->get(seenIt->second);
-        verify(member->hasLoc());
-        WorkingSetCommon::fetchAndInvalidateLoc(txn, member, _collection);
-        verify(!member->hasLoc());
+        verify(member->hasRecordId());
+        WorkingSetCommon::fetchAndInvalidateRecordId(txn, member, _collection);
+        verify(!member->hasRecordId());
 
         // Don't keep it around in the seen map since there's no valid RecordId anymore
         _seenDocuments.erase(seenIt);