mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

Revert "SERVER-47530 Query plan executor: Convert usage of getCollectionDescription_DEPRECATED to getCollectionDescription"

Browse Source 
This reverts commit 7fa85b78aa.
This commit is contained in:
Pierlauro Sciarelli 2020-04-28 13:04:02 +02:00 committed by Evergreen Agent
parent 2f9cbb7f81
commit 4b49aa1239
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mongo/db/pipeline/sharded_agg_helpers.cpp
View File

@ -1149,7 +1149,7 @@ std::unique_ptr<Pipeline, PipelineDeleter> attachCursorToPipeline(Pipeline* owne
// If the db is local, this may be a change stream examining the oplog. We know the
// oplog (and any other local collections) will not be sharded.
return expCtx->mongoProcessInterface->attachCursorSourceToPipelineForLocalRead(
pipelineToTarget.release());
pipeline.release());
}
return targetShardsAndAddMergeCursors(expCtx, pipelineToTarget.release());
});

4
src/mongo/db/query/get_executor.cpp
View File

@ -287,8 +287,8 @@ void fillOutPlannerParams(OperationContext* opCtx,
// If the caller wants a shard filter, make sure we're actually sharded.
if (plannerParams->options & QueryPlannerParams::INCLUDE_SHARD_FILTER) {
auto collDesc =
CollectionShardingState::get(opCtx, canonicalQuery->nss())->getCollectionDescription();
auto collDesc = CollectionShardingState::get(opCtx, canonicalQuery->nss())
->getCollectionDescription_DEPRECATED();
if (collDesc.isSharded()) {
plannerParams->shardKey = collDesc.getKeyPattern();
} else {