SERVER-13292 fast path simple/fully covered projections

1 files changed, 17 insertions, 19 deletions

diff --git a/src/mongo/db/exec/projection_exec.cpp b/src/mongo/db/exec/projection_exec.cpp
index 15a224cbe72..afa60132631 100644
--- a/src/mongo/db/exec/projection_exec.cpp
+++ b/src/mongo/db/exec/projection_exec.cpp
@@ -249,7 +249,23 @@ namespace mongo {
         }
 
         BSONObjBuilder bob;
-        if (!requiresDocument()) {
+        if (member->hasObj()) {
+            MatchDetails matchDetails;
+
+            // If it's a positional projection we need a MatchDetails.
+            if (transformRequiresDetails()) {
+                matchDetails.requestElemMatchKey();
+                verify(NULL != _queryExpression);
+                verify(_queryExpression->matchesBSON(member->obj, &matchDetails));
+            }
+
+            Status projStatus = transform(member->obj, &bob, &matchDetails);
+            if (!projStatus.isOK()) {
+                return projStatus;
+            }
+        }
+        else {
+            verify(!requiresDocument());
             // Go field by field.
             if (_includeID) {
                 BSONElement elt;
@@ -273,24 +289,6 @@ namespace mongo {
                 }
             }
         }
-        else {
-            // Planner should have done this.
-            verify(member->hasObj());
-
-            MatchDetails matchDetails;
-
-            // If it's a positional projection we need a MatchDetails.
-            if (transformRequiresDetails()) {
-                matchDetails.requestElemMatchKey();
-                verify(NULL != _queryExpression);
-                verify(_queryExpression->matchesBSON(member->obj, &matchDetails));
-            }
-
-            Status projStatus = transform(member->obj, &bob, &matchDetails);
-            if (!projStatus.isOK()) {
-                return projStatus;
-            }
-        }
 
         for (MetaMap::const_iterator it = _meta.begin(); it != _meta.end(); ++it) {
             if (META_GEONEAR_DIST == it->second) {