CNDB-15946: Remove IndexContext.shadowedPrimaryKeyCount metric

adelapena · adelapena · commit 43d930fd041e · 2025-11-19T13:09:18.000Z
diff --git a/src/java/org/apache/cassandra/index/sai/QueryContext.java b/src/java/org/apache/cassandra/index/sai/QueryContext.java
@@ -83,8 +83,6 @@ public class QueryContext
 
     private float annRerankFloor = 0.0f; // only called from single-threaded setup code
 
-    private final LongAdder shadowedPrimaryKeyCount = new LongAdder();
-
     // Determines the order of using indexes for filtering and sorting.
     // Null means the query execution order hasn't been decided yet.
     private FilterSortOrder filterSortOrder = null;
@@ -296,19 +294,6 @@ public void checkpoint()
         }
     }
 
-    public void addShadowed(long count)
-    {
-        shadowedPrimaryKeyCount.add(count);
-    }
-
-    /**
-     * @return shadowed primary keys, in ascending order
-     */
-    public long getShadowedPrimaryKeyCount()
-    {
-        return shadowedPrimaryKeyCount.longValue();
-    }
-
     public float getAnnRerankFloor()
     {
         return annRerankFloor;
@@ -366,7 +351,6 @@ public static class Snapshot
         public final long triePostingsDecodes;
         public final long queryTimeouts;
         public final long annGraphSearchLatency;
-        public final long shadowedPrimaryKeyCount;
         public final FilterSortOrder filterSortOrder;
 
         /**
@@ -394,7 +378,6 @@ private Snapshot(QueryContext context)
             triePostingsDecodes = context.triePostingsDecodes();
             queryTimeouts = context.queryTimeouts();
             annGraphSearchLatency = context.annGraphSearchLatency();
-            shadowedPrimaryKeyCount = context.getShadowedPrimaryKeyCount();
             filterSortOrder = context.filterSortOrder();
         }
     }
diff --git a/src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java b/src/java/org/apache/cassandra/index/sai/metrics/TableQueryMetrics.java
@@ -278,9 +278,6 @@ public static class PerQuery extends AbstractQueryMetrics
         public final Histogram kdTreePostingsSkips;
         public final Histogram kdTreePostingsDecodes;
 
-        /** Shadowed keys scan metrics **/
-        public final Histogram shadowedKeysScannedHistogram;
-
         /**
          * Trie index posting lists metrics.
          */
@@ -319,8 +316,6 @@ public PerQuery(TableMetadata table, QueryKind queryKind, Predicate<ReadCommand>
             postingsSkips = Metrics.histogram(createMetricName("PostingsSkips"), true);
             postingsDecodes = Metrics.histogram(createMetricName("PostingsDecodes"), false);
 
-            shadowedKeysScannedHistogram = Metrics.histogram(createMetricName("ShadowedKeysScannedHistogram"), false);
-
             // Key vector metrics that translate to performance
             annGraphSearchLatency = Metrics.timer(createMetricName("ANNGraphSearchLatency"));
         }
@@ -361,8 +356,6 @@ public void record(QueryContext.Snapshot snapshot)
             {
                 annGraphSearchLatency.update(snapshot.annGraphSearchLatency, TimeUnit.NANOSECONDS);
             }
-
-            shadowedKeysScannedHistogram.update(snapshot.shadowedPrimaryKeyCount);
         }
     }
 }
diff --git a/src/java/org/apache/cassandra/index/sai/plan/QueryMonitorableExecutionInfo.java b/src/java/org/apache/cassandra/index/sai/plan/QueryMonitorableExecutionInfo.java
@@ -86,7 +86,6 @@ public String toLogString(boolean unique)
         appendMetric(sb, "triePostingsSkips", metrics.triePostingsSkips);
         appendMetric(sb, "triePostingsDecodes", metrics.triePostingsDecodes);
         appendMetric(sb, "annGraphSearchLatencyNanos", metrics.annGraphSearchLatency);
-        appendMetric(sb, "shadowedPrimaryKeyCount", metrics.shadowedPrimaryKeyCount);
 
         // append the plan
         sb.append(sectionNamePrefix).append("plan:\n").append(plan);
diff --git a/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexSearcher.java b/src/java/org/apache/cassandra/index/sai/plan/StorageAttachedIndexSearcher.java
@@ -526,7 +526,7 @@ public UnfilteredRowIterator apply(List<PrimaryKey> keys)
             UnfilteredRowIterator counted = fetchedRowsCounter.apply(partition);
             queryContext.addKeysFetched(keys.size());
             queryContext.checkpoint();
-            return applyIndexFilter(counted, filterTree, queryContext);
+            return applyIndexFilter(counted, filterTree);
         }
 
         @Override
@@ -740,7 +740,7 @@ public UnfilteredRowIterator readAndValidatePartition(PrimaryKey pk, List<Primar
                 queryContext.checkpoint();
 
                 UnfilteredRowIterator counted = fetchedRowsCounter.apply(partition);
-                UnfilteredRowIterator clusters = applyIndexFilter(counted, filterTree, queryContext);
+                UnfilteredRowIterator clusters = applyIndexFilter(counted, filterTree);
 
                 if (clusters == null)
                     return null;
@@ -864,13 +864,12 @@ protected Unfiltered computeNext()
         }
     }
 
-    private static UnfilteredRowIterator applyIndexFilter(UnfilteredRowIterator partition, FilterTree tree, QueryContext queryContext)
+    private static UnfilteredRowIterator applyIndexFilter(UnfilteredRowIterator partition, FilterTree tree)
     {
         FilteringPartitionIterator filtered = new FilteringPartitionIterator(partition, tree);
         if (!filtered.hasNext() && !filtered.matchesStaticRow())
         {
             // shadowed by expired TTL or row tombstone or range tombstone
-            queryContext.addShadowed(1);
             filtered.close();
             return null;
         }
diff --git a/test/distributed/org/apache/cassandra/distributed/test/sai/SlowSAIQueryLoggerTest.java b/test/distributed/org/apache/cassandra/distributed/test/sai/SlowSAIQueryLoggerTest.java
@@ -107,7 +107,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 0",
                               "annGraphSearchLatencyNanos: 0",
-                              "shadowedPrimaryKeyCount",
                               "SAI slow query plan:",
                               "NumericIndexScan");
 
@@ -133,7 +132,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 0",
                               "annGraphSearchLatencyNanos: 0",
-                              "shadowedPrimaryKeyCount",
                               "SAI slowest query plan:",
                               "NumericIndexScan");
 
@@ -159,7 +157,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 2",
                               "annGraphSearchLatencyNanos: 0",
-                              "shadowedPrimaryKeyCount: 0",
                               "SAI slow query plan:",
                               "LiteralIndexScan");
 
@@ -185,7 +182,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 2",
                               "annGraphSearchLatencyNanos: 0",
-                              "shadowedPrimaryKeyCount: 0",
                               "SAI slowest query plan:",
                               "LiteralIndexScan");
 
@@ -211,7 +207,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 0",
                               "annGraphSearchLatencyNanos: [1-9][0-9]*", // unknown, but greater than zero
-                              "shadowedPrimaryKeyCount: 0",
                               "SAI slow query plan:",
                               "AnnIndexScan");
 
@@ -237,7 +232,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 0",
                               "annGraphSearchLatencyNanos: [1-9][0-9]*", // unknown, but greater than zero
-                              "shadowedPrimaryKeyCount: 0",
                               "SAI slowest query plan:",
                               "AnnIndexScan");
 
@@ -263,7 +257,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 0",
                               "annGraphSearchLatencyNanos: 0",
-                              "shadowedPrimaryKeyCount: 1",
                               "SAI slow query plan:",
                               "LiteralIndexScan");
 
@@ -289,7 +282,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                               "triePostingsSkips: 0",
                               "triePostingsDecodes: 0",
                               "annGraphSearchLatencyNanos: 0",
-                              "shadowedPrimaryKeyCount: 1",
                               "SAI slowest query plan:",
                               "LiteralIndexScan");
 
@@ -315,7 +307,6 @@ public void testSlowSAIQueryLogger() throws Throwable
                     "triePostingsSkips: 0",
                     "triePostingsDecodes: 0",
                     "annGraphSearchLatencyNanos: 0",
-                    "shadowedPrimaryKeyCount: 0",
                     "SAI slow query plan:",
                     "KeysSort",
                     "NumericIndexScan");

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,6 @@ public static class PerQuery extends AbstractQueryMetrics`
`278`	`278`	`public final Histogram kdTreePostingsSkips;`
`279`	`279`	`public final Histogram kdTreePostingsDecodes;`
`280`	`280`
`281`		`- / Shadowed keys scan metrics /`
`282`		`- public final Histogram shadowedKeysScannedHistogram;`
`283`		`-`
`284`	`281`	`/**`
`285`	`282`	`* Trie index posting lists metrics.`
`286`	`283`	`*/`
`@@ -319,8 +316,6 @@ public PerQuery(TableMetadata table, QueryKind queryKind, Predicate<ReadCommand>`
`319`	`316`	`postingsSkips = Metrics.histogram(createMetricName("PostingsSkips"), true);`
`320`	`317`	`postingsDecodes = Metrics.histogram(createMetricName("PostingsDecodes"), false);`
`321`	`318`
`322`		`- shadowedKeysScannedHistogram = Metrics.histogram(createMetricName("ShadowedKeysScannedHistogram"), false);`
`323`		`-`
`324`	`319`	`// Key vector metrics that translate to performance`
`325`	`320`	`annGraphSearchLatency = Metrics.timer(createMetricName("ANNGraphSearchLatency"));`
`326`	`321`	`}`
`@@ -361,8 +356,6 @@ public void record(QueryContext.Snapshot snapshot)`
`361`	`356`	`{`
`362`	`357`	`annGraphSearchLatency.update(snapshot.annGraphSearchLatency, TimeUnit.NANOSECONDS);`
`363`	`358`	`}`
`364`		`-`
`365`		`- shadowedKeysScannedHistogram.update(snapshot.shadowedPrimaryKeyCount);`
`366`	`359`	`}`
`367`	`360`	`}`
`368`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ public UnfilteredRowIterator apply(List<PrimaryKey> keys)`
`526`	`526`	`UnfilteredRowIterator counted = fetchedRowsCounter.apply(partition);`
`527`	`527`	`queryContext.addKeysFetched(keys.size());`
`528`	`528`	`queryContext.checkpoint();`
`529`		`- return applyIndexFilter(counted, filterTree, queryContext);`
	`529`	`+ return applyIndexFilter(counted, filterTree);`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`@Override`
`@@ -740,7 +740,7 @@ public UnfilteredRowIterator readAndValidatePartition(PrimaryKey pk, List<Primar`
`740`	`740`	`queryContext.checkpoint();`
`741`	`741`
`742`	`742`	`UnfilteredRowIterator counted = fetchedRowsCounter.apply(partition);`
`743`		`- UnfilteredRowIterator clusters = applyIndexFilter(counted, filterTree, queryContext);`
	`743`	`+ UnfilteredRowIterator clusters = applyIndexFilter(counted, filterTree);`
`744`	`744`
`745`	`745`	`if (clusters == null)`
`746`	`746`	`return null;`
`@@ -864,13 +864,12 @@ protected Unfiltered computeNext()`
`864`	`864`	`}`
`865`	`865`	`}`
`866`	`866`
`867`		`- private static UnfilteredRowIterator applyIndexFilter(UnfilteredRowIterator partition, FilterTree tree, QueryContext queryContext)`
	`867`	`+ private static UnfilteredRowIterator applyIndexFilter(UnfilteredRowIterator partition, FilterTree tree)`
`868`	`868`	`{`
`869`	`869`	`FilteringPartitionIterator filtered = new FilteringPartitionIterator(partition, tree);`
`870`	`870`	`if (!filtered.hasNext() && !filtered.matchesStaticRow())`
`871`	`871`	`{`
`872`	`872`	`// shadowed by expired TTL or row tombstone or range tombstone`
`873`		`- queryContext.addShadowed(1);`
`874`	`873`	`filtered.close();`
`875`	`874`	`return null;`
`876`	`875`	`}`