SERVER-3064 out for now - too many issues with rollback

mongodb · Aug 6, 2011 · 7cc114b · 7cc114b
1 parent bd1ed81
commit 7cc114b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/db/queryoptimizer.cpp b/db/queryoptimizer.cpp
@@ -219,9 +219,15 @@ namespace mongo {
                 // we disallow as its a common user error
                 // .system. and local collections are exempt
                 if ( _d && _d->capped && _frs.range( "_id" ).nontrivial() ) {
-                    uassert( 14820, "doing _id query on a capped collection without an index is not allowed" ,
+                    if ( cc().isSyncThread() ||
-                             str::contains( _frs.ns() , ".system." ) || 
+                         str::contains( _frs.ns() , ".system." ) || 
-                             str::startsWith( _frs.ns() , "local." ) );
+                         str::startsWith( _frs.ns() , "local." ) ) {
+                        // ok
+                    }
+                    else {
+                        warning() << "_id query on capped collection without an _id index, performance will be poor collection: " << _frs.ns() << endl;
+                        //uassert( 14820, str::stream() << "doing _id query on a capped collection without an index is not allowed: " << _frs.ns() ,
+                    }
                 }
             }
             return findTableScan( _frs.ns(), _order, startLoc );

diff --git a/jstests/cappeda.js b/jstests/cappeda.js
@@ -20,8 +20,9 @@ function u() {
 }
 
 
-assert.throws( q , [] , "A1" );
+// SERVER-3064
-assert.throws( u , [] , "B1" );
+//assert.throws( q , [] , "A1" );
+//assert.throws( u , [] , "B1" );
 
 t.ensureIndex( { _id : 1 } )