fix tests MINOR

2 files changed, 18 insertions, 18 deletions

diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp
index 5087b36ec66..add030c6d4d 100644
--- a/dbtests/queryoptimizertests.cpp
+++ b/dbtests/queryoptimizertests.cpp
@@ -269,7 +269,7 @@ namespace QueryOptimizerTests {
                 client_.ensureIndex( ns(), key, false, name.c_str() );
                 NamespaceDetails *d = nsd();
                 for( int i = 0; i < d->nIndexes; ++i ) {
-                    if ( d->indexes[ i ].indexName() == name )
+                    if ( d->indexes[ i ].indexName() == name || d->indexes[ i ].isIdIndex() && IndexDetails::isIdIndexPattern( key ) )
                         return &d->indexes[ i ];
                 }
                 assert( false );
diff --git a/jstests/datasize.js b/jstests/datasize.js
index 3dc1e9f6c7c..396d24d22f9 100644
--- a/jstests/datasize.js
+++ b/jstests/datasize.js
@@ -2,27 +2,27 @@ f = db.jstests_datasize;
 f.drop();
 
 assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
-f.save( {_id:'c'} );
-assert.eq( 16, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
-f.save( {_id:'fg'} );
-assert.eq( 33, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
+f.save( {qq:'c'} );
+assert.eq( 32, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
+f.save( {qq:'fg'} );
+assert.eq( 65, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
 
 f.drop();
-f.ensureIndex( {_id:1} );
+f.ensureIndex( {qq:1} );
 assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
-f.save( {_id:'c'} );
-assert.eq( 16, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
-f.save( {_id:'fg'} );
-assert.eq( 33, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
+f.save( {qq:'c'} );
+assert.eq( 32, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
+f.save( {qq:'fg'} );
+assert.eq( 65, db.runCommand( {datasize:"test.jstests_datasize"} ).size );
 
-assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'a'}} ).ok );
+assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'a'}} ).ok );
 
-assert.eq( 33, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'a'}, max:{_id:'z' }} ).size );
-assert.eq( 16, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'a'}, max:{_id:'d' }} ).size );
-assert.eq( 16, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'a'}, max:{_id:'d' }, keyPattern:{_id:1}} ).size );
-assert.eq( 17, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'d'}, max:{_id:'z' }, keyPattern:{_id:1}} ).size );
+assert.eq( 65, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'a'}, max:{qq:'z' }} ).size );
+assert.eq( 32, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'a'}, max:{qq:'d' }} ).size );
+assert.eq( 32, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'a'}, max:{qq:'d' }, keyPattern:{qq:1}} ).size );
+assert.eq( 33, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'d'}, max:{qq:'z' }, keyPattern:{qq:1}} ).size );
 
-assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'c'}, max:{_id:'c' }} ).size );
-assert.eq( 16, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'c'}, max:{_id:'d' }} ).size );
+assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'c'}, max:{qq:'c' }} ).size );
+assert.eq( 32, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'c'}, max:{qq:'d' }} ).size );
 
-assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize", min:{_id:'a'}, max:{_id:'d' }, keyPattern:{a:1}} ).ok );
+assert.eq( 0, db.runCommand( {datasize:"test.jstests_datasize", min:{qq:'a'}, max:{qq:'d' }, keyPattern:{a:1}} ).ok );