SERVER-2060 test for null values at shardcollection time

pdex · Jan 10, 2011 · 6a6ad16 · 6a6ad16
1 parent d1d3df7
commit 6a6ad16
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/jstests/sharding/features1.js b/jstests/sharding/features1.js
@@ -160,8 +160,18 @@ assert.throws( function(){ db.foo6.group( { key : { a : 1 } , initial : { count
 // ---- can't shard non-empty collection without index -----
 
 db.foo8.save( { a : 1 } );
+db.getLastError();
 assert( ! s.admin.runCommand( { shardcollection : "test.foo8" , key : { a : 1 } } ).ok , "non-empty collection" );
 
+
+// ---- can't shard non-empty collection with null values in shard key ----
+
+db.foo9.save( { b : 1 } );
+db.getLastError();
+db.foo9.ensureIndex( { a : 1 } );
+assert( ! s.admin.runCommand( { shardcollection : "test.foo9" , key : { a : 1 } } ).ok , "entry with null value" );
+
+
 // --- listDatabases ---
 
 r = db.getMongo().getDBs()

diff --git a/s/commands_admin.cpp b/s/commands_admin.cpp
@@ -399,8 +399,22 @@ namespace mongo {
                         return false;
                     }
 
+                    if ( hasShardIndex ) {
+                        // make sure there are no null entries in the sharding index
+                        BSONObjBuilder cmd;
+                        cmd.append( "checkShardingIndex" , ns );
+                        cmd.append( "keyPattern" , key );
+                        BSONObj cmdObj = cmd.obj();
+                        if ( ! conn->runCommand( "admin" , cmdObj , res )) {
+                            errmsg = res["errmsg"].str();
+                            conn.done();
+                            return false;
+                        }
+                    }
+
                     if ( ! hasShardIndex && ( conn->count( ns ) != 0 ) ) {
                         errmsg = "please create an index over the sharding key before sharding.";
+                        conn.done();
                         return false;
                     }