Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 2 insertions, 12 deletions

diff --git a/src/mongo/db/query/plan_yield_policy.h b/src/mongo/db/query/plan_yield_policy.h
index 05bbc5b40eb..9d44ba8e903 100644
--- a/src/mongo/db/query/plan_yield_policy.h
+++ b/src/mongo/db/query/plan_yield_policy.h
@@ -172,24 +172,14 @@ public:
     }
 
     /**
-     * Returns the policy that this operation should use, accounting for any special circumstances,
-     * and otherwise the desired policy. Should always be used when constructing a PlanYieldPolicy.
-     */
-    static YieldPolicy getPolicyOverrideForOperation(OperationContext* opCtx, YieldPolicy desired);
-
-    /**
      * Constructs a PlanYieldPolicy of the given 'policy' type. This class uses an ElapsedTracker
      * to keep track of elapsed time, which is initialized from the parameters 'cs',
      * 'yieldIterations' and 'yieldPeriod'.
      *
      * If provided, the given 'yieldable' is released and restored by the 'PlanYieldPolicy' (in
-     * addition to releasing/restoring locks and the storage engine snapshot). The provided 'policy'
-     * will be overridden depending on the nature of this operation. For example, multi-document
-     * transactions will always downgrade to INTERRUPT_ONLY, and operations with recursively held
-     * locks will downgrade to NO_YIELD.
+     * addition to releasing/restoring locks and the storage engine snapshot).
      */
-    PlanYieldPolicy(OperationContext* opCtx,
-                    YieldPolicy policy,
+    PlanYieldPolicy(YieldPolicy policy,
                     ClockSource* cs,
                     int yieldIterations,
                     Milliseconds yieldPeriod,