SERVER-10026 clean up LiteParsedQuery, tunnel switch through dbtest, fix naming error in planner

Author: Hari Khalsa

src/mongo/db/clientcursor.cpp

@@ -143,8 +143,8 @@ namespace mongo {
 
         for (set<Runner*>::iterator it = nonCachedRunners.begin(); it != nonCachedRunners.end(); ++it) {
             Runner* runner = *it;
-            const char* runnerNS = runner->getQuery().getParsed().ns();
-            if ((isDB && str::startsWith(runnerNS, ns)) || (str::equals(runnerNS, ns))) {
+            const string& runnerNS = runner->getQuery().getParsed().ns();
+            if ((isDB && str::startsWith(runnerNS, ns)) || (str::equals(runnerNS.c_str(), ns))) {
                 runner->kill();
             }
         }

src/mongo/db/query/canonical_query.cpp

@@ -22,23 +22,18 @@
 namespace mongo {
 
     // static
-    Status CanonicalQuery::canonicalize(QueryMessage& qm, CanonicalQuery** out) {
+    Status CanonicalQuery::canonicalize(const QueryMessage& qm, CanonicalQuery** out) {
         auto_ptr<CanonicalQuery> cq(new CanonicalQuery());
 
-        // TODO: LiteParsedQuery throws.  Fix it to return error.
-        cq->_pq.reset(new LiteParsedQuery(qm));
-
-        // TODO: If pq.hasOption(QueryOption_CursorTailable) make sure it's a capped collection and
-        // make sure the order(??) is $natural: 1.
-
-        // TODO: Do we want to do this too?:
-        //if ( pq.getFields() != NULL )
-        //    pq.getFields()->validateQuery( query );
+        // Parse the query.
+        LiteParsedQuery* lpq;
+        Status parseStatus = LiteParsedQuery::make(qm, &lpq);
+        if (!parseStatus.isOK()) { return parseStatus; }
+        cq->_pq.reset(lpq);
 
+        // Build a parse tree from the BSONObj in the parsed query.
         StatusWithMatchExpression swme = MatchExpressionParser::parse(cq->_pq->getFilter());
-        if (!swme.isOK()) {
-            return swme.getStatus();
-        }
+        if (!swme.isOK()) { return swme.getStatus(); }
 
         cq->_root.reset(swme.getValue());
         *out = cq.release();
@@ -49,11 +44,10 @@ namespace mongo {
                                         CanonicalQuery** out) {
         auto_ptr<CanonicalQuery> cq(new CanonicalQuery());
 
-        // LiteParsedQuery saves the pointer to the NS that we provide it.  It's not going to remain
-        // valid unless we cache it ourselves.
-        cq->_ns = ns;
-
-        cq->_pq.reset(new LiteParsedQuery(cq->_ns.c_str(), 0, 0, 0, query));
+        LiteParsedQuery* lpq;
+        Status parseStatus = LiteParsedQuery::make(ns, 0, 0, 0, query, &lpq);
+        if (!parseStatus.isOK()) { return parseStatus; }
+        cq->_pq.reset(lpq);
 
         StatusWithMatchExpression swme = MatchExpressionParser::parse(cq->_pq->getFilter());
         if (!swme.isOK()) { return swme.getStatus(); }

src/mongo/db/query/canonical_query.h

@@ -26,14 +26,13 @@ namespace mongo {
 
     class CanonicalQuery {
     public:
-        // TODO: qm is mutable because LiteParsedQuery wants it mutable.  FIX.
-        static Status canonicalize(QueryMessage& qm, CanonicalQuery** out);
+        static Status canonicalize(const QueryMessage& qm, CanonicalQuery** out);
 
         // This is for testing, when we don't have a QueryMessage.
         static Status canonicalize(const string& ns, const BSONObj& query, CanonicalQuery** out);
 
         // What namespace is this query over?
-        const char* ns() const { return _pq->ns(); }
+        const string& ns() const { return _pq->ns(); }
 
         //
         // Accessors for the query
@@ -52,8 +51,6 @@ namespace mongo {
 
         // _root points into _pq->getFilter()
         scoped_ptr<MatchExpression> _root;
-
-        string _ns;
     };
 
 }  // namespace mongo