This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7d3a8d53123d8ac493d3fd3821ba54ace075f972
Merge: 6c18a6c4f4 e45c1092f9
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Wed Oct 18 13:49:26 2023 -0500
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Correctly remove Index.Group from IndexRegistry
CHANGES.txt | 1 +
.../org/apache/cassandra/db/lifecycle/Tracker.java | 8 ++-
src/java/org/apache/cassandra/index/Index.java | 64 +++++++++++++++--
.../org/apache/cassandra/index/IndexRegistry.java | 26 +++++--
.../cassandra/index/SecondaryIndexManager.java | 60 +++++++---------
.../cassandra/index/SingletonIndexGroup.java | 17 +----
.../cassandra/index/sai/StorageAttachedIndex.java | 8 ++-
.../index/sai/StorageAttachedIndexGroup.java | 17 +++--
.../org/apache/cassandra/index/sasi/SASIIndex.java | 2 +-
.../apache/cassandra/index/CustomIndexTest.java | 75 +++++++++-----------
.../org/apache/cassandra/index/StubIndexGroup.java | 6 ++
.../index/sai/cql/IndexGroupLifecycleTest.java | 81 ++++++++++++++++++++++
.../index/sai/cql/StorageAttachedIndexDDLTest.java | 6 +-
.../index/sai/functional/CompactionTest.java | 5 +-
.../index/sai/metrics/IndexGroupMetricsTest.java | 4 +-
.../index/sai/metrics/QueryMetricsTest.java | 6 +-
.../index/sai/metrics/StateMetricsTest.java | 6 +-
17 files changed, 261 insertions(+), 131 deletions(-)
diff --cc CHANGES.txt
index 47703336da,9a49af3955..0a8684d7d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-alpha2
+5.1
+ * Add ELAPSED command to cqlsh (CASSANDRA-18861)
+ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
+ * Clean up obsolete functions and simplify cql_version handling in cqlsh
(CASSANDRA-18787)
+Merged from 5.0:
+ * Correctly remove Index.Group from IndexRegistry (CASSANDRA-18905)
* Fix vector type to support DDM's mask_default function (CASSANDRA-18889)
* Remove unnecessary reporter-config3 dependency (CASSANDRA-18907)
* Remove support for empty values on the vector data type (CASSANDRA-18876)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
