SERVER-13635: remove Database::getFileFormat

Author: erh

src/mongo/db/catalog/database.cpp

@@ -48,7 +48,6 @@
 #include "mongo/db/introspect.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/server_parameters.h"
-#include "mongo/db/storage/data_file.h" //XXX
 #include "mongo/db/storage/mmap_v1/mmap_v1_engine.h" //XXX
 #include "mongo/db/storage/mmap_v1/mmap_v1_extent_manager.h" //XXX
 #include "mongo/db/storage_options.h"
@@ -524,17 +523,6 @@ namespace mongo {
         uassertStatusOK( loc.getStatus() );
     }
 
-    void Database::getFileFormat( OperationContext* txn, int* major, int* minor ) {
-        if ( getExtentManager()->numFiles() == 0 ) {
-            *major = 0;
-            *minor = 0;
-            return;
-        }
-        const DataFile* df = getExtentManager()->getFile( txn, 0 );
-        *major = df->getHeader()->version;
-        *minor = df->getHeader()->versionMinor;
-    }
-
     MmapV1ExtentManager* Database::getExtentManager() {
         return _dbEntry->getExtentManager();
     }

src/mongo/db/catalog/database.h

@@ -74,8 +74,6 @@ namespace mongo {
 
         void clearTmpCollections(OperationContext* txn);
 
-        void getFileFormat( OperationContext* txn, int* major, int* minor );
-
         /**
          * @return true if success.  false if bad level or error creating profile ns
          */

src/mongo/db/catalog/database_catalog_entry.h

@@ -56,6 +56,9 @@ namespace mongo {
                                        BSONObjBuilder* out,
                                        double scale ) const = 0;
 
+        virtual bool isOlderThan24( OperationContext* opCtx ) const = 0;
+        virtual void markIndexSafe24AndUp( OperationContext* opCtx ) = 0;
+
         // ----
 
         virtual void getCollectionNamespaces( std::list<std::string>* out ) const = 0;

src/mongo/db/catalog/index_catalog.cpp

@@ -169,13 +169,8 @@ namespace mongo {
         string pluginName = IndexNames::findPluginName(keyPattern);
         bool known = IndexNames::isKnownName(pluginName);
 
-        int majorVersion;
-        int minorVersion;
-
-        _collection->_database->getFileFormat( txn, &majorVersion, &minorVersion );
-            
-        if (minorVersion == PDFILE_VERSION_MINOR_24_AND_NEWER) {
-            // RulesFor24
+        if ( !_collection->_database->getDatabaseCatalogEntry()->isOlderThan24( txn ) ) {
+            // RulesFor24+
             // This assert will be triggered when downgrading from a future version that
             // supports an index plugin unsupported by this version.
             uassert(17197, str::stream() << "Invalid index type '" << pluginName << "' "
@@ -223,13 +218,10 @@ namespace mongo {
 
         Database* db = _collection->_database;
 
-        DataFileHeader* dfh = db->getExtentManager()->getFile(txn, 0)->getHeader();
-        if ( dfh->versionMinor == PDFILE_VERSION_MINOR_24_AND_NEWER ) {
+        if ( !db->getDatabaseCatalogEntry()->isOlderThan24( txn ) ) {
             return Status::OK(); // these checks have already been done
         }
 
-        fassert(16737, dfh->versionMinor == PDFILE_VERSION_MINOR_22_AND_OLDER);
-
         auto_ptr<Runner> runner(
             InternalPlanner::collectionScan(db->_indexesName,
                                             db->getCollection(txn, db->_indexesName)));
@@ -255,7 +247,7 @@ namespace mongo {
             warning() << "Internal error while reading system.indexes collection";
         }
 
-        txn->recoveryUnit()->writingInt(dfh->versionMinor) = PDFILE_VERSION_MINOR_24_AND_NEWER;
+        db->_dbEntry->markIndexSafe24AndUp( txn );
 
         return Status::OK();
     }

src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp

@@ -39,7 +39,9 @@
 #include "mongo/db/index/hash_access_method.h"
 #include "mongo/db/index/haystack_access_method.h"
 #include "mongo/db/index/s2_access_method.h"
+#include "mongo/db/pdfile_version.h"
 #include "mongo/db/server_parameters.h"
+#include "mongo/db/storage/data_file.h"
 #include "mongo/db/structure/catalog/namespace_details.h"
 #include "mongo/db/structure/catalog/namespace_details_collection_entry.h"
 #include "mongo/db/structure/catalog/namespace_details_rsv1_metadata.h"
@@ -324,6 +326,41 @@ namespace mongo {
 
     }
 
+    bool MMAP1DatabaseCatalogEntry::isOlderThan24( OperationContext* opCtx ) const {
+        if ( _extentManager.numFiles() == 0 )
+            return false;
+
+        int major = 0;
+        int minor = 0;
+
+        _extentManager.getFileFormat( opCtx, &major, &minor );
+
+        invariant( major == PDFILE_VERSION );
+
+        return minor == PDFILE_VERSION_MINOR_22_AND_OLDER;
+    }
+
+    void MMAP1DatabaseCatalogEntry::markIndexSafe24AndUp( OperationContext* opCtx ) {
+        if ( _extentManager.numFiles() == 0 )
+            return;
+
+        int major = 0;
+        int minor = 0;
+
+        _extentManager.getFileFormat( opCtx, &major, &minor );
+
+        invariant( major == PDFILE_VERSION );
+
+        if ( minor == PDFILE_VERSION_MINOR_24_AND_NEWER )
+            return;
+
+        invariant( minor == PDFILE_VERSION_MINOR_22_AND_OLDER );
+
+        DataFile* df = _extentManager.getFile( opCtx, 0 );
+        opCtx->recoveryUnit()->writingInt(df->getHeader()->versionMinor) =
+            PDFILE_VERSION_MINOR_24_AND_NEWER;
+    }
+
     void MMAP1DatabaseCatalogEntry::getCollectionNamespaces( std::list<std::string>* tofill ) const {
         _namespaceIndex.getCollectionNamespaces( tofill );
     }

src/mongo/db/storage/mmap_v1/mmap_v1_engine.h

@@ -61,6 +61,9 @@ namespace mongo {
         bool exists() const { return _namespaceIndex.pathExists(); }
         bool isEmpty() const { return !_namespaceIndex.allocated(); }
 
+        virtual bool isOlderThan24( OperationContext* opCtx ) const;
+        virtual void markIndexSafe24AndUp( OperationContext* opCtx );
+
         virtual void appendExtraStats( OperationContext* opCtx,
                                        BSONObjBuilder* out,
                                        double scale ) const;