CNDB-15452: Split SAI metrics query types into disjoint categories (#…

[michaelsembwever]

https://github.com/riptano/cndb/issues/15500

Port into main-5.0 46f8b7e

CNDB-15452: Split SAI metrics query types into disjoint categories (https://github.com/datastax/cassandra/pull/2015)
It's simpler to understand SAI query metrics when they are split
into granular, non-overlapping categories. The fact they are
non-overlapping makes any of their combinations meaningful.
They can be also visualized in stacked charts.

Additionally, a bug was fixed that prevented proper updates of
SortThenFilterQueriesCompleted and FilterThenSortQueriesCompleted
metrics for non-ANN TopK queries and for some non-hybrid queries.
Now those metrics are bumped up by all hybrid topK queries, and
only by those.

[github-actions]

Checklist before you submit for review

• This PR adheres to the Definition of Done
• Make sure there is a PR in the CNDB project updating the Converged Cassandra version
• Use NoSpamLogger for log lines that may appear frequently in the logs
• Verify test results on Butler
• Test coverage for new/modified code is > 80%
• Proper code formatting
• Proper title for each commit staring with the project-issue number, like CNDB-1234
• Each commit has a meaningful description
• Each commit is not very long and contains related changes
• Renames, moves and reformatting are in distinct commits
• All new files should contain the DataStax copyright header instead of the Apache License one

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
92.1% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[cassci-bot]

❌ Build ds-cassandra-pr-gate/PR-2050 rejected by Butler

---

2 regressions found
See build details here

---

Found 2 new test failures

Test	Explanation	Runs	Upstream
o.a.c.cql3.validation.operations.AggregationQueriesTest.testAggregationQueryShouldNotTimeoutWhenItExceedesReadTimeout (compression)	REGRESSION	🔴🔴	2 / 11
o.a.c.distributed.test.repair.ForceRepairTest.forceWithDifference ()	NEW	🔴⚪	6 / 11

---

Found 5 known test failures