BUMP 2.4.0-rc3

doxygenConfig

@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = MongoDB
-PROJECT_NUMBER         = 2.4.0-rc3-pre-
+PROJECT_NUMBER         = 2.4.0-rc3
 OUTPUT_DIRECTORY       = docs/doxygen
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

jstests/find1.js

@@ -5,14 +5,14 @@ lookAtDocumentMetrics = false;
 
 if ( db.serverStatus().metrics ) {
     var ss = db.serverStatus();
-    lookAtDocumentMetrics = ss.metrics.document != null && ss.metrics.document.scanned != null;
+    lookAtDocumentMetrics = ss.metrics.document != null && ss.metrics.queryExecutor.scanned != null;
 }
 
 print( "lookAtDocumentMetrics: " + lookAtDocumentMetrics );
 
 if ( lookAtDocumentMetrics ) {
     // ignore mongos
-    nscannedStart = db.serverStatus().metrics.document.scanned
+    nscannedStart = db.serverStatus().metrics.queryExecutor.scanned
 }
 
 
@@ -47,6 +47,6 @@ assert(t.validate().valid,"not valid");
 
 if ( lookAtDocumentMetrics ) {
     // ignore mongos
-    nscannedEnd = db.serverStatus().metrics.document.scanned
+    nscannedEnd = db.serverStatus().metrics.queryExecutor.scanned
     assert.lte( nscannedStart + 16, nscannedEnd );
 }

jstests/slowNightly/sharding_passthrough.js

@@ -113,7 +113,8 @@ files.forEach(function(x) {
         'mr_auth|' +
         'queryoptimizera|' +
         'indexStatsCommand|' +
-        'reversecursor' +
+        'reversecursor|' +
+        'stats' + // tests db.stats().dataFileVersion, which doesn't appear in sharded db.stats()
         ')\.js$');
 
     if (failsInShardingPattern.test(x.name)) {

jstests/stats.js

@@ -1,9 +1,23 @@
 
-t = db.stats1;
-t.drop();
+var statsDB = db.getSiblingDB( "stats" );
+statsDB.dropDatabase();
+var t = statsDB.stats1;
 
 t.save( { a : 1 } );
 
 assert.lt( 0 , t.dataSize() , "A" );
 assert.lt( t.dataSize() , t.storageSize() , "B" );
 assert.lt( 0 , t.totalIndexSize() , "C" );
+
+var stats = statsDB.stats();
+assert.gt( stats.fileSize, 0 );
+assert.eq( stats.dataFileVersion.major, 4 );
+assert.eq( stats.dataFileVersion.minor, 5 );
+
+// test empty database; should be no dataFileVersion
+statsDB.dropDatabase();
+var statsEmptyDB = statsDB.stats();
+assert.eq( statsEmptyDB.fileSize, 0 );
+assert.eq( {}, statsEmptyDB.dataFileVersion );
+
+statsDB.dropDatabase();

src/mongo/db/curop.cpp

@@ -213,7 +213,7 @@ namespace mongo {
     static ServerStatusMetricField<Counter64> displayUpdated( "document.updated", &updatedCounter );
     static ServerStatusMetricField<Counter64> displayInserted( "document.inserted", &insertedCounter );
     static ServerStatusMetricField<Counter64> displayDeleted( "document.deleted", &deletedCounter );
-    static ServerStatusMetricField<Counter64> displayScanned( "document.scanned", &scannedCounter );
+    static ServerStatusMetricField<Counter64> displayScanned( "queryExecutor.scanned", &scannedCounter );
 
     static Counter64 idhackCounter;
     static Counter64 scanAndOrderCounter;

src/mongo/db/dbcommands.cpp

@@ -1463,6 +1463,14 @@ namespace mongo {
             if( d )
                 result.appendNumber( "nsSizeMB", (int) d->namespaceIndex.fileLength() / 1024 / 1024 );
 
+            BSONObjBuilder dataFileVersion( result.subobjStart( "dataFileVersion" ) );
+            if ( d && !d->isEmpty() ) {
+                DataFileHeader* header = d->getFile( 0 )->getHeader();
+                dataFileVersion.append( "major", header->version );
+                dataFileVersion.append( "minor", header->versionMinor );
+            }
+            dataFileVersion.done();
+
             return true;
         }
     } cmdDBStats;

src/mongo/db/fts/fts_index_format_test.cpp

@@ -91,6 +91,18 @@ namespace mongo {
             ASSERT( i.next().numberDouble() > 0 );
         }
 
+        TEST( FTSIndexFormat, StopWords1 ) {
+            FTSSpec spec( FTSSpec::fixSpec( BSON( "key" << BSON( "data" << "text" ) ) ) );
+
+            BSONObjSet keys1;
+            FTSIndexFormat::getKeys( spec, BSON( "data" << "computer" ), &keys1 );
+            ASSERT_EQUALS( 1U, keys1.size() );
+
+            BSONObjSet keys2;
+            FTSIndexFormat::getKeys( spec, BSON( "data" << "any computer" ), &keys2 );
+            ASSERT_EQUALS( 1U, keys2.size() );
+        }
+
 
     }
 }

src/mongo/db/fts/fts_spec.cpp

@@ -32,6 +32,9 @@ namespace mongo {
         const double MAX_WORD_WEIGHT = MAX_WEIGHT / 10000;
 
         FTSSpec::FTSSpec( const BSONObj& indexInfo ) {
+            massert( 16739, "found invalid spec for text index",
+                     indexInfo["weights"].isABSONObj() );
+
             _defaultLanguage = indexInfo["default_language"].valuestrsafe();
             _languageOverrideField = indexInfo["language_override"].valuestrsafe();
 
@@ -213,9 +216,9 @@ namespace mongo {
 
                 string term = t.data.toString();
                 makeLower( &term );
-                term = tools.stemmer->stem( term );
                 if ( tools.stopwords->isStopWord( term ) )
                     continue;
+                term = tools.stemmer->stem( term );
 
                 ScoreHelperStruct& data = terms[term];
 

src/mongo/util/version.cpp

@@ -47,7 +47,7 @@ namespace mongo {
      *      1.2.3-rc4-pre-
      * If you really need to do something else you'll need to fix _versionArray()
      */
-    const char versionString[] = "2.4.0-rc3-pre-";
+    const char versionString[] = "2.4.0-rc3";
 
     // See unit test for example outputs
     BSONArray toVersionArray(const char* version){