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

diff --git a/src/mongo/db/index/btree_based_bulk_access_method.cpp b/src/mongo/db/index/btree_based_bulk_access_method.cpp
index 1936b83ef65..b50769c351e 100644
--- a/src/mongo/db/index/btree_based_bulk_access_method.cpp
+++ b/src/mongo/db/index/btree_based_bulk_access_method.cpp
@@ -56,7 +56,7 @@ namespace mongo {
             invariant(version == 1 || version == 0);
         }
 
-        typedef std::pair<BSONObj, DiskLoc> Data;
+        typedef std::pair<BSONObj, RecordId> Data;
 
         int operator() (const Data& l, const Data& r) const {
             int x = (_version == 1
@@ -91,7 +91,7 @@ namespace mongo {
 
     Status BtreeBasedBulkAccessMethod::insert(OperationContext* txn,
                                               const BSONObj& obj,
-                                              const DiskLoc& loc,
+                                              const RecordId& loc,
                                               const InsertDeleteOptions& options,
                                               int64_t* numInserted) {
         BSONObjSet keys;
@@ -114,7 +114,7 @@ namespace mongo {
         return Status::OK();
     }
 
-    Status BtreeBasedBulkAccessMethod::commit(set<DiskLoc>* dupsToDrop,
+    Status BtreeBasedBulkAccessMethod::commit(set<RecordId>* dupsToDrop,
                                               bool mayInterrupt,
                                               bool dupsAllowed) {
         Timer timer;
@@ -187,4 +187,4 @@ namespace mongo {
 }  // namespace mongo
 
 #include "mongo/db/sorter/sorter.cpp"
-MONGO_CREATE_SORTER(mongo::BSONObj, mongo::DiskLoc, mongo::BtreeExternalSortComparison);
+MONGO_CREATE_SORTER(mongo::BSONObj, mongo::RecordId, mongo::BtreeExternalSortComparison);