1 files changed, 33 insertions, 0 deletions
diff --git a/jstests/queryoptimizer3.js b/jstests/queryoptimizer3.js
new file mode 100644
index 0000000..76bc5b6
--- /dev/null
+++ b/jstests/queryoptimizer3.js
@@ -0,0 +1,33 @@
+// Check cases where index scans are aborted due to the collection being dropped.
+
+t = db.jstests_queryoptimizer3;
+t.drop();
+
+p = startParallelShell( 'for( i = 0; i < 400; ++i ) { sleep( 50 ); db.jstests_queryoptimizer3.drop(); }' );
+
+for( i = 0; i < 100; ++i ) {
+    t.drop();
+    t.ensureIndex({a:1});
+    t.ensureIndex({b:1});
+    for( j = 0; j < 100; ++j ) {
+        t.save({a:j,b:j});
+    }
+    m = i % 5;
+    if ( m == 0 ) {
+        t.count({a:{$gte:0},b:{$gte:0}});        
+    }
+    else if ( m == 1 ) {
+        t.find({a:{$gte:0},b:{$gte:0}}).itcount();
+    }
+    else if ( m == 2 ) {
+        t.remove({a:{$gte:0},b:{$gte:0}});
+    }
+    else if ( m == 3 ) {
+        t.update({a:{$gte:0},b:{$gte:0}},{});
+    }
+    else if ( m == 4 ) {
+        t.distinct('x',{a:{$gte:0},b:{$gte:0}});
+    }
+}
+
+p();