SERVER-77973 Removed featureFlagSbeFull from blocking COUNT_SCAN

Author: pdan101

jstests/noPassthroughWithMongod/sbe_index_count_scan_cache.js

@@ -9,7 +9,7 @@ load("jstests/libs/sbe_util.js");
 
 const testDb = db.getSiblingDB(jsTestName());
 // This test is specifically verifying the behavior of the SBE plan cache.
-if (!checkSBEEnabled(testDb, ["featureFlagSbeFull"])) {
+if (!checkSBEEnabled(testDb)) {
     jsTestLog("Skipping test because SBE is not enabled");
     return;
 }

src/mongo/db/query/get_executor.cpp

@@ -1425,33 +1425,6 @@ StatusWith<std::unique_ptr<PlanExecutor, PlanExecutor::Deleter>> getSlotBasedExe
                                        false /* generatedByBonsai */);
 }  // getSlotBasedExecutor
 
-/**
- * Checks if the result of query planning is SBE compatible. If any of the query solutions in
- * 'planningResult' cannot currently be compiled to an SBE plan via the SBE stage builders, then we
- * will fall back to the classic engine.
- */
-bool shouldPlanningResultUseSbe(const SlotBasedPrepareExecutionResult& planningResult) {
-    // If we have an entry in the SBE plan cache, then we can use SBE.
-    if (planningResult.isRecoveredFromPlanCache()) {
-        return true;
-    }
-
-    const auto& solutions = planningResult.solutions();
-    if (solutions.empty()) {
-        // Query needs subplanning (plans are generated later, we don't have access yet). We can
-        // proceed with using SBE in this case.
-        invariant(planningResult.needsSubplanning());
-        return true;
-    }
-
-    // Check that all query solutions are SBE compatible.
-    return std::all_of(solutions.begin(), solutions.end(), [](const auto& solution) {
-        // We must have a solution, otherwise we would have early exited.
-        invariant(solution->root());
-        return isQueryPlanSbeCompatible(solution.get());
-    });
-}
-
 /**
  * Function which returns true if 'cq' uses features that are currently supported in SBE without
  * 'featureFlagSbeFull' being set; false otherwise.
@@ -1518,9 +1491,6 @@ attemptToGetSlotBasedExecutor(
     // SBE-compatible query using SBE, even if the query uses features that are not on in SBE by
     // default. Either way, try to construct an SBE plan executor.
     if (canUseRegularSbe || sbeFull) {
-        // Create the SBE prepare execution helper and initialize the params for the planner. If
-        // planning results in any 'QuerySolution' which cannot be handled by the SBE stage builder,
-        // then we will fall back to the classic engine.
         stdx::variant<const Yieldable*, PlanYieldPolicy::YieldThroughAcquisitions> yieldable;
         if (collections.isAcquisition()) {
             yieldable = PlanYieldPolicy::YieldThroughAcquisitions{};
@@ -1536,24 +1506,22 @@ attemptToGetSlotBasedExecutor(
             return planningResultWithStatus.getStatus();
         }
 
-        if (shouldPlanningResultUseSbe(*planningResultWithStatus.getValue())) {
-            if (extractAndAttachPipelineStages) {
-                // We know now that we will use SBE, so we need to remove the pushed-down stages
-                // from the original pipeline object.
-                extractAndAttachPipelineStages(canonicalQuery.get(), false /* attachOnly */);
-            }
-            auto statusWithExecutor =
-                getSlotBasedExecutor(opCtx,
-                                     collections,
-                                     std::move(canonicalQuery),
-                                     std::move(sbeYieldPolicy),
-                                     plannerParams,
-                                     std::move(planningResultWithStatus.getValue()));
-            if (statusWithExecutor.isOK()) {
-                return std::move(statusWithExecutor.getValue());
-            } else {
-                return statusWithExecutor.getStatus();
-            }
+        if (extractAndAttachPipelineStages) {
+            // Given that we are using SBE, we need to remove the pushed-down stages
+            // from the original pipeline object.
+            extractAndAttachPipelineStages(canonicalQuery.get(), false /* attachOnly */);
+        }
+        auto statusWithExecutor =
+            getSlotBasedExecutor(opCtx,
+                                 collections,
+                                 std::move(canonicalQuery),
+                                 std::move(sbeYieldPolicy),
+                                 plannerParams,
+                                 std::move(planningResultWithStatus.getValue()));
+        if (statusWithExecutor.isOK()) {
+            return std::move(statusWithExecutor.getValue());
+        } else {
+            return statusWithExecutor.getStatus();
         }
     }
 

src/mongo/db/query/query_utils.cpp

@@ -91,15 +91,4 @@ bool isQuerySbeCompatible(const CollectionPtr* collection, const CanonicalQuery*
     });
 }
 
-bool isQueryPlanSbeCompatible(const QuerySolution* root) {
-    tassert(7061701, "Expected QuerySolution pointer to not be nullptr", root);
-
-    // (Ignore FCV check): This is intentional because we always want to use this feature once the
-    // feature flag is enabled.
-    const bool sbeFull = feature_flags::gFeatureFlagSbeFull.isEnabledAndIgnoreFCVUnsafe();
-    const bool isNotCountScan = !root->hasNode(StageType::STAGE_COUNT_SCAN);
-
-    return isNotCountScan || sbeFull;
-}
-
 }  // namespace mongo

src/mongo/db/query/query_utils.h

@@ -56,14 +56,4 @@ bool isIdHackEligibleQuery(const CollectionPtr& collection, const CanonicalQuery
  * planning can be short-circuited as it is already known that the query is ineligible for SBE.
  */
 bool isQuerySbeCompatible(const CollectionPtr* collection, const CanonicalQuery* cq);
-
-/**
- * Checks if the given query can be executed with the SBE engine based on the query solution.
- *
- * This method determines whether the query may be compatible with SBE based on the query solution
- * (such as ineligible plan stages). It should be used in conjunction with the higher level
- * isQuerySbeCompatible() check to ensure that all aspects of the query are validated for
- * compatibility.
- */
-bool isQueryPlanSbeCompatible(const QuerySolution* root);
 }  // namespace mongo