SERVER-12213: merge BtreInMemoryState and IndexCatalogEntry

19 files changed, 76 insertions, 66 deletions

diff --git a/src/mongo/db/index/2d_access_method.cpp b/src/mongo/db/index/2d_access_method.cpp
index 0c33e54dd88..001508a21aa 100644
--- a/src/mongo/db/index/2d_access_method.cpp
+++ b/src/mongo/db/index/2d_access_method.cpp
@@ -45,7 +45,7 @@ namespace mongo {
         return def;
     }
 
-    TwoDAccessMethod::TwoDAccessMethod(BtreeInMemoryState* btreeState)
+    TwoDAccessMethod::TwoDAccessMethod(IndexCatalogEntry* btreeState)
         : BtreeBasedAccessMethod(btreeState) {
 
         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
index e3986382569..782162da8b0 100644
--- a/src/mongo/db/index/2d_access_method.h
+++ b/src/mongo/db/index/2d_access_method.h
@@ -35,7 +35,7 @@
 
 namespace mongo {
 
-    class BtreeInMemoryState;
+    class IndexCatalogEntry;
     class IndexCursor;
     class IndexDescriptor;
     struct TwoDIndexingParams;
@@ -69,7 +69,7 @@ namespace mongo {
         using BtreeBasedAccessMethod::_descriptor;
         using BtreeBasedAccessMethod::_interface;
 
-        TwoDAccessMethod(BtreeInMemoryState* btreeState);
+        TwoDAccessMethod(IndexCatalogEntry* btreeState);
         virtual ~TwoDAccessMethod() { }
 
         virtual Status newCursor(IndexCursor** out) const;
diff --git a/src/mongo/db/index/btree_access_method.cpp b/src/mongo/db/index/btree_access_method.cpp
index f3317725bdd..d73ae59e321 100644
--- a/src/mongo/db/index/btree_access_method.cpp
+++ b/src/mongo/db/index/btree_access_method.cpp
@@ -37,11 +37,10 @@
 #include "mongo/db/keypattern.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/pdfile_private.h"
-#include "mongo/db/structure/btree/state-inl.h"
 
 namespace mongo {
 
-    BtreeBasedAccessMethod::BtreeBasedAccessMethod(BtreeInMemoryState* btreeState)
+    BtreeBasedAccessMethod::BtreeBasedAccessMethod(IndexCatalogEntry* btreeState)
         : _btreeState(btreeState), _descriptor(btreeState->descriptor()) {
 
         verify(0 == _descriptor->version() || 1 == _descriptor->version());
@@ -181,15 +180,18 @@ namespace mongo {
     }
 
     DiskLoc BtreeBasedAccessMethod::findSingle( const BSONObj& key ) {
+        DiskLoc head = _btreeState->head();
+        Record* record = _btreeState->recordStore()->recordFor( head );
+
         if ( 0 == _descriptor->version() ) {
-            return _btreeState->getHeadBucket<V0>()->findSingle( _btreeState,
-                                                                 _btreeState->head(),
-                                                                 key );
+            return BtreeBucket<V0>::asVersion( record )->findSingle( _btreeState,
+                                                                     _btreeState->head(),
+                                                                     key );
         }
         if ( 1 == _descriptor->version() ) {
-            return _btreeState->getHeadBucket<V1>()->findSingle( _btreeState,
-                                                                 _btreeState->head(),
-                                                                 key );
+            return BtreeBucket<V1>::asVersion( record )->findSingle( _btreeState,
+                                                                     _btreeState->head(),
+                                                                     key );
         }
         verify( 0 );
     }
@@ -274,7 +276,7 @@ namespace mongo {
     }
 
     // Standard Btree implementation below.
-    BtreeAccessMethod::BtreeAccessMethod(BtreeInMemoryState* btreeState)
+    BtreeAccessMethod::BtreeAccessMethod(IndexCatalogEntry* btreeState)
         : BtreeBasedAccessMethod(btreeState) {
 
         // The key generation wants these values.
diff --git a/src/mongo/db/index/btree_access_method.h b/src/mongo/db/index/btree_access_method.h
index 09028615350..d6c80a7f215 100644
--- a/src/mongo/db/index/btree_access_method.h
+++ b/src/mongo/db/index/btree_access_method.h
@@ -54,7 +54,7 @@ namespace mongo {
         using BtreeBasedAccessMethod::_descriptor;
         using BtreeBasedAccessMethod::_interface;
 
-        BtreeAccessMethod(BtreeInMemoryState* btreeState );
+        BtreeAccessMethod(IndexCatalogEntry* btreeState );
         virtual ~BtreeAccessMethod() { }
 
         virtual Status newCursor(IndexCursor** out) const;
diff --git a/src/mongo/db/index/btree_access_method_internal.h b/src/mongo/db/index/btree_access_method_internal.h
index dc9b41e41db..320c1de8944 100644
--- a/src/mongo/db/index/btree_access_method_internal.h
+++ b/src/mongo/db/index/btree_access_method_internal.h
@@ -37,7 +37,6 @@
 #include "mongo/db/index/index_access_method.h"
 #include "mongo/db/index/index_cursor.h"
 #include "mongo/db/index/index_descriptor.h"
-#include "mongo/db/structure/btree/state.h"
 
 namespace mongo {
 
@@ -52,7 +51,7 @@ namespace mongo {
     class BtreeBasedAccessMethod : public IndexAccessMethod {
         MONGO_DISALLOW_COPYING( BtreeBasedAccessMethod );
     public:
-        BtreeBasedAccessMethod( BtreeInMemoryState* btreeState );
+        BtreeBasedAccessMethod( IndexCatalogEntry* btreeState );
 
         virtual ~BtreeBasedAccessMethod() { }
 
@@ -92,7 +91,7 @@ namespace mongo {
 
         virtual void getKeys(const BSONObj &obj, BSONObjSet *keys) = 0;
 
-        BtreeInMemoryState* _btreeState; // owned by IndexCatalogEntry
+        IndexCatalogEntry* _btreeState; // owned by IndexCatalogEntry
         const IndexDescriptor* _descriptor;
 
         // There are 2 types of Btree disk formats.  We put them both behind one interface.
diff --git a/src/mongo/db/index/btree_based_builder.cpp b/src/mongo/db/index/btree_based_builder.cpp
index acd24d76d76..1a321f43b4e 100644
--- a/src/mongo/db/index/btree_based_builder.cpp
+++ b/src/mongo/db/index/btree_based_builder.cpp
@@ -75,7 +75,7 @@ namespace mongo {
 
     template< class V >
     void buildBottomUpPhases2And3( bool dupsAllowed,
-                                   BtreeInMemoryState* btreeState,
+                                   IndexCatalogEntry* btreeState,
                                    BSONObjExternalSorter& sorter,
                                    bool dropDups,
                                    set<DiskLoc>& dupsToDrop,
@@ -136,7 +136,7 @@ namespace mongo {
         }
     }
 
-    DiskLoc BtreeBasedBuilder::makeEmptyIndex(BtreeInMemoryState* idx) {
+    DiskLoc BtreeBasedBuilder::makeEmptyIndex(IndexCatalogEntry* idx) {
         if (0 == idx->descriptor()->version()) {
             return BtreeBucket<V0>::addBucket(idx);
         } else {
@@ -189,7 +189,7 @@ namespace mongo {
     }
 
     uint64_t BtreeBasedBuilder::fastBuildIndex( Collection* collection,
-                                                BtreeInMemoryState* btreeState,
+                                                IndexCatalogEntry* btreeState,
                                                 bool mayInterrupt ) {
         CurOp * op = cc().curop();
         Timer t;
diff --git a/src/mongo/db/index/btree_based_builder.h b/src/mongo/db/index/btree_based_builder.h
index e003d2b9518..d9515c3f6de 100644
--- a/src/mongo/db/index/btree_based_builder.h
+++ b/src/mongo/db/index/btree_based_builder.h
@@ -44,7 +44,7 @@ namespace mongo {
 
     class Collection;
     class BSONObjExternalSorter;
-    class BtreeInMemoryState;
+    class IndexCatalogEntry;
     class ExternalSortComparison;
     class IndexDescriptor;
     class IndexDetails;
@@ -59,10 +59,10 @@ namespace mongo {
          * Want to build an index?  Call this.  Throws DBException.
          */
         static uint64_t fastBuildIndex(Collection* collection,
-                                       BtreeInMemoryState* descriptor,
+                                       IndexCatalogEntry* descriptor,
                                        bool mayInterrupt);
 
-        static DiskLoc makeEmptyIndex(BtreeInMemoryState* idx);
+        static DiskLoc makeEmptyIndex(IndexCatalogEntry* idx);
 
         static ExternalSortComparison* getComparison(int version,
                                                      const BSONObj& keyPattern);
@@ -89,7 +89,7 @@ namespace mongo {
     // Exposed for testing purposes.
     template< class V >
     void buildBottomUpPhases2And3( bool dupsAllowed,
-                                   BtreeInMemoryState* btreeState,
+                                   IndexCatalogEntry* btreeState,
                                    BSONObjExternalSorter& sorter,
                                    bool dropDups,
                                    set<DiskLoc>& dupsToDrop,
diff --git a/src/mongo/db/index/btree_index_cursor.cpp b/src/mongo/db/index/btree_index_cursor.cpp
index 19cf283e081..2072446d20a 100644
--- a/src/mongo/db/index/btree_index_cursor.cpp
+++ b/src/mongo/db/index/btree_index_cursor.cpp
@@ -43,7 +43,7 @@ namespace mongo {
     SimpleMutex BtreeIndexCursor::_activeCursorsMutex("active_btree_index_cursors");
 
     // Go forward by default.
-    BtreeIndexCursor::BtreeIndexCursor(const BtreeInMemoryState* btreeState,
+    BtreeIndexCursor::BtreeIndexCursor(const IndexCatalogEntry* btreeState,
                                        BtreeInterface *interface)
         : _direction(1), _btreeState(btreeState), _interface(interface),
           _bucket(btreeState->head()), _keyOffset(0) {
diff --git a/src/mongo/db/index/btree_index_cursor.h b/src/mongo/db/index/btree_index_cursor.h
index c1fc45181d3..0b1fadcfba0 100644
--- a/src/mongo/db/index/btree_index_cursor.h
+++ b/src/mongo/db/index/btree_index_cursor.h
@@ -36,7 +36,6 @@
 #include "mongo/db/index/btree_interface.h"
 #include "mongo/db/index/index_cursor.h"
 #include "mongo/db/index/index_descriptor.h"
-#include "mongo/db/structure/btree/state.h"
 
 namespace mongo {
 
@@ -86,7 +85,7 @@ namespace mongo {
         static SimpleMutex _activeCursorsMutex;
 
         // Go forward by default.
-        BtreeIndexCursor(const BtreeInMemoryState* btreeState, BtreeInterface *interface);
+        BtreeIndexCursor(const IndexCatalogEntry* btreeState, BtreeInterface *interface);
 
         void skipUnusedKeys();
 
@@ -102,7 +101,7 @@ namespace mongo {
         BSONObj _emptyObj;
 
         int _direction;
-        const BtreeInMemoryState* _btreeState; // not-owned
+        const IndexCatalogEntry* _btreeState; // not-owned
         BtreeInterface* _interface;
 
         // What are we looking at RIGHT NOW?  We look at a bucket.
diff --git a/src/mongo/db/index/btree_interface.cpp b/src/mongo/db/index/btree_interface.cpp
index 448a6abf9f2..f5a741665d9 100644
--- a/src/mongo/db/index/btree_interface.cpp
+++ b/src/mongo/db/index/btree_interface.cpp
@@ -26,11 +26,11 @@
  *    it in the license file.
  */
 
-#include "mongo/db/structure/btree/btree.h"
-#include "mongo/db/structure/btree/state.h"
-#include "mongo/db/structure/btree/state-inl.h"
+#include "mongo/db/catalog/index_catalog_entry.h"
 #include "mongo/db/index/btree_interface.h"
 #include "mongo/db/pdfile.h"
+#include "mongo/db/structure/btree/btree.h"
+#include "mongo/db/structure/record_store.h"
 
 namespace mongo {
 
@@ -41,14 +41,24 @@ namespace mongo {
 
         virtual ~BtreeInterfaceImpl() { }
 
-        virtual int bt_insert(BtreeInMemoryState* btreeState,
+        const BtreeBucket<Version>* getHeadBucket( const IndexCatalogEntry* entry ) const {
+            return getBucket( entry->head() );
+        }
+
+        const BtreeBucket<Version>* getBucket( const IndexCatalogEntry* entry,
+                                               const DiskLoc& loc ) const {
+            Record* record = entry->recordStore()->recordFor( loc );
+            return BtreeBucket<Version>::asVersion( record );
+        }
+
+        virtual int bt_insert(IndexCatalogEntry* btreeState,
                               const DiskLoc thisLoc,
                               const DiskLoc recordLoc,
                               const BSONObj& key,
                               bool dupsallowed,
                               bool toplevel) {
             // FYI: toplevel has a default value of true in btree.h
-            return btreeState->getBucket<Version>(thisLoc)->bt_insert(btreeState,
+            return getBucket( btreeState, thisLoc )->bt_insert(btreeState,
                                                                       thisLoc,
                                                                       recordLoc,
                                                                       key,
@@ -56,17 +66,17 @@ namespace mongo {
                                                                       toplevel);
         }
 
-        virtual bool unindex(BtreeInMemoryState* btreeState,
+        virtual bool unindex(IndexCatalogEntry* btreeState,
                              const DiskLoc thisLoc,
                              const BSONObj& key,
                              const DiskLoc recordLoc) {
-            return btreeState->getBucket<Version>(thisLoc)->unindex(btreeState,
+            return getBucket( btreeState, thisLoc )->unindex(btreeState,
                                                                     thisLoc,
                                                                     key,
                                                                     recordLoc);
         }
 
-        virtual DiskLoc locate(const BtreeInMemoryState* btreeState,
+        virtual DiskLoc locate(const IndexCatalogEntry* btreeState,
                                const DiskLoc& thisLoc,
                                const BSONObj& key,
                                int& pos,
@@ -74,7 +84,7 @@ namespace mongo {
                                const DiskLoc& recordLoc,
                                int direction) const {
             // FYI: direction has a default of 1
-            return btreeState->getBucket<Version>(thisLoc)->locate(btreeState,
+            return getBucket( btreeState, thisLoc )->locate(btreeState,
                                                                    thisLoc,
                                                                    key,
                                                                    pos,
@@ -83,18 +93,18 @@ namespace mongo {
                                                                    direction);
         }
 
-        virtual bool wouldCreateDup(const BtreeInMemoryState* btreeState,
+        virtual bool wouldCreateDup(const IndexCatalogEntry* btreeState,
                                     const DiskLoc& thisLoc,
                                     const BSONObj& key,
                                     const DiskLoc& self) const {
             typename Version::KeyOwned ownedVersion(key);
-            return btreeState->getBucket<Version>(thisLoc)->wouldCreateDup(btreeState,
+            return getBucket( btreeState, thisLoc )->wouldCreateDup(btreeState,
                                                                            thisLoc,
                                                                            ownedVersion,
                                                                            self);
         }
 
-        virtual void customLocate(const BtreeInMemoryState* btreeState,
+        virtual void customLocate(const IndexCatalogEntry* btreeState,
                                   DiskLoc& locInOut,
                                   int& keyOfs,
                                   const BSONObj& keyBegin,
@@ -114,7 +124,7 @@ namespace mongo {
                                                       bestParent);
         }
 
-        virtual void advanceTo(const BtreeInMemoryState* btreeState,
+        virtual void advanceTo(const IndexCatalogEntry* btreeState,
                                DiskLoc &thisLoc,
                                int &keyOfs,
                                const BSONObj &keyBegin,
@@ -123,7 +133,7 @@ namespace mongo {
                                const vector<const BSONElement*>& keyEnd,
                                const vector<bool>& keyEndInclusive,
                                int direction) const {
-            return btreeState->getBucket<Version>(thisLoc)->advanceTo(btreeState,
+            return getBucket( btreeState, thisLoc )->advanceTo(btreeState,
                                                                       thisLoc,
                                                                       keyOfs,
                                                                       keyBegin,
@@ -176,26 +186,26 @@ namespace mongo {
             }
         }
 
-        virtual string dupKeyError(const BtreeInMemoryState* btreeState,
+        virtual string dupKeyError(const IndexCatalogEntry* btreeState,
                                    DiskLoc bucket,
                                    const BSONObj& keyObj) const {
             typename Version::KeyOwned key(keyObj);
-            return btreeState->getBucket<Version>( bucket )->dupKeyError(btreeState->descriptor(),
-                                                                         key);
+            return getBucket( btreeState, bucket )->dupKeyError(btreeState->descriptor(),
+                                                                key);
         }
 
-        virtual DiskLoc advance(const BtreeInMemoryState* btreeState,
+        virtual DiskLoc advance(const IndexCatalogEntry* btreeState,
                                 const DiskLoc& thisLoc,
                                 int& keyOfs,
                                 int direction,
                                 const char* caller) const {
-            return btreeState->getBucket<Version>(thisLoc)->advance(thisLoc, keyOfs, direction, caller);
+            return getBucket( btreeState, thisLoc )->advance(thisLoc, keyOfs, direction, caller);
         }
 
-        virtual long long fullValidate(const BtreeInMemoryState* btreeState,
+        virtual long long fullValidate(const IndexCatalogEntry* btreeState,
                                        const DiskLoc& thisLoc,
                                        const BSONObj& keyPattern) {
-            return btreeState->getBucket<Version>(thisLoc)->fullValidate(thisLoc, keyPattern);
+            return getBucket( btreeState, thisLoc )->fullValidate(thisLoc, keyPattern);
         }
     };
 
diff --git a/src/mongo/db/index/btree_interface.h b/src/mongo/db/index/btree_interface.h
index 9c468929920..37b5009a6ef 100644
--- a/src/mongo/db/index/btree_interface.h
+++ b/src/mongo/db/index/btree_interface.h
@@ -33,7 +33,7 @@
 
 namespace mongo {
 
-    class BtreeInMemoryState;
+    class IndexCatalogEntry;
 
     /**
      * We have two Btree on-disk formats which support identical operations.  We hide this as much
@@ -51,19 +51,19 @@ namespace mongo {
         // was deleted.  Calling code needs to be able to recognize this and possibly ignore it.
         static const int deletedBucketCode = 16738;
 
-        virtual int bt_insert(BtreeInMemoryState* btreeState,
+        virtual int bt_insert(IndexCatalogEntry* btreeState,
                               const DiskLoc thisLoc,
                               const DiskLoc recordLoc,
                               const BSONObj& key,
                               bool dupsallowed,
                               bool toplevel = true) = 0;
 
-        virtual bool unindex(BtreeInMemoryState* btreeState,
+        virtual bool unindex(IndexCatalogEntry* btreeState,
                              const DiskLoc thisLoc,
                              const BSONObj& key,
                              const DiskLoc recordLoc) = 0;
 
-        virtual DiskLoc locate(const BtreeInMemoryState* btreeState,
+        virtual DiskLoc locate(const IndexCatalogEntry* btreeState,
                                const DiskLoc& thisLoc,
                                const BSONObj& key,
                                int& pos, // out
@@ -71,12 +71,12 @@ namespace mongo {
                                const DiskLoc& recordLoc, // out
                                int direction = 1) const = 0;
 
-        virtual bool wouldCreateDup(const BtreeInMemoryState* btreeState,
+        virtual bool wouldCreateDup(const IndexCatalogEntry* btreeState,
                                     const DiskLoc& thisLoc,
                                     const BSONObj& key,
                                     const DiskLoc& self) const = 0;
 
-        virtual void customLocate(const BtreeInMemoryState* btreeState,
+        virtual void customLocate(const IndexCatalogEntry* btreeState,
                                   DiskLoc& locInOut,
                                   int& keyOfs,
                                   const BSONObj& keyBegin,
@@ -86,7 +86,7 @@ namespace mongo {
                                   int direction,
                                   pair<DiskLoc, int>& bestParent) const = 0 ;
 
-        virtual void advanceTo(const BtreeInMemoryState* btreeState,
+        virtual void advanceTo(const IndexCatalogEntry* btreeState,
                                DiskLoc &thisLoc,
                                int &keyOfs,
                                const BSONObj &keyBegin,
@@ -96,17 +96,17 @@ namespace mongo {
                                const vector<bool>& keyEndInclusive,
                                int direction) const = 0;
 
-        virtual string dupKeyError(const BtreeInMemoryState* btreeState,
+        virtual string dupKeyError(const IndexCatalogEntry* btreeState,
                                    DiskLoc bucket,
                                    const BSONObj& keyObj) const =0;
 
-        virtual DiskLoc advance(const BtreeInMemoryState* btreeState,
+        virtual DiskLoc advance(const IndexCatalogEntry* btreeState,
                                 const DiskLoc& thisLoc,
                                 int& keyOfs,
                                 int direction,
                                 const char* caller) const = 0;
 
-        virtual long long fullValidate(const BtreeInMemoryState* btreeState,
+        virtual long long fullValidate(const IndexCatalogEntry* btreeState,
                                        const DiskLoc& thisLoc,
                                        const BSONObj& keyPattern) = 0;
 
diff --git a/src/mongo/db/index/fts_access_method.cpp b/src/mongo/db/index/fts_access_method.cpp
index 766c1a6789a..1aaadde4792 100644
--- a/src/mongo/db/index/fts_access_method.cpp
+++ b/src/mongo/db/index/fts_access_method.cpp
@@ -31,7 +31,7 @@
 
 namespace mongo {
 
-    FTSAccessMethod::FTSAccessMethod(BtreeInMemoryState* btreeState)
+    FTSAccessMethod::FTSAccessMethod(IndexCatalogEntry* btreeState)
         : BtreeBasedAccessMethod(btreeState), _ftsSpec(btreeState->descriptor()->infoObj()) { }
 
     void FTSAccessMethod::getKeys(const BSONObj& obj, BSONObjSet* keys) {
diff --git a/src/mongo/db/index/fts_access_method.h b/src/mongo/db/index/fts_access_method.h
index 721b5f33b83..eceff2ae3b9 100644
--- 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(BtreeInMemoryState* btreeState );
+        FTSAccessMethod(IndexCatalogEntry* btreeState );
         virtual ~FTSAccessMethod() { }
 
         // Not implemented:
diff --git a/src/mongo/db/index/hash_access_method.cpp b/src/mongo/db/index/hash_access_method.cpp
index 2752b061f74..3aff284d11e 100644
--- a/src/mongo/db/index/hash_access_method.cpp
+++ b/src/mongo/db/index/hash_access_method.cpp
@@ -37,7 +37,7 @@ namespace mongo {
         return BSONElementHasher::hash64(e, seed);
     }
 
-    HashAccessMethod::HashAccessMethod(BtreeInMemoryState* btreeState)
+    HashAccessMethod::HashAccessMethod(IndexCatalogEntry* btreeState)
         : BtreeBasedAccessMethod(btreeState) {
 
         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
index a93fa6a3964..3fdff0e2b7d 100644
--- 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(BtreeInMemoryState* btreeState);
+        HashAccessMethod(IndexCatalogEntry* btreeState);
         virtual ~HashAccessMethod() { }
 
         virtual Status newCursor(IndexCursor** out) const;
diff --git a/src/mongo/db/index/haystack_access_method.cpp b/src/mongo/db/index/haystack_access_method.cpp
index d67be2e506b..aaddea81207 100644
--- a/src/mongo/db/index/haystack_access_method.cpp
+++ b/src/mongo/db/index/haystack_access_method.cpp
@@ -39,7 +39,7 @@ namespace mongo {
 
     static const string GEOSEARCHNAME = "geoHaystack";
 
-    HaystackAccessMethod::HaystackAccessMethod(BtreeInMemoryState* btreeState)
+    HaystackAccessMethod::HaystackAccessMethod(IndexCatalogEntry* btreeState)
         : BtreeBasedAccessMethod(btreeState) {
 
         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
index 37c5d1a1270..e24e10f7df9 100644
--- a/src/mongo/db/index/haystack_access_method.h
+++ b/src/mongo/db/index/haystack_access_method.h
@@ -55,7 +55,7 @@ namespace mongo {
     public:
         using BtreeBasedAccessMethod::_descriptor;
 
-        HaystackAccessMethod(BtreeInMemoryState* btreeState);
+        HaystackAccessMethod(IndexCatalogEntry* btreeState);
         virtual ~HaystackAccessMethod() { }
 
         // Not implemented.
diff --git a/src/mongo/db/index/s2_access_method.cpp b/src/mongo/db/index/s2_access_method.cpp
index 11ceb4566ab..db1b429cac4 100644
--- a/src/mongo/db/index/s2_access_method.cpp
+++ b/src/mongo/db/index/s2_access_method.cpp
@@ -44,7 +44,7 @@ namespace mongo {
         return def;
     }
 
-    S2AccessMethod::S2AccessMethod(BtreeInMemoryState* btreeState)
+    S2AccessMethod::S2AccessMethod(IndexCatalogEntry* btreeState)
         : BtreeBasedAccessMethod(btreeState) {
 
         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
index b3a34b4e679..66c091f3e90 100644
--- 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(BtreeInMemoryState* btreeState);
+        S2AccessMethod(IndexCatalogEntry* btreeState);
         virtual ~S2AccessMethod() { }
 
         virtual Status newCursor(IndexCursor** out) const;