SERVER-14799 hint for a count allows hint to be specified as a document

1 files changed, 8 insertions, 2 deletions

diff --git a/src/mongo/db/commands/count.cpp b/src/mongo/db/commands/count.cpp
index c8f1e95bb59..f5dd51ab18b 100644
--- a/src/mongo/db/commands/count.cpp
+++ b/src/mongo/db/commands/count.cpp
@@ -166,8 +166,14 @@ namespace mongo {
             query = cmdObj.getObjectField("query");
         }
 
-        const std::string hint = cmdObj.getStringField("hint");
-        const BSONObj hintObj = hint.empty() ? BSONObj() : BSON("$hint" << hint);
+        BSONObj hintObj;
+        if (Object == cmdObj["hint"].type()) {
+            hintObj = cmdObj["hint"].Obj();
+        }
+        else if (String == cmdObj["hint"].type()) {
+            const std::string hint = cmdObj.getStringField("hint");
+            hintObj = BSON("$hint" << hint);
+        }
 
         // Parsed correctly. Fill out 'request' with the results.
         request->ns = ns;