SERVER-1453 yield during geo query

mongodb · Aug 2, 2010 · e6ad6ec · e6ad6ec
1 parent 45f9479
commit e6ad6ec
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp
@@ -236,9 +236,9 @@ namespace mongo {
         }        
     }
 
-    void ClientCursor::prepareToYield( YieldData &data ) {
+    bool ClientCursor::prepareToYield( YieldData &data ) {
         if ( ! c->supportYields() )
-            return;
+            return false;
         // need to store in case 'this' gets deleted
         data._id = cursorid;
 
@@ -268,6 +268,7 @@ namespace mongo {
                 }
             }
         }        
+        return true;
     }
 
     bool ClientCursor::recoverFromYield( const YieldData &data ) {

diff --git a/db/clientcursor.h b/db/clientcursor.h
@@ -195,7 +195,7 @@ namespace mongo {
         static void staticYield( int micros );
 
         struct YieldData { CursorId _id; bool _doingDeletes; };
-        void prepareToYield( YieldData &data );
+        bool prepareToYield( YieldData &data );
         static bool recoverFromYield( const YieldData &data );
 
         struct YieldLock : boost::noncopyable {

diff --git a/db/oplog.h b/db/oplog.h
@@ -130,10 +130,11 @@ namespace mongo {
                 }
             }                
         }     
-        void prepareToYield() {
+        bool prepareToYield() {
             if ( _findingStartCursor ) {
-                _findingStartCursor->prepareToYield( _yieldData );
+                return _findingStartCursor->prepareToYield( _yieldData );
             }
+            return true;
         }
         void recoverFromYield() {
             if ( _findingStartCursor ) {

diff --git a/db/query.cpp b/db/query.cpp
@@ -62,11 +62,11 @@ namespace mongo {
         virtual void _init() {
             c_ = qp().newCursor();
         }
-        virtual void prepareToYield() {
+        virtual bool prepareToYield() {
             if ( ! _cc ) {
                 _cc.reset( new ClientCursor( QueryOption_NoCursorTimeout , c_ , qp().ns() ) );
             }
-            _cc->prepareToYield( _yieldData );
+            return _cc->prepareToYield( _yieldData );
         }        
         virtual void recoverFromYield() {
             if ( !ClientCursor::recoverFromYield( _yieldData ) ) {
@@ -406,11 +406,11 @@ namespace mongo {
             }
         }
 
-        virtual void prepareToYield() {
+        virtual bool prepareToYield() {
             if ( ! _cc ) {
                 _cc.reset( new ClientCursor( QueryOption_NoCursorTimeout , c_ , _ns.c_str() ) );
             }
-            _cc->prepareToYield( _yieldData );
+            return _cc->prepareToYield( _yieldData );
         }
 
         virtual void recoverFromYield() {
@@ -630,14 +630,14 @@ namespace mongo {
             }
         }
 
-        virtual void prepareToYield() {
+        virtual bool prepareToYield() {
             if ( _findingStartCursor.get() ) {
-                _findingStartCursor->prepareToYield();
+                return _findingStartCursor->prepareToYield();
             } else {
                 if ( ! _cc ) {
                     _cc.reset( new ClientCursor( QueryOption_NoCursorTimeout , _c , _pq.ns() ) );
                 }
-                _cc->prepareToYield( _yieldData );
+                return _cc->prepareToYield( _yieldData );
             }
         }
 

diff --git a/db/queryoptimizer.cpp b/db/queryoptimizer.cpp
@@ -511,7 +511,9 @@ namespace mongo {
                 int micros = ClientCursor::yieldSuggest();
                 if ( micros > 0 ) {
                     for( vector< shared_ptr< QueryOp > >::const_iterator i = ops.begin(); i != ops.end(); ++i ) {
-                        prepareToYield( **i );
+                        if ( !prepareToYield( **i ) ) {
+                            return;
+                        }
                     }
                     ClientCursor::staticYield( micros );
                     for( vector< shared_ptr< QueryOp > >::const_iterator i = ops.begin(); i != ops.end(); ++i ) {
@@ -615,8 +617,8 @@ namespace mongo {
         GUARD_OP_EXCEPTION( op, if ( !op.error() ) { op.next(); } );
     }
 
-    void QueryPlanSet::Runner::prepareToYield( QueryOp &op ) {
-        GUARD_OP_EXCEPTION( op, if ( !op.error() ) { op.prepareToYield(); } );
+    bool QueryPlanSet::Runner::prepareToYield( QueryOp &op ) {
+        GUARD_OP_EXCEPTION( op, if ( !op.error() ) { return op.prepareToYield(); } );
     }
 
     void QueryPlanSet::Runner::recoverFromYield( QueryOp &op ) {

diff --git a/db/queryoptimizer.h b/db/queryoptimizer.h
@@ -111,7 +111,7 @@ namespace mongo {
 
         virtual bool mayRecordPlan() const = 0;
 
-        virtual void prepareToYield() { massert( 13335, "yield not supported", false ); }
+        virtual bool prepareToYield() { massert( 13335, "yield not supported", false ); return false; }
         virtual void recoverFromYield() { massert( 13336, "yield not supported", false ); }
 
         /** @return a copy of the inheriting class, which will be run with its own
@@ -211,7 +211,7 @@ namespace mongo {
             QueryPlanSet &plans_;
             static void initOp( QueryOp &op );
             static void nextOp( QueryOp &op );
-            static void prepareToYield( QueryOp &op );
+            static bool prepareToYield( QueryOp &op );
             static void recoverFromYield( QueryOp &op );
         };
         const char *ns;

diff --git a/db/update.cpp b/db/update.cpp
@@ -735,11 +735,11 @@ namespace mongo {
                 setComplete();
             }
         }
-        virtual void prepareToYield() {
+        virtual bool prepareToYield() {
             if ( ! _cc ) {
                 _cc.reset( new ClientCursor( QueryOption_NoCursorTimeout , _c , qp().ns() ) );
             }
-            _cc->prepareToYield( _yieldData );
+            return _cc->prepareToYield( _yieldData );
         }        
         virtual void recoverFromYield() {
             if ( !ClientCursor::recoverFromYield( _yieldData ) ) {