SERVER-12124 SERVER-10026 EOFRunner properly explain null collscan

2 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/query/eof_runner.cpp b/src/mongo/db/query/eof_runner.cpp
index d4edf0138c7..c26564c168f 100644
--- a/src/mongo/db/query/eof_runner.cpp
+++ b/src/mongo/db/query/eof_runner.cpp
@@ -73,6 +73,11 @@ namespace mongo {
     Status EOFRunner::getExplainPlan(TypeExplain** explain) const {
         *explain = new TypeExplain;
 
+        // Fill in mandatory fields.
+        (*explain)->setN(0);
+        (*explain)->setNScannedObjects(0);
+        (*explain)->setNScanned(0);
+
         // Fill in all the main fields that don't have a default in the explain data structure.
         (*explain)->setCursor("BasicCursor");
         (*explain)->setScanAndOrder(false);
@@ -85,6 +90,9 @@ namespace mongo {
         allPlans->setCursor("BasicCursor");
         (*explain)->addToAllPlans(allPlans); // ownership xfer
 
+        (*explain)->setNScannedObjectsAllPlans(0);
+        (*explain)->setNScannedAllPlans(0);
+
         return Status::OK();
     }
 
diff --git a/src/mongo/db/query/eof_runner.h b/src/mongo/db/query/eof_runner.h
index de33c1c2b03..bffeb4f59a8 100644
--- a/src/mongo/db/query/eof_runner.h
+++ b/src/mongo/db/query/eof_runner.h
@@ -48,7 +48,7 @@ namespace mongo {
     class EOFRunner : public Runner {
     public:
 
-        /* Takes onwership */
+        /* Takes ownership */
         EOFRunner(CanonicalQuery* cq, const std::string& ns);
 
         virtual ~EOFRunner();