summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
authorMihai Andrei <mihai.andrei@10gen.com>2022-04-22 14:30:28 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-04-22 15:01:37 +0000
commit11c173924669a695129bee260d01a1fd09d20523 (patch)
tree419ceadf2c40703d8b6c17e926931a48af613322 /src/mongo/db
parent0a16e785f7016c92fb3357377ef2d6d50db3ffc9 (diff)
downloadmongo-11c173924669a695129bee260d01a1fd09d20523.tar.gz
SERVER-65695 Delete checks for atomic query knobs when getting secondary namespaces
(cherry picked from commit 8a5e1910c19b1479aca4ae8d513c030dd5657dc7)
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/commands/run_aggregate.cpp4
-rw-r--r--src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/mongo/db/commands/run_aggregate.cpp b/src/mongo/db/commands/run_aggregate.cpp
index f7304c4b095..89239fc8713 100644
--- a/src/mongo/db/commands/run_aggregate.cpp
+++ b/src/mongo/db/commands/run_aggregate.cpp
@@ -683,9 +683,7 @@ Status runAggregate(OperationContext* opCtx,
std::vector<NamespaceStringOrUUID> secondaryExecNssList;
// Taking locks over multiple collections is not supported outside of $lookup pushdown.
- if (feature_flags::gFeatureFlagSBELookupPushdown.isEnabledAndIgnoreFCV() &&
- !internalQuerySlotBasedExecutionDisableLookupPushdown.load() &&
- !internalQueryForceClassicEngine.load()) {
+ if (feature_flags::gFeatureFlagSBELookupPushdown.isEnabledAndIgnoreFCV()) {
secondaryExecNssList = liteParsedPipeline.getForeignExecutionNamespaces();
}
diff --git a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp
index 7ad03e7c517..469ce5821aa 100644
--- a/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp
+++ b/src/mongo/db/pipeline/process_interface/common_mongod_process_interface.cpp
@@ -434,9 +434,7 @@ CommonMongodProcessInterface::attachCursorSourceToPipelineForLocalRead(Pipeline*
// Reparse 'pipeline' to discover whether there are secondary namespaces that we need to lock
// when constructing our query executor.
std::vector<NamespaceStringOrUUID> secondaryNamespaces = [&]() {
- if (feature_flags::gFeatureFlagSBELookupPushdown.isEnabledAndIgnoreFCV() &&
- !internalQuerySlotBasedExecutionDisableLookupPushdown.load() &&
- !internalQueryForceClassicEngine.load()) {
+ if (feature_flags::gFeatureFlagSBELookupPushdown.isEnabledAndIgnoreFCV()) {
auto lpp = LiteParsedPipeline(expCtx->ns, pipeline->serializeToBson());
return lpp.getForeignExecutionNamespaces();
} else {