1 files changed, 10 insertions, 3 deletions
diff --git a/src/mongo/db/query/plan_cache_indexability.cpp b/src/mongo/db/query/plan_cache_indexability.cpp
index 0498d5edc26..4f1b0c176f8 100644
--- a/src/mongo/db/query/plan_cache_indexability.cpp
+++ b/src/mongo/db/query/plan_cache_indexability.cpp
@@ -79,6 +79,7 @@ IndexabilityDiscriminator getCollatedIndexDiscriminator(const CollatorInterface*
             }
             return true;
         }
+
         // The predicate never compares strings so it is not affected by collation.
         return true;
     };
@@ -103,7 +104,14 @@ void PlanCacheIndexabilityState::processSparseIndex(const std::string& indexName
 
 void PlanCacheIndexabilityState::processPartialIndex(const std::string& indexName,
                                                      const MatchExpression* filterExpr) {
-    _globalDiscriminatorMap[indexName].addDiscriminator(getPartialIndexDiscriminator(filterExpr));
+    invariant(filterExpr);
+    for (size_t i = 0; i < filterExpr->numChildren(); ++i) {
+        processPartialIndex(indexName, filterExpr->getChild(i));
+    }
+    if (filterExpr->getCategory() != MatchExpression::MatchCategory::kLogical) {
+        _pathDiscriminatorsMap[filterExpr->path()][indexName].addDiscriminator(
+            getPartialIndexDiscriminator(filterExpr));
+    }
 }
 
 void PlanCacheIndexabilityState::processWildcardIndex(const CoreIndexInfo& cii) {
@@ -126,7 +134,7 @@ namespace {
 const IndexToDiscriminatorMap emptyDiscriminators{};
 }  // namespace
 
-const IndexToDiscriminatorMap& PlanCacheIndexabilityState::getPathDiscriminators(
+const IndexToDiscriminatorMap& PlanCacheIndexabilityState::getDiscriminators(
     StringData path) const {
     PathDiscriminatorsMap::const_iterator it = _pathDiscriminatorsMap.find(path);
     if (it == _pathDiscriminatorsMap.end()) {
@@ -158,7 +166,6 @@ IndexToDiscriminatorMap PlanCacheIndexabilityState::buildWildcardDiscriminators(
 void PlanCacheIndexabilityState::updateDiscriminators(
     const std::vector<CoreIndexInfo>& indexCores) {
     _pathDiscriminatorsMap = PathDiscriminatorsMap();
-    _globalDiscriminatorMap = IndexToDiscriminatorMap();
     _wildcardIndexDiscriminators.clear();
 
     for (const auto& idx : indexCores) {