SERVER-13679 Replace DiskLoc with RecordId outside of MMAPv1

Operations:
    sed -i -e 's/\<DiskLoc\>/RecordId/g'
    sed -i -e 's/\<DiskLocs\>/RecordIds/g'
    sed -i -e 's/\<minDiskLoc\>/RecordId::min()/g'
    sed -i -e 's/\<maxDiskLoc\>/RecordId::max()/g'
    sed -i -e 's/\<getDiskLoc\>/getRecordId/g''

Changes under mmap_v1 were reverted and redone by hand as needed.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/dbtests/query_stage_fetch.cpp b/src/mongo/dbtests/query_stage_fetch.cpp
index c126f3e0d7f..a827dafd570 100644
--- a/src/mongo/dbtests/query_stage_fetch.cpp
+++ b/src/mongo/dbtests/query_stage_fetch.cpp
@@ -56,10 +56,10 @@ namespace QueryStageFetch {
             _client.dropCollection(ns());
         }
 
-        void getLocs(set<DiskLoc>* out, Collection* coll) {
+        void getLocs(set<RecordId>* out, Collection* coll) {
             RecordIterator* it = coll->getIterator(&_txn);
             while (!it->isEOF()) {
-                DiskLoc nextLoc = it->getNext();
+                RecordId nextLoc = it->getNext();
                 out->insert(nextLoc);
             }
             delete it;
@@ -100,7 +100,7 @@ namespace QueryStageFetch {
 
             // Add an object to the DB.
             insert(BSON("foo" << 5));
-            set<DiskLoc> locs;
+            set<RecordId> locs;
             getLocs(&locs, coll);
             ASSERT_EQUALS(size_t(1), locs.size());
 
@@ -117,7 +117,7 @@ namespace QueryStageFetch {
                 mockStage->pushBack(mockMember);
 
                 mockMember.state = WorkingSetMember::OWNED_OBJ;
-                mockMember.loc = DiskLoc();
+                mockMember.loc = RecordId();
                 mockMember.obj = BSON("foo" << 6);
                 ASSERT_TRUE(mockMember.obj.isOwned());
                 mockStage->pushBack(mockMember);
@@ -162,7 +162,7 @@ namespace QueryStageFetch {
 
             // Add an object to the DB.
             insert(BSON("foo" << 5));
-            set<DiskLoc> locs;
+            set<RecordId> locs;
             getLocs(&locs, coll);
             ASSERT_EQUALS(size_t(1), locs.size());