if someone else advances my cursor be safe SERVER-494

mongodb · Dec 17, 2009 · 6909e14 · 6909e14
1 parent e7eb18f
commit 6909e14
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/db/query.cpp b/db/query.cpp
@@ -145,12 +145,21 @@ namespace mongo {
         cc->ns = ns;
         cc->liveForever();
         cc->setDoingDeletes( true );
+
+        CursorId id = cc->cursorid;
+
         do {
 
             if ( nDeleted % 100 == 99 ){
                 cc->updateLocation();
                 cc->setDoingDeletes( false );
-                dbtemprelease unlock;
+                {
+                    dbtemprelease unlock;
+                }
+                if ( ClientCursor::find( id , false ) == 0 ){
+                    cc.reset( 0 );
+                    break;
+                }
             }
             cc->setDoingDeletes( true );
 
@@ -191,6 +200,10 @@ namespace mongo {
 
         } while ( cc->c->ok() );
 
+        if ( ClientCursor::find( id , false ) == 0 ){
+            cc.reset( 0 );
+        }
+
         return nDeleted;
     }