diff options
author | David Storch <david.storch@10gen.com> | 2018-10-30 12:30:20 -0400 |
---|---|---|
committer | David Storch <david.storch@10gen.com> | 2018-11-07 15:05:49 -0500 |
commit | f0b39d9184094661fcaa1049531b80b5ad6b3995 (patch) | |
tree | 6fcab5eb450ca32fc7683de08bac184cf9dda15d /src/mongo/dbtests/query_stage_merge_sort.cpp | |
parent | 56248d50536a25d63526662683b221df8137ab36 (diff) | |
download | mongo-f0b39d9184094661fcaa1049531b80b5ad6b3995.tar.gz |
SERVER-37446 Change PlanStages which don't require a collection to avoid keeping a Collection*.
In order to prevent COUNT stage from requiring a Collection*, splits
fast count into a new RECORD_STORE_FAST_COUNT stage.
Diffstat (limited to 'src/mongo/dbtests/query_stage_merge_sort.cpp')
-rw-r--r-- | src/mongo/dbtests/query_stage_merge_sort.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/dbtests/query_stage_merge_sort.cpp b/src/mongo/dbtests/query_stage_merge_sort.cpp index 95ea033516b..49ba59c0ac4 100644 --- a/src/mongo/dbtests/query_stage_merge_sort.cpp +++ b/src/mongo/dbtests/query_stage_merge_sort.cpp @@ -165,7 +165,7 @@ public: // Sort by c:1 MergeSortStageParams msparams; msparams.pattern = BSON("c" << 1); - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); @@ -230,7 +230,7 @@ public: // Sort by c:1 MergeSortStageParams msparams; msparams.pattern = BSON("c" << 1); - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); @@ -294,7 +294,7 @@ public: MergeSortStageParams msparams; msparams.dedup = false; msparams.pattern = BSON("c" << 1); - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); @@ -360,7 +360,7 @@ public: // Sort by c:-1 MergeSortStageParams msparams; msparams.pattern = BSON("c" << -1); - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); @@ -428,7 +428,7 @@ public: // Sort by c:1 MergeSortStageParams msparams; msparams.pattern = BSON("c" << 1); - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); @@ -478,7 +478,7 @@ public: // Sort by foo:1 MergeSortStageParams msparams; msparams.pattern = BSON("foo" << 1); - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); int numIndices = 20; for (int i = 0; i < numIndices; ++i) { @@ -530,7 +530,7 @@ public: // Sort by foo:1 MergeSortStageParams msparams; msparams.pattern = BSON("foo" << 1); - auto ms = make_unique<MergeSortStage>(&_opCtx, msparams, &ws, coll); + auto ms = make_unique<MergeSortStage>(&_opCtx, msparams, &ws); // Index 'a'+i has foo equal to 'i'. @@ -658,7 +658,7 @@ public: WorkingSetMember* member; MergeSortStageParams msparams; msparams.pattern = BSON("a" << 1); - auto ms = stdx::make_unique<MergeSortStage>(&_opCtx, msparams, &ws, coll); + auto ms = stdx::make_unique<MergeSortStage>(&_opCtx, msparams, &ws); // First child scans [5, 10]. { @@ -757,7 +757,7 @@ public: MergeSortStageParams msparams; msparams.pattern = BSON("c" << 1 << "d" << 1); msparams.collator = nullptr; - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); @@ -825,7 +825,7 @@ public: msparams.pattern = BSON("c" << 1 << "d" << 1); CollatorInterfaceMock collator(CollatorInterfaceMock::MockType::kReverseString); msparams.collator = &collator; - MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get(), coll); + MergeSortStage* ms = new MergeSortStage(&_opCtx, msparams, ws.get()); // a:1 auto params = makeIndexScanParams(&_opCtx, getIndex(firstIndex, coll)); |