SERVER-32452 add ability for plan cache entries to be inactive

1 files changed, 3 insertions, 7 deletions

diff --git a/src/mongo/db/exec/subplan.cpp b/src/mongo/db/exec/subplan.cpp
index 36526c713a7..532dea64044 100644
--- a/src/mongo/db/exec/subplan.cpp
+++ b/src/mongo/db/exec/subplan.cpp
@@ -133,17 +133,13 @@ Status SubplanStage::planSubqueries() {
 
         // Plan the i-th child. We might be able to find a plan for the i-th child in the plan
         // cache. If there's no cached plan, then we generate and rank plans using the MPS.
-        CachedSolution* rawCS;
-        if (PlanCache::shouldCacheQuery(*branchResult->canonicalQuery) &&
-            _collection->infoCache()
-                ->getPlanCache()
-                ->get(*branchResult->canonicalQuery, &rawCS)
-                .isOK()) {
+        const auto* planCache = _collection->infoCache()->getPlanCache();
+        if (auto cachedSol = planCache->getCacheEntryIfCacheable(*branchResult->canonicalQuery)) {
             // We have a CachedSolution. Store it for later.
             LOG(5) << "Subplanner: cached plan found for child " << i << " of "
                    << _orExpression->numChildren();
 
-            branchResult->cachedSolution.reset(rawCS);
+            branchResult->cachedSolution = std::move(cachedSol);
         } else {
             // No CachedSolution found. We'll have to plan from scratch.
             LOG(5) << "Subplanner: planning child " << i << " of " << _orExpression->numChildren();