From 11c173924669a695129bee260d01a1fd09d20523 Mon Sep 17 00:00:00 2001 From: Mihai Andrei Date: Fri, 22 Apr 2022 14:30:28 +0000 Subject: SERVER-65695 Delete checks for atomic query knobs when getting secondary namespaces (cherry picked from commit 8a5e1910c19b1479aca4ae8d513c030dd5657dc7) --- src/mongo/db/commands/run_aggregate.cpp | 4 +--- .../db/pipeline/process_interface/common_mongod_process_interface.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/mongo/db') 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 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 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 { -- cgit v1.2.1