add options to Futures SERVER-3405

2 files changed, 9 insertions, 7 deletions

diff --git a/client/parallel.cpp b/client/parallel.cpp
index f157927703f..c758b99ac50 100644
--- a/client/parallel.cpp
+++ b/client/parallel.cpp
@@ -410,6 +410,7 @@ namespace mongo {
         }
     }
 
+    // TODO:  Merge with futures API?  We do a lot of error checking here that would be useful elsewhere.
     void ParallelSortClusteredCursor::_init() {
 
         // log() << "Starting parallel search..." << endl;
@@ -720,8 +721,8 @@ namespace mongo {
     // ---- Future -----
     // -----------------
 
-    Future::CommandResult::CommandResult( const string& server , const string& db , const BSONObj& cmd , DBClientBase * conn )
-        :_server(server) ,_db(db) ,_cmd(cmd) ,_conn(conn) ,_done(false)
+    Future::CommandResult::CommandResult( const string& server , const string& db , const BSONObj& cmd , int options , DBClientBase * conn )
+        :_server(server) ,_db(db) , _options(options), _cmd(cmd) ,_conn(conn) ,_done(false)
     {
         try {
             if ( ! _conn ){
@@ -729,7 +730,7 @@ namespace mongo {
                 _conn = _connHolder->get();
             }
             
-            _cursor.reset( new DBClientCursor(_conn, _db + ".$cmd", _cmd, -1/*limit*/, 0, NULL, 0, 0));
+            _cursor.reset( new DBClientCursor(_conn, _db + ".$cmd", _cmd, -1/*limit*/, 0, NULL, _options, 0));
             _cursor->initLazy();
         }
         catch ( std::exception& e ) {
@@ -768,8 +769,8 @@ namespace mongo {
         return _ok;
     }
 
-    shared_ptr<Future::CommandResult> Future::spawnCommand( const string& server , const string& db , const BSONObj& cmd , DBClientBase * conn ) {
-        shared_ptr<Future::CommandResult> res (new Future::CommandResult( server , db , cmd , conn  ));
+    shared_ptr<Future::CommandResult> Future::spawnCommand( const string& server , const string& db , const BSONObj& cmd , int options , DBClientBase * conn ) {
+        shared_ptr<Future::CommandResult> res (new Future::CommandResult( server , db , cmd , options , conn  ));
         return res;
     }
 
diff --git a/client/parallel.h b/client/parallel.h
index 332840edea1..869bff95a4a 100644
--- a/client/parallel.h
+++ b/client/parallel.h
@@ -280,10 +280,11 @@ namespace mongo {
 
         private:
 
-            CommandResult( const string& server , const string& db , const BSONObj& cmd , DBClientBase * conn );
+            CommandResult( const string& server , const string& db , const BSONObj& cmd , int options , DBClientBase * conn );
 
             string _server;
             string _db;
+            int _options;
             BSONObj _cmd;
             DBClientBase * _conn;
             scoped_ptr<ScopedDbConnection> _connHolder; // used if not provided a connection
@@ -304,7 +305,7 @@ namespace mongo {
          * @param cmd cmd to exec
          * @param conn optional connection to use.  will use standard pooled if non-specified
          */
-        static shared_ptr<CommandResult> spawnCommand( const string& server , const string& db , const BSONObj& cmd , DBClientBase * conn = 0 );
+        static shared_ptr<CommandResult> spawnCommand( const string& server , const string& db , const BSONObj& cmd , int options , DBClientBase * conn = 0 );
     };