diff options
author | David Hatch <david.hatch@mongodb.com> | 2016-06-01 10:39:21 -0400 |
---|---|---|
committer | David Hatch <david.hatch@mongodb.com> | 2016-06-03 15:48:07 -0400 |
commit | 7c3c0f3bcb487b16ff556d06a4fd66e0fb67de1c (patch) | |
tree | 41b472545759aa21aff247152c09e92a825119f8 /src/mongo/dbtests/plan_ranking.cpp | |
parent | ee7acb15457859045419ce597ef7319ae775c4f3 (diff) | |
download | mongo-7c3c0f3bcb487b16ff556d06a4fd66e0fb67de1c.tar.gz |
SERVER-24118 Rename LiteParsedQuery to QueryRequest.
Diffstat (limited to 'src/mongo/dbtests/plan_ranking.cpp')
-rw-r--r-- | src/mongo/dbtests/plan_ranking.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/mongo/dbtests/plan_ranking.cpp b/src/mongo/dbtests/plan_ranking.cpp index 6acaffe12ff..4d91206d198 100644 --- a/src/mongo/dbtests/plan_ranking.cpp +++ b/src/mongo/dbtests/plan_ranking.cpp @@ -198,10 +198,10 @@ public: // Run the query {a:4, b:1}. { - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 100 << "b" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 100 << "b" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); verify(statusWithCQ.isOK()); cq = std::move(statusWithCQ.getValue()); ASSERT(cq.get()); @@ -218,10 +218,10 @@ public: // And run the same query again. { - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 100 << "b" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 100 << "b" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); verify(statusWithCQ.isOK()); cq = std::move(statusWithCQ.getValue()); } @@ -254,10 +254,10 @@ public: addIndex(BSON("b" << 1)); // Run the query {a:1, b:{$gt:1}. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 1 << "b" << BSON("$gt" << 1))); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 1 << "b" << BSON("$gt" << 1))); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); verify(statusWithCQ.isOK()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -295,11 +295,11 @@ public: addIndex(BSON("a" << 1 << "b" << 1)); // Query for a==27 with projection that wants 'a' and 'b'. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 27)); - lpq->setProj(BSON("_id" << 0 << "a" << 1 << "b" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 27)); + qr->setProj(BSON("_id" << 0 << "a" << 1 << "b" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -331,10 +331,10 @@ public: addIndex(BSON("b" << 1)); // There is no data that matches this query but we don't know that until EOF. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 1 << "b" << 1 << "c" << 99)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 1 << "b" << 1 << "c" << 99)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -369,12 +369,12 @@ public: // There is no data that matches this query ({a:2}). Both scans will hit EOF before // returning any data. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 2)); - lpq->setProj(BSON("_id" << 0 << "a" << 1 << "b" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 2)); + qr->setProj(BSON("_id" << 0 << "a" << 1 << "b" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -405,10 +405,10 @@ public: addIndex(BSON("b" << 1)); // Run the query {a:N+1, b:1}. (No such document.) - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << N + 1 << "b" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << N + 1 << "b" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); verify(statusWithCQ.isOK()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -442,10 +442,10 @@ public: addIndex(BSON("b" << 1)); // Run the query {a:N+1, b:1}. (No such document.) - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << BSON("$gte" << N + 1) << "b" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << BSON("$gte" << N + 1) << "b" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); verify(statusWithCQ.isOK()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -472,11 +472,11 @@ public: // Run a query with a sort. The blocking sort won't produce any data during the // evaluation period. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("_id" << BSON("$gte" << 20 << "$lte" << 200))); - lpq->setSort(BSON("c" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("_id" << BSON("$gte" << 20 << "$lte" << 200))); + qr->setSort(BSON("c" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); @@ -503,10 +503,10 @@ public: } // Look for A Space Odyssey. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("foo" << 2001)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("foo" << 2001)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); verify(statusWithCQ.isOK()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -537,11 +537,11 @@ public: addIndex(BSON("d" << 1 << "e" << 1)); // Query: find({a: 1}).sort({d: 1}) - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(BSON("a" << 1)); - lpq->setSort(BSON("d" << 1)); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(BSON("a" << 1)); + qr->setSort(BSON("d" << 1)); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -576,10 +576,10 @@ public: // Solutions using either 'a' or 'b' will take a long time to start producing // results. However, an index scan on 'b' will start producing results sooner // than an index scan on 'a'. - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(fromjson("{a: 1, b: 1, c: {$gte: 5000}}")); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(fromjson("{a: 1, b: 1, c: {$gte: 5000}}")); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); @@ -609,10 +609,10 @@ public: addIndex(BSON("b" << 1 << "c" << 1)); addIndex(BSON("a" << 1)); - auto lpq = stdx::make_unique<LiteParsedQuery>(nss); - lpq->setFilter(fromjson("{a: 9, b: {$ne: 10}, c: 9}")); + auto qr = stdx::make_unique<QueryRequest>(nss); + qr->setFilter(fromjson("{a: 9, b: {$ne: 10}, c: 9}")); auto statusWithCQ = CanonicalQuery::canonicalize( - txn(), std::move(lpq), ExtensionsCallbackDisallowExtensions()); + txn(), std::move(qr), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); unique_ptr<CanonicalQuery> cq = std::move(statusWithCQ.getValue()); ASSERT(NULL != cq.get()); |