Revert "SERVER-13635 IndexAccessMethods now take a BtreeInterface rather than a RecordStore"

dstorch · dstorch · commit 7ec0d1c33d9b · 2014-06-19T21:31:53.000-04:00
This reverts commit 98a0c6f.
diff --git a/src/mongo/db/index/2d_access_method.cpp b/src/mongo/db/index/2d_access_method.cpp
@@ -42,8 +42,8 @@
 namespace mongo {
 
     TwoDAccessMethod::TwoDAccessMethod(IndexCatalogEntry* btreeState,
-                                       BtreeInterface* btree)
-        : BtreeBasedAccessMethod(btreeState, btree) {
+                                       RecordStore* rs)
+        : BtreeBasedAccessMethod(btreeState, rs) {
 
         const IndexDescriptor* descriptor = btreeState->descriptor();
 
diff --git a/src/mongo/db/index/2d_access_method.h b/src/mongo/db/index/2d_access_method.h
@@ -69,7 +69,7 @@ namespace mongo {
         using BtreeBasedAccessMethod::_descriptor;
 
         TwoDAccessMethod(IndexCatalogEntry* btreeState,
-                         BtreeInterface* btree);
+                         RecordStore* rs);
         virtual ~TwoDAccessMethod() { }
 
     private:
diff --git a/src/mongo/db/index/btree_access_method.cpp b/src/mongo/db/index/btree_access_method.cpp
@@ -40,8 +40,8 @@
 namespace mongo {
 
     // Standard Btree implementation below.
-    BtreeAccessMethod::BtreeAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree )
-        : BtreeBasedAccessMethod(btreeState, btree) {
+    BtreeAccessMethod::BtreeAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs )
+        : BtreeBasedAccessMethod(btreeState, rs) {
 
         // The key generation wants these values.
         vector<const char*> fieldNames;
diff --git a/src/mongo/db/index/btree_access_method.h b/src/mongo/db/index/btree_access_method.h
@@ -52,7 +52,7 @@ namespace mongo {
         using BtreeBasedAccessMethod::_descriptor;
 
         BtreeAccessMethod(IndexCatalogEntry* btreeState,
-                          BtreeInterface* btree );
+                          RecordStore* rs );
         virtual ~BtreeAccessMethod() { }
 
     private:
diff --git a/src/mongo/db/index/btree_based_access_method.cpp b/src/mongo/db/index/btree_based_access_method.cpp
@@ -50,19 +50,31 @@ namespace mongo {
 
     MONGO_EXPORT_SERVER_PARAMETER(failIndexKeyTooLong, bool, true);
 
-    void BtreeBasedAccessMethod::InvalidateCursorsNotification::aboutToDeleteBucket(
-            const DiskLoc& bucket) {
-        BtreeIndexCursor::aboutToDeleteBucket(bucket);
-    }
+    /**
+     * Invalidates all active cursors, which point at the bucket being deleted.
+     */
+    class InvalidateCursorsNotification : public BucketDeletionNotification {
+    public:
+        virtual void aboutToDeleteBucket(const DiskLoc& bucket) {
+            BtreeIndexCursor::aboutToDeleteBucket(bucket);
+        }
+    };
 
-    BtreeBasedAccessMethod::InvalidateCursorsNotification BtreeBasedAccessMethod::invalidateCursors;
+    static InvalidateCursorsNotification invalidateCursors;
 
     BtreeBasedAccessMethod::BtreeBasedAccessMethod(IndexCatalogEntry* btreeState,
-                                                   BtreeInterface* btree)
+                                                   RecordStore* recordStore)
         : _btreeState(btreeState),
-          _descriptor(btreeState->descriptor()),
-          _newInterface(btree) {
+          _recordStore( recordStore ),
+          _descriptor(btreeState->descriptor()) {
+
         verify(0 == _descriptor->version() || 1 == _descriptor->version());
+        _newInterface.reset(BtreeInterface::getInterface(btreeState->headManager(),
+                                                         recordStore,
+                                                         btreeState->ordering(),
+                                                         _descriptor->indexNamespace(),
+                                                         _descriptor->version(),
+                                                         &invalidateCursors));
     }
 
     // Find the keys for obj, put them in the tree pointing to loc
@@ -212,7 +224,7 @@ namespace mongo {
 
 
     Status BtreeBasedAccessMethod::touch( OperationContext* txn ) const {
-        return _btree->touch(txn);
+        return _recordStore->touch( txn, NULL );
     }
 
     DiskLoc BtreeBasedAccessMethod::findSingle(const BSONObj& key) const {
diff --git a/src/mongo/db/index/btree_based_access_method.h b/src/mongo/db/index/btree_based_access_method.h
@@ -37,11 +37,11 @@
 #include "mongo/db/index/index_cursor.h"
 #include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/structure/btree/btree_interface.h"
-#include "mongo/db/structure/btree/bucket_deletion_notification.h"
 
 namespace mongo {
 
     class ExternalSortComparison;
+    class RecordStore;
 
     /**
      * Any access method that is Btree based subclasses from this.
@@ -58,7 +58,7 @@ namespace mongo {
         MONGO_DISALLOW_COPYING( BtreeBasedAccessMethod );
     public:
         BtreeBasedAccessMethod( IndexCatalogEntry* btreeState,
-                                BtreeInterface* btree );
+                                RecordStore* recordStore );
 
         virtual ~BtreeBasedAccessMethod() { }
 
@@ -103,16 +103,6 @@ namespace mongo {
         // XXX: consider migrating callers to use IndexCursor instead
         virtual DiskLoc findSingle( const BSONObj& key ) const;
 
-        /**
-         * Invalidates all active cursors, which point at the bucket being deleted.
-         * TODO see if there is a better place to put this.
-         */
-        class InvalidateCursorsNotification : public BucketDeletionNotification {
-        public:
-            virtual void aboutToDeleteBucket(const DiskLoc& bucket);
-        };
-        static InvalidateCursorsNotification invalidateCursors;
-
     protected:
         // Friends who need getKeys.
         friend class BtreeBasedBulkAccessMethod;
@@ -123,7 +113,7 @@ namespace mongo {
         virtual void getKeys(const BSONObj &obj, BSONObjSet *keys) = 0;
 
         IndexCatalogEntry* _btreeState; // owned by IndexCatalogEntry
-        scoped_ptr<BtreeInterface> _btree; // owned by us
+        scoped_ptr<RecordStore> _recordStore; // owned by us
         const IndexDescriptor* _descriptor;
 
     private:
diff --git a/src/mongo/db/index/btree_based_bulk_access_method.cpp b/src/mongo/db/index/btree_based_bulk_access_method.cpp
@@ -113,6 +113,13 @@ namespace mongo {
 
     Status BtreeBasedBulkAccessMethod::commit(set<DiskLoc>* dupsToDrop,
                                               bool mayInterrupt) {
+        DiskLoc oldHead = _real->_btreeState->head();
+
+        // XXX: do we expect the tree to be empty but have a head set?  Looks like so from old code.
+        invariant(!oldHead.isNull());
+        _real->_btreeState->setHead(_txn, DiskLoc());
+        _real->_recordStore->deleteRecord(_txn, oldHead);
+
         if (_isMultiKey) {
             _real->_btreeState->setMultikey( _txn );
         }
diff --git a/src/mongo/db/index/fts_access_method.cpp b/src/mongo/db/index/fts_access_method.cpp
@@ -31,8 +31,8 @@
 
 namespace mongo {
 
-    FTSAccessMethod::FTSAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree )
-        : BtreeBasedAccessMethod(btreeState, btree), _ftsSpec(btreeState->descriptor()->infoObj()) { }
+    FTSAccessMethod::FTSAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs )
+        : BtreeBasedAccessMethod(btreeState, rs), _ftsSpec(btreeState->descriptor()->infoObj()) { }
 
     void FTSAccessMethod::getKeys(const BSONObj& obj, BSONObjSet* keys) {
         ExpressionKeysPrivate::getFTSKeys(obj, _ftsSpec, keys);
diff --git a/src/mongo/db/index/fts_access_method.h b/src/mongo/db/index/fts_access_method.h
@@ -38,7 +38,7 @@ namespace mongo {
 
     class FTSAccessMethod : public BtreeBasedAccessMethod {
     public:
-        FTSAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree );
+        FTSAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs );
         virtual ~FTSAccessMethod() { }
 
         const fts::FTSSpec& getSpec() const { return _ftsSpec; }
diff --git a/src/mongo/db/index/hash_access_method.cpp b/src/mongo/db/index/hash_access_method.cpp
@@ -33,8 +33,8 @@
 
 namespace mongo {
 
-    HashAccessMethod::HashAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree)
-        : BtreeBasedAccessMethod(btreeState, btree) {
+    HashAccessMethod::HashAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs)
+        : BtreeBasedAccessMethod(btreeState, rs) {
 
         const IndexDescriptor* descriptor = btreeState->descriptor();
 
diff --git a/src/mongo/db/index/hash_access_method.h b/src/mongo/db/index/hash_access_method.h
@@ -45,7 +45,7 @@ namespace mongo {
     public:
         using BtreeBasedAccessMethod::_descriptor;
 
-        HashAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree);
+        HashAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs);
         virtual ~HashAccessMethod() { }
 
     private:
diff --git a/src/mongo/db/index/haystack_access_method.cpp b/src/mongo/db/index/haystack_access_method.cpp
@@ -39,8 +39,8 @@
 
 namespace mongo {
 
-    HaystackAccessMethod::HaystackAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree)
-        : BtreeBasedAccessMethod(btreeState, btree) {
+    HaystackAccessMethod::HaystackAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs)
+        : BtreeBasedAccessMethod(btreeState, rs) {
 
         const IndexDescriptor* descriptor = btreeState->descriptor();
 
diff --git a/src/mongo/db/index/haystack_access_method.h b/src/mongo/db/index/haystack_access_method.h
@@ -57,7 +57,7 @@ namespace mongo {
     public:
         using BtreeBasedAccessMethod::_descriptor;
 
-        HaystackAccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree);
+        HaystackAccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs);
         virtual ~HaystackAccessMethod() { }
 
     protected:
diff --git a/src/mongo/db/index/s2_access_method.cpp b/src/mongo/db/index/s2_access_method.cpp
@@ -43,8 +43,8 @@ namespace mongo {
 
     static const string kIndexVersionFieldName("2dsphereIndexVersion");
 
-    S2AccessMethod::S2AccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree)
-        : BtreeBasedAccessMethod(btreeState, btree) {
+    S2AccessMethod::S2AccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs)
+        : BtreeBasedAccessMethod(btreeState, rs) {
 
         const IndexDescriptor* descriptor = btreeState->descriptor();
 
diff --git a/src/mongo/db/index/s2_access_method.h b/src/mongo/db/index/s2_access_method.h
@@ -43,7 +43,7 @@ namespace mongo {
     public:
         using BtreeBasedAccessMethod::_descriptor;
 
-        S2AccessMethod(IndexCatalogEntry* btreeState, BtreeInterface* btree);
+        S2AccessMethod(IndexCatalogEntry* btreeState, RecordStore* rs);
         virtual ~S2AccessMethod() { }
 
         /**
diff --git a/src/mongo/db/storage/heap1/heap1_database_catalog_entry.cpp b/src/mongo/db/storage/heap1/heap1_database_catalog_entry.cpp
@@ -148,15 +148,7 @@ namespace mongo {
             invariant( type.empty() ); // we don't support other index types right now
 
             HeapRecordStore* rs = new HeapRecordStore( index->descriptor()->indexName() );
-            std::auto_ptr<BtreeInterface> btree(
-                BtreeInterface::getInterface(index->headManager(),
-                                             rs,
-                                             index->ordering(),
-                                             index->descriptor()->indexNamespace(),
-                                             index->descriptor()->version(),
-                                             &BtreeBasedAccessMethod::invalidateCursors));
-
-            i->second->access.reset( new BtreeAccessMethod( index, btree.release()) );
+            i->second->access.reset( new BtreeAccessMethod( index, rs ) );
         }
 
         return i->second->access.get();
diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_database_catalog_entry.cpp
@@ -529,31 +529,23 @@ namespace mongo {
         RecordStore* rs = _getRecordStore( txn, entry->descriptor()->indexNamespace() );
         invariant( rs );
 
-        std::auto_ptr<BtreeInterface> btree(
-            BtreeInterface::getInterface(entry->headManager(),
-                                         rs,
-                                         entry->ordering(),
-                                         entry->descriptor()->indexNamespace(),
-                                         entry->descriptor()->version(),
-                                         &BtreeBasedAccessMethod::invalidateCursors));
-
         if (IndexNames::HASHED == type)
-            return new HashAccessMethod( entry, btree.release() );
+            return new HashAccessMethod( entry, rs );
 
         if (IndexNames::GEO_2DSPHERE == type)
-            return new S2AccessMethod( entry, btree.release() );
+            return new S2AccessMethod( entry, rs );
 
         if (IndexNames::TEXT == type)
-            return new FTSAccessMethod( entry, btree.release() );
+            return new FTSAccessMethod( entry, rs );
 
         if (IndexNames::GEO_HAYSTACK == type)
-            return new HaystackAccessMethod( entry, btree.release() );
+            return new HaystackAccessMethod( entry, rs );
 
         if ("" == type)
-            return new BtreeAccessMethod( entry, btree.release() );
+            return new BtreeAccessMethod( entry, rs );
 
         if (IndexNames::GEO_2D == type)
-            return new TwoDAccessMethod( entry, btree.release() );
+            return new TwoDAccessMethod( entry, rs );
 
         log() << "Can't find index for keyPattern " << entry->descriptor()->keyPattern();
         fassertFailed(17489);
diff --git a/src/mongo/db/structure/btree/btree_interface.cpp b/src/mongo/db/structure/btree/btree_interface.cpp
@@ -110,10 +110,6 @@ namespace mongo {
             return _btree->isEmpty();
         }
 
-        virtual Status touch(OperationContext* txn) const{
-            return _btree->touch(txn);
-        }
-
         class Cursor : public BtreeInterface::Cursor {
         public:
             Cursor(const BtreeLogic<OnDiskFormat>* btree, int direction)
diff --git a/src/mongo/db/structure/btree/btree_interface.h b/src/mongo/db/structure/btree/btree_interface.h
@@ -121,11 +121,6 @@ namespace mongo {
         virtual void fullValidate(long long* numKeysOut) = 0;
 
         virtual bool isEmpty() = 0;
-        
-        /**
-         * Attempt to bring whole index into memory. No-op is ok if not supported.
-         */
-        virtual Status touch(OperationContext* txn) const = 0;
 
         //
         // Navigation
diff --git a/src/mongo/db/structure/btree/btree_logic.cpp b/src/mongo/db/structure/btree/btree_logic.cpp
@@ -56,13 +56,6 @@ namespace mongo {
           _numAdded(0),
           _txn(txn) {
 
-        // XXX: Due to the way bulk building works, we already have an empty root bucket that we
-        // must now dispose of.
-        DiskLoc oldHead = _logic->_headManager->getHead();
-        invariant(!oldHead.isNull());
-        _logic->_headManager->setHead(_txn, DiskLoc());
-        _logic->_recordStore->deleteRecord(_txn, oldHead);
-
         _first = _cur = _logic->_addBucket(txn);
         _b = _getModifiableBucket(_cur);
         _committed = false;
@@ -2048,11 +2041,6 @@ namespace mongo {
         }
     }
 
-    template <class BtreeLayout>
-    Status BtreeLogic<BtreeLayout>::touch(OperationContext* txn) const {
-        return _recordStore->touch( txn, NULL );
-    }
-
     template <class BtreeLayout>
     long long BtreeLogic<BtreeLayout>::fullValidate(long long *unusedCount,
                                                      bool strict,
diff --git a/src/mongo/db/structure/btree/btree_logic.h b/src/mongo/db/structure/btree/btree_logic.h
@@ -178,10 +178,6 @@ namespace mongo {
 
         BSONObj getKey(const DiskLoc& bucketLoc, const int keyOffset) const;
 
-        DiskLoc getHead() const { return _headManager->getHead(); }
-
-        Status touch(OperationContext* txn) const;
-
         //
         // Composite key navigation methods
         //
@@ -210,6 +206,8 @@ namespace mongo {
                              DiskLoc* bucketInOut,
                              int* keyOffsetInOut) const;
 
+        DiskLoc getHead() const { return _headManager->getHead(); }
+
         //
         // Creation and deletion
         //
