SERVER-10471 merge index bounds, enumerate based on indices, bug fixes

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mongo/db/query/query_solution.h b/src/mongo/db/query/query_solution.h
index 948ac02e658..c8a0e933247 100644
--- a/src/mongo/db/query/query_solution.h
+++ b/src/mongo/db/query/query_solution.h
@@ -49,6 +49,12 @@ namespace mongo {
          */
         virtual StageType getType() const = 0;
 
+        string toString() const {
+            stringstream ss;
+            appendToString(&ss, 0);
+            return ss.str();
+        }
+
         /**
          * Internal function called by toString()
          *
@@ -75,9 +81,6 @@ namespace mongo {
          * Usage: If an index-only plan has all the fields we're interested in, we don't
          * have to fetch to show results with those fields.
          *
-         * XXX TODO: Cover issues resulting from covered and multikey.  Multikey prohibits
-         * covering, but allows sort (double check!)
-         *
          * TODO: 'field' is probably more appropriate as a FieldRef or string.
          */
         virtual bool hasField(const string& field) const = 0;
@@ -297,6 +300,8 @@ namespace mongo {
 
         BSONObj indexKeyPattern;
 
+        bool indexIsMultiKey;
+
         scoped_ptr<MatchExpression> filter;
 
         // Only set for 2d.