This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1793c3fd36837213d8938c4a78f9911baade3949
Merge: 316a239c7c e8fb4b2f63
Author: Andrés de la Peña <a.penya.gar...@gmail.com>
AuthorDate: Wed Nov 22 15:15:36 2023 +0000
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../sai/disk/v1/ColumnCompletionMarkerUtil.java | 74 +++++++++++++++++++++
.../index/sai/disk/v1/MemtableIndexWriter.java | 6 +-
.../index/sai/disk/v1/SSTableIndexWriter.java | 4 +-
.../index/sai/disk/v1/V1OnDiskFormat.java | 77 +++++++++++++---------
.../distributed/test/sai/IndexStreamingTest.java | 23 +++----
6 files changed, 140 insertions(+), 45 deletions(-)
diff --cc CHANGES.txt
index b4b0e8abd3,d744f50fa1..374db56c60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-5.0-beta1
+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:
+ * Ensure that empty SAI column indexes do not fail on validation after
full-SSTable streaming (CASSANDRA-19017)
* SAI in-memory index should check max term size (CASSANDRA-18926)
* Set default disk_access_mode to mmap_index_only (CASSANDRA-19021)
* Exclude net.java.dev.jna:jna dependency from dependencies of
org.caffinitas.ohc:ohc-core (CASSANDRA-18992)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
