diff options
| author | David Storch <david.storch@10gen.com> | 2016-08-22 16:41:50 -0400 |
|---|---|---|
| committer | David Storch <david.storch@10gen.com> | 2016-08-23 17:42:08 -0400 |
| commit | f3be5348457ff71185ca9fa137ab7c1a8e4761df (patch) | |
| tree | e2bdc25fab6568d577cb14f9905d593c07ee86e4 /src/mongo/db/query/query_solution.cpp | |
| parent | 6b5fd115d38582d8b349a5aad2c29867e69dc758 (diff) | |
| download | mongo-f3be5348457ff71185ca9fa137ab7c1a8e4761df.tar.gz | |
SERVER-24508 delete BSONObjCmp
Instead, use BSONObj::ComparatorInterface.
Diffstat (limited to 'src/mongo/db/query/query_solution.cpp')
| -rw-r--r-- | src/mongo/db/query/query_solution.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/mongo/db/query/query_solution.cpp b/src/mongo/db/query/query_solution.cpp index 2cf4dc81c36..ade1cf451b1 100644 --- a/src/mongo/db/query/query_solution.cpp +++ b/src/mongo/db/query/query_solution.cpp @@ -217,7 +217,11 @@ QuerySolutionNode* TextNode::clone() const { // CollectionScanNode // -CollectionScanNode::CollectionScanNode() : tailable(false), direction(1), maxScan(0) {} +CollectionScanNode::CollectionScanNode() + : _sort(SimpleBSONObjComparator::kInstance.makeBSONObjSet()), + tailable(false), + direction(1), + maxScan(0) {} void CollectionScanNode::appendToString(mongoutils::str::stream* ss, int indent) const { addIndent(ss, indent); @@ -248,7 +252,7 @@ QuerySolutionNode* CollectionScanNode::clone() const { // AndHashNode // -AndHashNode::AndHashNode() {} +AndHashNode::AndHashNode() : _sort(SimpleBSONObjComparator::kInstance.makeBSONObjSet()) {} AndHashNode::~AndHashNode() {} @@ -302,7 +306,7 @@ QuerySolutionNode* AndHashNode::clone() const { // AndSortedNode // -AndSortedNode::AndSortedNode() {} +AndSortedNode::AndSortedNode() : _sort(SimpleBSONObjComparator::kInstance.makeBSONObjSet()) {} AndSortedNode::~AndSortedNode() {} @@ -352,7 +356,7 @@ QuerySolutionNode* AndSortedNode::clone() const { // OrNode // -OrNode::OrNode() : dedup(true) {} +OrNode::OrNode() : _sort(SimpleBSONObjComparator::kInstance.makeBSONObjSet()), dedup(true) {} OrNode::~OrNode() {} @@ -412,7 +416,8 @@ QuerySolutionNode* OrNode::clone() const { // MergeSortNode // -MergeSortNode::MergeSortNode() : dedup(true) {} +MergeSortNode::MergeSortNode() + : _sorts(SimpleBSONObjComparator::kInstance.makeBSONObjSet()), dedup(true) {} MergeSortNode::~MergeSortNode() {} @@ -473,7 +478,7 @@ QuerySolutionNode* MergeSortNode::clone() const { // FetchNode // -FetchNode::FetchNode() {} +FetchNode::FetchNode() : _sorts(SimpleBSONObjComparator::kInstance.makeBSONObjSet()) {} void FetchNode::appendToString(mongoutils::str::stream* ss, int indent) const { addIndent(ss, indent); @@ -505,7 +510,8 @@ QuerySolutionNode* FetchNode::clone() const { // IndexScanNode::IndexScanNode(IndexEntry index) - : index(std::move(index)), + : _sorts(SimpleBSONObjComparator::kInstance.makeBSONObjSet()), + index(std::move(index)), direction(1), maxScan(0), addKeyMetadata(false), |