1 files changed, 67 insertions, 47 deletions
diff --git a/jstests/sharding/key_string.js b/jstests/sharding/key_string.js
index c5b2e88b694..414e056bf1f 100644
--- a/jstests/sharding/key_string.js
+++ b/jstests/sharding/key_string.js
@@ -1,51 +1,71 @@
 (function() {
 
-var s = new ShardingTest({ name: "keystring", shards: 2 });
-
-s.adminCommand( { enablesharding : "test" } );
-s.ensurePrimaryShard('test', 'shard0001');
-s.adminCommand( { shardcollection : "test.foo" , key : { name : 1 } } );
-
-primary = s.getPrimaryShard( "test" ).getDB( "test" );
-seconday = s.getOther( primary ).getDB( "test" );
-
-assert.eq( 1 , s.config.chunks.count() , "sanity check A" );
-
-var db = s.getDB( "test" );
-
-db.foo.save( { name : "eliot" } );
-db.foo.save( { name : "sara" } );
-db.foo.save( { name : "bob" } );
-db.foo.save( { name : "joe" } );
-db.foo.save( { name : "mark" } );
-db.foo.save( { name : "allan" } );
-
-assert.eq( 6 , db.foo.find().count() , "basic count" );
-
-s.adminCommand({ split: "test.foo", middle: { name: "allan" }});
-s.adminCommand({ split: "test.foo", middle: { name: "sara" }});
-s.adminCommand({ split: "test.foo", middle: { name: "eliot" }});
-
-s.adminCommand( { movechunk : "test.foo" , find : { name : "eliot" } , to : seconday.getMongo().name, _waitForDelete : true } );
-
-s.printChunks();
-
-assert.eq( 3 , primary.foo.find().toArray().length , "primary count" );
-assert.eq( 3 , seconday.foo.find().toArray().length , "secondary count" );
-
-assert.eq( 6 , db.foo.find().toArray().length , "total count" );
-assert.eq( 6 , db.foo.find().sort( { name : 1 } ).toArray().length , "total count sorted" );
-
-assert.eq( 6 , db.foo.find().sort( { name : 1 } ).count() , "total count with count()" );
-
-assert.eq( "allan,bob,eliot,joe,mark,sara" ,  db.foo.find().sort( { name : 1 } ).toArray().map( function(z){ return z.name; } ) , "sort 1" );
-assert.eq( "sara,mark,joe,eliot,bob,allan" ,  db.foo.find().sort( { name : -1 } ).toArray().map( function(z){ return z.name; } ) , "sort 2" );
-
-// make sure we can't foce a split on an extreme key
-// [allan->joe) 
-assert.throws( function(){ s.adminCommand( { split : "test.foo" , middle : { name : "allan" } } ); } );
-assert.throws( function(){ s.adminCommand( { split : "test.foo" , middle : { name : "eliot" } } ); } );
-
-s.stop();
+    var s = new ShardingTest({name: "keystring", shards: 2});
+
+    s.adminCommand({enablesharding: "test"});
+    s.ensurePrimaryShard('test', 'shard0001');
+    s.adminCommand({shardcollection: "test.foo", key: {name: 1}});
+
+    primary = s.getPrimaryShard("test").getDB("test");
+    seconday = s.getOther(primary).getDB("test");
+
+    assert.eq(1, s.config.chunks.count(), "sanity check A");
+
+    var db = s.getDB("test");
+
+    db.foo.save({name: "eliot"});
+    db.foo.save({name: "sara"});
+    db.foo.save({name: "bob"});
+    db.foo.save({name: "joe"});
+    db.foo.save({name: "mark"});
+    db.foo.save({name: "allan"});
+
+    assert.eq(6, db.foo.find().count(), "basic count");
+
+    s.adminCommand({split: "test.foo", middle: {name: "allan"}});
+    s.adminCommand({split: "test.foo", middle: {name: "sara"}});
+    s.adminCommand({split: "test.foo", middle: {name: "eliot"}});
+
+    s.adminCommand({
+        movechunk: "test.foo",
+        find: {name: "eliot"},
+        to: seconday.getMongo().name,
+        _waitForDelete: true
+    });
+
+    s.printChunks();
+
+    assert.eq(3, primary.foo.find().toArray().length, "primary count");
+    assert.eq(3, seconday.foo.find().toArray().length, "secondary count");
+
+    assert.eq(6, db.foo.find().toArray().length, "total count");
+    assert.eq(6, db.foo.find().sort({name: 1}).toArray().length, "total count sorted");
+
+    assert.eq(6, db.foo.find().sort({name: 1}).count(), "total count with count()");
+
+    assert.eq("allan,bob,eliot,joe,mark,sara",
+              db.foo.find().sort({name: 1}).toArray().map(function(z) {
+                  return z.name;
+              }),
+              "sort 1");
+    assert.eq("sara,mark,joe,eliot,bob,allan",
+              db.foo.find()
+                  .sort({name: -1})
+                  .toArray()
+                  .map(function(z) {
+                      return z.name;
+                  }),
+              "sort 2");
+
+    // make sure we can't foce a split on an extreme key
+    // [allan->joe)
+    assert.throws(function() {
+        s.adminCommand({split: "test.foo", middle: {name: "allan"}});
+    });
+    assert.throws(function() {
+        s.adminCommand({split: "test.foo", middle: {name: "eliot"}});
+    });
+
+    s.stop();
 
 })();