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, 3 insertions, 3 deletions

diff --git a/src/mongo/db/dbhelpers.h b/src/mongo/db/dbhelpers.h
index 06a9b2348de..04ac4c611e1 100644
--- a/src/mongo/db/dbhelpers.h
+++ b/src/mongo/db/dbhelpers.h
@@ -86,7 +86,7 @@ namespace mongo {
                             BSONObj& result, 
                             bool requireIndex = false);
 
-        static DiskLoc findOne(OperationContext* txn,
+        static RecordId findOne(OperationContext* txn,
                                Collection* collection,
                                const BSONObj &query,
                                bool requireIndex);
@@ -102,7 +102,7 @@ namespace mongo {
         /* TODO: should this move into Collection?
          * uasserts if no _id index.
          * @return null loc if not found */
-        static DiskLoc findById(OperationContext* txn,
+        static RecordId findById(OperationContext* txn,
                                 Collection* collection, const BSONObj& query);
 
         /** Get/put the first (or last) object from a collection.  Generally only useful if the collection
@@ -191,7 +191,7 @@ namespace mongo {
         static Status getLocsInRange( OperationContext* txn,
                                       const KeyRange& range,
                                       long long maxChunkSizeBytes,
-                                      std::set<DiskLoc>* locs,
+                                      std::set<RecordId>* locs,
                                       long long* numDocs,
                                       long long* estChunkSizeBytes );