Merge branch 'master' of github.com:mongodb/mongo

Author: erh

db/stats/snapshots.cpp

@@ -153,7 +153,7 @@ namespace mongo {
 
     class DBTopStatus : public WebStatusPlugin {
     public:
-        DBTopStatus() : WebStatusPlugin( "dbtop" , 50 , "(occurences|percent of elapsed)" ) {}
+        DBTopStatus() : WebStatusPlugin( "dbtop" , 50 , "(occurrences|percent of elapsed)" ) {}
 
         void display( stringstream& ss , double elapsed , const Top::UsageData& usage ) {
             ss << "<td>";

jstests/sharding/bigMapReduce.js

@@ -1,12 +1,16 @@
 s = new ShardingTest( "bigMapReduce" , 2 , 1 , 1 , { chunksize : 1 } );
 
+// reduce chunk size to split
+var config = s.getDB("config");
+config.settings.save({_id: "chunksize", value: 1});
+
 s.adminCommand( { enablesharding : "test" } )
 s.adminCommand( { shardcollection : "test.foo", key : { "_id" : 1 } } )
 
 db = s.getDB( "test" );
 var str=""
 for (i=0;i<4*1024;i++) { str=str+"a"; }
-for (j=0; j<50; j++) for (i=0; i<512; i++){ db.foo.save({y:str})}
+for (j=0; j<100; j++) for (i=0; i<512; i++){ db.foo.save({y:str})}
 db.getLastError();
 
 s.printChunks();
@@ -62,7 +66,7 @@ for (iter = 0; iter < 5; iter++) {
     outColl = outDb[outCollStr];
 
     obj = outColl.convertToSingleObject("value");
-    assert.eq( 25600 , obj.count , "Received wrong result " + obj.count );
+    assert.eq( 51200 , obj.count , "Received wrong result " + obj.count );
 
     print("checking result field");
     assert.eq(res.result.collection, outCollStr, "Wrong collection " + res.result.collection);
@@ -71,5 +75,29 @@ for (iter = 0; iter < 5; iter++) {
 
 assert( gotAGoodOne , "no good for out db" )
 
+// sharded output
+
+function map2() { emit(this._id, 1); }
+
+for ( iter=0; iter<5; iter++ ){
+    try {
+        out = db.foo.mapReduce(map2, reduce, { out : { replace: "mrShardedOut", sharded: true }});
+        gotAGoodOne = true; 
+        assert.eq( 51200 , obj.count , "Received wrong result " + obj.count );
+        // make sure it's sharded and split
+        assert( config.chunks.count({ns: db.mrShardedOut._fullName}) > 1, "didnt split");
+    }
+    catch ( e ){
+        if ( __mrerror__ && __mrerror__.cause && __mrerror__.cause.code == 13388 ){
+            // TODO: SERVER-2396
+            sleep( 1000 );
+            continue;
+        }
+        printjson( __mrerror__ );
+        throw e;
+    }
+}
+assert( gotAGoodOne , "no good for sharded" )
+
 s.stop()
 

jstests/tool/csvexport1.js

@@ -27,7 +27,7 @@ assert.soon ( 3 + " == c.count()", "after import");
 
 // Note: Exporting and Importing to/from CSV is not designed to be round-trippable
 expected = []
-expected.push({ a : 1, b : "ObjectID(" + objId.toString() + ")", c : "[ 1, 2, 3 ]", d : "{ \"a\" : \"hello\", \"b\" : \"world\" }", e : "-"})
+expected.push({ a : 1, b : "ObjectID(" + objId.valueOf() + ")", c : "[ 1, 2, 3 ]", d : "{ \"a\" : \"hello\", \"b\" : \"world\" }", e : "-"})
 expected.push({ a : -2.0, b : "", c : "$MinKey", d : "Then he said, \"Hello World!\"", e : 3})
 expected.push({ a : "D76DF8", b : "2009-08-27T00:00:00Z", c : "{ \"t\" : 1000 , \"i\" : 9876 }", d : "/foo*\\\"bar\\\"/i", e : tojson(function foo() { print("Hello World!"); })})
 
@@ -42,4 +42,4 @@ for (i = 0; i < expected.length; i++) {
 }
 
 
-t.stop()
+t.stop()

s/strategy_shard.cpp

@@ -231,6 +231,7 @@ namespace mongo {
                     ChunkPtr c = manager->findChunk( o );
                     LOG(4) << "  server:" << c->getShard().toString() << " " << o << endl;
                     insert( c->getShard() , ns , o , flags, safe);
+                    c->splitIfShould( o.objsize() );
                     break;
                 }
                 catch ( StaleConfigException& e ) {