SERVER-16444 New API for navigating RecordStores

1 files changed, 6 insertions, 7 deletions

diff --git a/src/mongo/db/repair_database.cpp b/src/mongo/db/repair_database.cpp
index 9bbb8da24de..fccf3ef21e3 100644
--- a/src/mongo/db/repair_database.cpp
+++ b/src/mongo/db/repair_database.cpp
@@ -127,22 +127,21 @@ namespace {
         long long dataSize = 0;
 
         RecordStore* rs = collection->getRecordStore();
-        boost::scoped_ptr<RecordIterator> it(rs->getIterator(txn));
-        while (!it->isEOF()) {
-            RecordId id = it->curr();
-            RecordData data = it->dataFor(id);
-            invariant(id == it->getNext());
+        auto cursor = rs->getCursor(txn);
+        while (auto record = cursor->next()) {
+            RecordId id = record->id;
+            RecordData& data = record->data;
 
             Status status = validateBSON(data.data(), data.size());
             if (!status.isOK()) {
                 log() << "Invalid BSON detected at " << id << ": " << status << ". Deleting.";
-                it->saveState();
+                cursor->savePositioned(); // 'data' is no longer valid.
                 {
                     WriteUnitOfWork wunit(txn);
                     rs->deleteRecord(txn, id);
                     wunit.commit();
                 }
-                it->restoreState(txn);
+                cursor->restore(txn);
                 continue;
             }