summaryrefslogtreecommitdiff
path: root/src/mongo/db/query/canonical_query.cpp
diff options
context:
space:
mode:
authorHari Khalsa <hkhalsa@10gen.com>2013-08-08 23:15:00 -0400
committerHari Khalsa <hkhalsa@10gen.com>2013-08-12 11:52:13 -0400
commit69f264e93dee509597f787773e1f05e1ec313d2b (patch)
tree5880c7cda25e10118467317ec158da3d7913da68 /src/mongo/db/query/canonical_query.cpp
parent525f2f11ac545221f1b0af0746d0891c40ed9aa7 (diff)
downloadmongo-69f264e93dee509597f787773e1f05e1ec313d2b.tar.gz
SERVER-10026 SERVER-10471 unittestable query planner
Diffstat (limited to 'src/mongo/db/query/canonical_query.cpp')
-rw-r--r--src/mongo/db/query/canonical_query.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/query/canonical_query.cpp b/src/mongo/db/query/canonical_query.cpp
index ee546150adc..4e4aec737ee 100644
--- a/src/mongo/db/query/canonical_query.cpp
+++ b/src/mongo/db/query/canonical_query.cpp
@@ -25,8 +25,8 @@ namespace mongo {
Status CanonicalQuery::canonicalize(QueryMessage& qm, CanonicalQuery** out) {
auto_ptr<CanonicalQuery> cq(new CanonicalQuery());
- // TODO: ParsedQuery throws. Fix it to return error.
- cq->_pq.reset(new ParsedQuery(qm));
+ // 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.
@@ -49,11 +49,11 @@ namespace mongo {
CanonicalQuery** out) {
auto_ptr<CanonicalQuery> cq(new CanonicalQuery());
- // ParsedQuery saves the pointer to the NS that we provide it. It's not going to remain
+ // 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 ParsedQuery(cq->_ns.c_str(), 0, 0, 0, query, BSONObj()));
+ cq->_pq.reset(new LiteParsedQuery(cq->_ns.c_str(), 0, 0, 0, query));
StatusWithMatchExpression swme = MatchExpressionParser::parse(cq->_pq->getFilter());
if (!swme.isOK()) { return swme.getStatus(); }