This is an automated email from the ASF dual-hosted git repository. smiklosovic pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3c0affbeebaab34cf11b5c8f571bf5f00ba14e0e Merge: 5b36e263ad 650fd41850 Author: Stefan Miklosovic <[email protected]> AuthorDate: Thu Aug 13 13:52:24 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + conf/cassandra.yaml | 4 + conf/cassandra_latest.yaml | 16 +++ .../developing/cql/indexing/sai/sai-concepts.adoc | 6 +- .../pages/developing/cql/indexing/sai/sai-faq.adoc | 11 +- src/java/org/apache/cassandra/config/Config.java | 2 + .../apache/cassandra/config/GuardrailsOptions.java | 28 +++++ .../apache/cassandra/db/guardrails/Guardrails.java | 32 ++++++ .../cassandra/db/guardrails/GuardrailsConfig.java | 18 ++++ .../cassandra/db/guardrails/GuardrailsMBean.java | 24 +++++ .../cassandra/index/sai/StorageAttachedIndex.java | 15 ++- .../cassandra/index/sai/utils/IndexTermType.java | 19 +++- .../guardrails/GuardrailSaiBlobTermSizeTest.java | 119 +++++++++++++++++++++ .../cassandra/index/sai/cql/types/BlobTest.java | 31 ++++++ .../cassandra/index/sai/cql/types/DataSet.java | 33 ++++++ .../collections/lists/FrozenListBlobTest.java | 35 ++++++ .../cql/types/collections/lists/ListBlobTest.java | 35 ++++++ .../types/collections/maps/FrozenMapBlobTest.java | 35 ++++++ .../cql/types/collections/maps/MapBlobTest.java | 35 ++++++ .../types/collections/maps/MapEntriesBlobTest.java | 35 ++++++ .../types/collections/maps/MapKeysBlobTest.java | 35 ++++++ .../types/collections/maps/MapValuesBlobTest.java | 35 ++++++ .../types/collections/maps/MultiMapBlobTest.java | 35 ++++++ .../types/collections/sets/FrozenSetBlobTest.java | 35 ++++++ .../cql/types/collections/sets/SetBlobTest.java | 35 ++++++ .../index/sai/utils/IndexTermTypeTest.java | 3 +- .../nodetool/GuardrailsConfigCommandsTest.java | 3 + 27 files changed, 698 insertions(+), 17 deletions(-) diff --cc CHANGES.txt index 6e9d6790b5,95b1c1db11..347f340c31 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -6.0-alpha3 +7.0 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366) + * Don't increment client metrics on messaging service connection unpause (CASSANDRA-21491) + * Add nodetool getreplicas (CASSANDRA-17665) + * Implementation of CEP-49: Hardware-accelerated compression (CASSANDRA-20975) + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394) + * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767) + * Add a guardrail for misprepared statements (CASSANDRA-21139) +Merged from 6.0: + * Add blob type support to SAI (CASSANDRA-20012) * Fix deserialization of column masks in cluster metadata (CASSANDRA-21549) * Caffeine caches in CompressionDictionaryCache and ZstdDictionaryCompressor should specify an executor explicitly (CASSANDRA-21557) * Make cqlsh prompt to reset to no keyspace set by USE after dropping that keyspace (CASSANDRA-21548) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
