CXX-184 Add MaxTimeMs support to command helpers

Author: TylerBrock

src/mongo/client/dbclient.cpp

@@ -267,6 +267,11 @@ namespace mongo {
         return *this;
     }
 
+    Query& Query::maxTimeMs(int millis) {
+        appendComplex( "$maxTimeMS", millis );
+        return *this;
+    }
+
     Query& Query::explain() {
         appendComplex( "$explain", true );
         return *this;
@@ -301,6 +306,21 @@ namespace mongo {
         return false;
     }
 
+    BSONObj Query::getModifiers() const {
+        std::set<string> names;
+        obj.getFieldNames(names);
+
+        BSONObjBuilder complexFields;
+
+        std::set<string>::const_iterator nameIterator;
+        for(nameIterator = names.begin(); nameIterator != names.end(); ++nameIterator) {
+            if (nameIterator->find('$') == '0')
+                complexFields.append(obj.getField(*nameIterator));
+        }
+
+        return complexFields.obj();
+    }
+
     Query& Query::readPref(ReadPreference pref, const BSONArray& tags) {
         string mode;
 
@@ -353,6 +373,10 @@ namespace mongo {
         return hasReadPreference(obj);
     }
 
+    bool Query::hasMaxTimeMs() const {
+        return obj.hasField( "$maxTimeMS" );
+    }
+
     BSONObj Query::getFilter() const {
         bool hasDollar;
         if ( ! isComplex( &hasDollar ) )
@@ -378,6 +402,10 @@ namespace mongo {
         return obj.getObjectField(ReadPrefField.name());
     }
 
+    int Query::getMaxTimeMs() const {
+        return obj.getIntField("maxTimeMs");
+    }
+
     bool Query::isExplain() const {
         return isComplex() && obj.getBoolField( "$explain" );
     }
@@ -472,8 +500,8 @@ namespace mongo {
         if ( skip )
             b.append( "skip" , skip );
 
-        if (query.hasReadPreference())
-            b.append(query.ReadPrefField.name(), query.getReadPref());
+        if (query.isComplex())
+            b.appendElements(query.getModifiers());
 
         return b.obj();
     }
@@ -817,8 +845,9 @@ namespace mongo {
 
         if( !query.obj.isEmpty() )
             b.append("query", query.getFilter());
-        if (query.hasReadPreference())
-            b.append(query.ReadPrefField.name(), query.getReadPref());
+
+        if (query.isComplex())
+            b.appendElements(query.getModifiers());
 
         b.append("out", output.out);
         BSONObj info;
@@ -889,8 +918,8 @@ namespace mongo {
         BSONObjBuilder commandBuilder;
         commandBuilder.append("group", group);
 
-        if (query.hasReadPreference())
-            commandBuilder.append(query.ReadPrefField.name(), query.getReadPref());
+        if (query.isComplex())
+            commandBuilder.appendElements(query.getModifiers());
 
         BSONObj result;
         bool ok = runCommand(nsGetDB(ns.toString()), commandBuilder.obj(), result);
@@ -915,8 +944,9 @@ namespace mongo {
         commandBuilder.append("distinct", nsGetCollection(ns.toString()));
         commandBuilder.append("key", field);
         commandBuilder.append("query", query.getFilter());
-        if (query.hasReadPreference())
-            commandBuilder.append(query.ReadPrefField.name(), query.getReadPref());
+
+        if (query.isComplex())
+            commandBuilder.appendElements(query.getModifiers());
 
         BSONObj result;
         bool ok = runCommand(nsGetDB(ns.toString()), commandBuilder.obj(), result);

src/mongo/client/dbclientinterface.h

@@ -347,6 +347,12 @@ namespace mongo {
         Query& hint(BSONObj keyPattern);
         Query& hint(const std::string &jsonKeyPatt);
 
+        /**
+         * Specifies a cumulative time limit in milliseconds for processing an operation.
+         * MongoDB will interrupt the operation at the earliest following interrupt point.
+         */
+        Query& maxTimeMs(int millis);
+
         /** Provide min and/or max index limits for the query.
             min <= x < max
          */
@@ -402,19 +408,22 @@ namespace mongo {
          * @return true if this query has an orderby, hint, or some other field
          */
         bool isComplex( bool * hasDollar = 0 ) const;
+        BSONObj getModifiers() const;
         static bool MONGO_CLIENT_FUNC isComplex(const BSONObj& obj, bool* hasDollar = 0);
 
         BSONObj getFilter() const;
         BSONObj getSort() const;
         BSONObj getHint() const;
         BSONObj getReadPref() const;
+        int getMaxTimeMs() const;
         bool isExplain() const;
 
         /**
          * @return true if the query object contains a read preference specification object.
          */
         static bool MONGO_CLIENT_FUNC hasReadPreference(const BSONObj& queryObj);
         bool hasReadPreference() const;
+        bool hasMaxTimeMs() const;
 
         std::string toString() const;
         operator std::string() const { return toString(); }

src/mongo/unittest/dbclient_test.cpp

@@ -1024,32 +1024,21 @@ namespace {
         c.insert(TEST_NS, BSON("a" << true));
         BSONObj result;
 
-        c.runCommand("admin", BSON("buildinfo" << true), result);
-
-        if (versionCmp(result["version"].toString(), "2.5.3") >= 0) {
+        if (serverGTE(&c, 2, 6)) {
             c.runCommand("admin", BSON(
                 "configureFailPoint" << "maxTimeAlwaysTimeOut" <<
                 "mode" << BSON("times" << 2)
             ), result);
 
             // First test with a query
-            ASSERT_NO_THROW(
-                c.findOne(TEST_NS, Query("{$query: {}}"));
-            );
-            ASSERT_THROWS(
-                c.findOne(TEST_NS, Query("{$query: {}, $maxTimeMS: 1}"));
-            , DBException);
+            ASSERT_NO_THROW(c.findOne(TEST_NS, Query("{}")););
+            ASSERT_THROWS(c.findOne(TEST_NS, Query("{}").maxTimeMs(1)), DBException);
 
             // Then test with a command
-            ASSERT_TRUE(
-                c.runCommand(TEST_DB, BSON("count" << TEST_COLL), result)
-            );
-            ASSERT_FALSE(
-                c.runCommand(TEST_DB,
-                    BSON("count" << TEST_COLL << "maxTimeMS" << 1), result)
-            );
+            ASSERT_NO_THROW(c.count(TEST_NS, Query("{}")));
+            ASSERT_THROWS(c.count(TEST_NS, Query("{}").maxTimeMs(1)), DBException);
         } else {
-            // we are not connected to MongoDB >= 2.5.3, skip
+            // we are not connected to MongoDB >= 2.6, skip
             SUCCEED();
         }
     }