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/db/exec/sort_key_generator.cpp | |
| parent | ee7acb15457859045419ce597ef7319ae775c4f3 (diff) | |
| download | mongo-7c3c0f3bcb487b16ff556d06a4fd66e0fb67de1c.tar.gz | |
SERVER-24118 Rename LiteParsedQuery to QueryRequest.
Diffstat (limited to 'src/mongo/db/exec/sort_key_generator.cpp')
| -rw-r--r-- | src/mongo/db/exec/sort_key_generator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/exec/sort_key_generator.cpp b/src/mongo/db/exec/sort_key_generator.cpp index 28b0d33c1a3..b04849bb046 100644 --- a/src/mongo/db/exec/sort_key_generator.cpp +++ b/src/mongo/db/exec/sort_key_generator.cpp @@ -74,7 +74,7 @@ SortKeyGenerator::SortKeyGenerator(OperationContext* txn, if (elt.isNumber()) { // Btree key. elt (should be) foo: 1 or foo: -1. btreeBob.append(elt); - } else if (LiteParsedQuery::isTextScoreMeta(elt)) { + } else if (QueryRequest::isTextScoreMeta(elt)) { _sortHasMeta = true; } else { // Sort spec. should have been validated before here. @@ -139,7 +139,7 @@ Status SortKeyGenerator::getSortKey(const WorkingSetMember& member, BSONObj* obj if (elt.isNumber()) { // Merge btree key elt. mergedKeyBob.append(sortKeyIt.next()); - } else if (LiteParsedQuery::isTextScoreMeta(elt)) { + } else if (QueryRequest::isTextScoreMeta(elt)) { // Add text score metadata double score = 0.0; if (member.hasComputed(WSM_COMPUTED_TEXT_SCORE)) { @@ -245,14 +245,14 @@ void SortKeyGenerator::getBoundsForSort(OperationContext* txn, _collator); params.indices.push_back(sortOrder); - auto lpq = stdx::make_unique<LiteParsedQuery>(NamespaceString("fake.ns")); - lpq->setFilter(queryObj); + auto qr = stdx::make_unique<QueryRequest>(NamespaceString("fake.ns")); + qr->setFilter(queryObj); if (_collator) { - lpq->setCollation(CollationSerializer::specToBSON(_collator->getSpec())); + qr->setCollation(CollationSerializer::specToBSON(_collator->getSpec())); } auto statusWithQueryForSort = - CanonicalQuery::canonicalize(txn, std::move(lpq), ExtensionsCallbackNoop()); + CanonicalQuery::canonicalize(txn, std::move(qr), ExtensionsCallbackNoop()); verify(statusWithQueryForSort.isOK()); std::unique_ptr<CanonicalQuery> queryForSort = std::move(statusWithQueryForSort.getValue()); |