diff options
| -rw-r--r-- | src/mongo/db/commands/cqf/cqf_aggregate.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/db/query/get_executor.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/query/plan_yield_policy_sbe.h | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/mongo/db/commands/cqf/cqf_aggregate.cpp b/src/mongo/db/commands/cqf/cqf_aggregate.cpp index ae154cad112..a09c6d3d2db 100644 --- a/src/mongo/db/commands/cqf/cqf_aggregate.cpp +++ b/src/mongo/db/commands/cqf/cqf_aggregate.cpp @@ -307,8 +307,7 @@ static std::unique_ptr<PlanExecutor, PlanExecutor::Deleter> optimizeAndCreateExe internalQueryExecYieldIterations.load(), Milliseconds{internalQueryExecYieldPeriodMS.load()}, nullptr, - std::make_unique<YieldPolicyCallbacksImpl>(nss), - false /*useExperimentalCommitTxnBehavior*/); + std::make_unique<YieldPolicyCallbacksImpl>(nss)); sbePlan->prepare(data.ctx); auto planExec = uassertStatusOK(plan_executor_factory::make( diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp index edab86732eb..670fd05ff08 100644 --- a/src/mongo/db/query/get_executor.cpp +++ b/src/mongo/db/query/get_executor.cpp @@ -103,7 +103,6 @@ #include "mongo/db/server_options.h" #include "mongo/db/service_context.h" #include "mongo/db/storage/storage_options.h" -#include "mongo/db/storage/storage_parameters_gen.h" #include "mongo/logv2/log.h" #include "mongo/scripting/engine.h" #include "mongo/util/str.h" @@ -1332,9 +1331,7 @@ std::unique_ptr<PlanYieldPolicySBE> makeSbeYieldPolicy( internalQueryExecYieldIterations.load(), Milliseconds{internalQueryExecYieldPeriodMS.load()}, yieldable, - std::make_unique<YieldPolicyCallbacksImpl>(nss), - // Use the new yielding behavior if it is enabled. - gYieldingSupportForSBE); + std::make_unique<YieldPolicyCallbacksImpl>(nss)); } StatusWith<std::unique_ptr<PlanExecutor, PlanExecutor::Deleter>> getSlotBasedExecutor( diff --git a/src/mongo/db/query/plan_yield_policy_sbe.h b/src/mongo/db/query/plan_yield_policy_sbe.h index d0c0ea81fa7..0ab0e3aa956 100644 --- a/src/mongo/db/query/plan_yield_policy_sbe.h +++ b/src/mongo/db/query/plan_yield_policy_sbe.h @@ -31,6 +31,7 @@ #include "mongo/db/exec/sbe/stages/stages.h" #include "mongo/db/query/plan_yield_policy.h" +#include "mongo/db/storage/storage_parameters_gen.h" namespace mongo { @@ -41,11 +42,10 @@ public: int yieldFrequency, Milliseconds yieldPeriod, const Yieldable* yieldable, - std::unique_ptr<YieldPolicyCallbacks> callbacks, - bool useExperimentalCommitTxnBehavior) + std::unique_ptr<YieldPolicyCallbacks> callbacks) : PlanYieldPolicy( policy, clockSource, yieldFrequency, yieldPeriod, yieldable, std::move(callbacks)), - _useExperimentalCommitTxnBehavior(useExperimentalCommitTxnBehavior) { + _useExperimentalCommitTxnBehavior(gYieldingSupportForSBE) { uassert(4822879, "WRITE_CONFLICT_RETRY_ONLY yield policy is not supported in SBE", policy != YieldPolicy::WRITE_CONFLICT_RETRY_ONLY); |