SERVER-42247 Callers of SortedDataInterface insert and unindex should pass KeyStrings

2 files changed, 1 insertions, 34 deletions

diff --git a/src/mongo/db/storage/mobile/mobile_index.cpp b/src/mongo/db/storage/mobile/mobile_index.cpp
index f66050f6b72..c542bf70b0b 100644
--- a/src/mongo/db/storage/mobile/mobile_index.cpp
+++ b/src/mongo/db/storage/mobile/mobile_index.cpp
@@ -60,18 +60,6 @@ MobileIndex::MobileIndex(OperationContext* opCtx,
       _keyPattern(desc->keyPattern()) {}
 
 Status MobileIndex::insert(OperationContext* opCtx,
-                           const BSONObj& key,
-                           const RecordId& recId,
-                           bool dupsAllowed) {
-    invariant(recId.isValid());
-    invariant(!key.hasFieldNames());
-
-    KeyString::HeapBuilder keyString(_keyStringVersion, key, _ordering, recId);
-
-    return insert(opCtx, std::move(keyString.release()), recId, dupsAllowed);
-}
-
-Status MobileIndex::insert(OperationContext* opCtx,
                            const KeyString::Value& keyString,
                            const RecordId& recId,
                            bool dupsAllowed) {
@@ -118,21 +106,10 @@ Status MobileIndex::doInsert(OperationContext* opCtx,
 }
 
 void MobileIndex::unindex(OperationContext* opCtx,
-                          const BSONObj& key,
-                          const RecordId& recId,
-                          bool dupsAllowed) {
-    invariant(recId.isValid());
-    invariant(!key.hasFieldNames());
-
-    KeyString::HeapBuilder keyString(_keyStringVersion, key, _ordering, recId);
-
-    unindex(opCtx, std::move(keyString.release()), recId, dupsAllowed);
-}
-
-void MobileIndex::unindex(OperationContext* opCtx,
                           const KeyString::Value& keyString,
                           const RecordId& recId,
                           bool dupsAllowed) {
+    invariant(recId.isValid());
     _unindex(opCtx, keyString, recId, dupsAllowed);
 }
 
diff --git a/src/mongo/db/storage/mobile/mobile_index.h b/src/mongo/db/storage/mobile/mobile_index.h
index 2ab95649743..76d48fa47fb 100644
--- a/src/mongo/db/storage/mobile/mobile_index.h
+++ b/src/mongo/db/storage/mobile/mobile_index.h
@@ -53,21 +53,11 @@ public:
     virtual ~MobileIndex() {}
 
     Status insert(OperationContext* opCtx,
-                  const BSONObj& key,
-                  const RecordId& recId,
-                  bool dupsAllowed) override;
-
-    Status insert(OperationContext* opCtx,
                   const KeyString::Value& keyString,
                   const RecordId& recId,
                   bool dupsAllowed) override;
 
     void unindex(OperationContext* opCtx,
-                 const BSONObj& key,
-                 const RecordId& recId,
-                 bool dupsAllowed) override;
-
-    void unindex(OperationContext* opCtx,
                  const KeyString::Value& keyString,
                  const RecordId& recId,
                  bool dupsAllowed) override;