Merge remote branch 'main_readonly/master'

Author: dwight

jstests/bench_test3.js

@@ -0,0 +1,27 @@
+t = db.bench_test3
+t.drop();
+
+
+benchArgs = { ops : [ { ns : t.getFullName() ,
+                        op : "update" ,
+                        upsert : true ,
+                        query : { _id : { "#RAND_INT" : [ 0 , 5 , 4 ] } } ,
+                        update : { $inc : { x : 1 } } } ] ,
+              parallel : 2 ,
+              seconds : 1 ,
+              totals : true ,
+              host : db.getMongo().host }
+
+if (jsTest.options().auth) {
+    benchArgs['db'] = 'admin';
+    benchArgs['username'] = jsTest.options().adminUser;
+    benchArgs['password'] = jsTest.options().adminPassword;
+}
+
+res = benchRun( benchArgs )
+printjson( res );
+
+var keys = []
+var totals = {}
+db.bench_test3.find().sort( { _id : 1 } ).forEach( function(z){ keys.push( z._id ); totals[z._id] = z.x } );
+assert.eq( [ 0 , 4 , 8 , 12 , 16 ] , keys )

jstests/find9.js

@@ -0,0 +1,28 @@
+// Test that the MaxBytesToReturnToClientAtOnce limit is enforced.
+
+t = db.jstests_find9;
+t.drop();
+
+big = new Array( 500000 ).toString();
+for( i = 0; i < 20; ++i ) {
+    t.save( { a:i, b:big } );
+}
+
+// Check size limit with a simple query.
+assert.eq( 20, t.find( {}, { a:1 } ).objsLeftInBatch() ); // Projection resizes the result set.
+assert.gt( 20, t.find().objsLeftInBatch() );
+
+// Check size limit on a query with an explicit batch size.
+assert.eq( 20, t.find( {}, { a:1 } ).batchSize( 30 ).objsLeftInBatch() );
+assert.gt( 20, t.find().batchSize( 30 ).objsLeftInBatch() );
+
+for( i = 0; i < 20; ++i ) {
+    t.save( { a:i, b:big } );
+}
+
+// Check size limit with get more.
+c = t.find().batchSize( 30 );
+while( c.hasNext() ) {
+    assert.gt( 20, c.objsLeftInBatch() );
+    c.next();
+}

src/mongo/db/oplog.cpp

@@ -545,7 +545,7 @@ namespace mongo {
             return shared_ptr<Cursor>( new BasicCursor( DiskLoc() ) );
         }
         FieldRangeSetPair frsp( ns, query );
-        QueryPlan oplogPlan( d, -1, frsp, 0, query, shared_ptr<Projection>(), order, false );
+        QueryPlan oplogPlan( d, -1, frsp, 0, query, shared_ptr<Projection>(), order );
         FindingStartCursor finder( oplogPlan );
         ElapsedTracker yieldCondition( 256, 20 );
         while( !finder.done() ) {

src/mongo/db/ops/query.cpp

@@ -145,7 +145,7 @@ namespace mongo {
                 }
 
                 // in some cases (clone collection) there won't be a matcher
-                if ( c->matcher() && !c->matcher()->matchesCurrent( c ) ) {
+                if ( !c->currentMatches() ) {
                 }
                 else if ( manager && ! manager->belongsToMe( cc ) ){
                     LOG(2) << "cursor skipping document in un-owned chunk: " << c->current() << endl;
@@ -642,6 +642,12 @@ namespace mongo {
                 queryResponseBuilder.noteYield();
                 // !!! TODO The queryResponseBuilder still holds cursor.  Currently it will not do
                 // anything unsafe with the cursor in handoff(), but this is very fragile.
+                //
+                // We don't fail the query since we're fine with returning partial data if the
+                // collection was dropped.
+                // NOTE see SERVER-2454.
+                // TODO This is wrong.  The cursor could be gone if the closeAllDatabases command
+                // just ran.
                 break;
             }