This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 771ae67223 Merge branch 'cassandra-5.0' into trunk
new 740d6d0805 Prioritize legacy 2i over SAI for columns with multiple
indexes
new 7b15f477f9 Merge branch 'cassandra-5.0' into trunk
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
conf/cassandra.yaml | 5 ++
.../cassandra/config/DatabaseDescriptor.java | 10 +++
.../config/StorageAttachedIndexOptions.java | 2 +
.../sai/plan/StorageAttachedIndexQueryPlan.java | 5 +-
.../apache/cassandra/service/StorageService.java | 12 ++++
.../cassandra/service/StorageServiceMBean.java | 3 +
.../index/sai/metrics/AbstractMetricsTest.java | 5 ++
.../index/sai/metrics/IndexSelectionTest.java | 72 ++++++++++++++++++++++
.../index/sai/metrics/QueryMetricsTest.java | 5 --
10 files changed, 111 insertions(+), 9 deletions(-)
create mode 100644
test/unit/org/apache/cassandra/index/sai/metrics/IndexSelectionTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
