This is an automated email from the ASF dual-hosted git repository. belliottsmith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0e2f6d360803b8e9a1db3423de68541af1f542d1 Merge: 36d2433dfb 8351f4a87b Author: Benedict Elliott Smith <[email protected]> AuthorDate: Fri Oct 9 10:51:59 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../pages/developing/cql/transactions.adoc | 20 +- src/antlr/Lexer.g | 1 + src/antlr/Parser.g | 24 +- src/java/org/apache/cassandra/cql3/Operations.java | 16 + .../cql3/statements/ModificationStatement.java | 17 +- .../cql3/statements/TransactionStatement.java | 241 ++++++++---- .../cql3/transactions/ConditionStatement.java | 19 +- .../serializers/AbstractSortedCollector.java | 20 +- .../accord/serializers/TableMetadatasAndKeys.java | 7 +- .../cassandra/service/accord/txn/TxnCondition.java | 42 +- .../cassandra/service/accord/txn/TxnUpdate.java | 294 +++++++++++--- .../distributed/test/accord/AccordCQLTestBase.java | 396 ++++++++++++++++++- .../test/accord/AccordEmptyBranchRecoveryTest.java | 98 +++++ .../org/apache/cassandra/cql3/KeywordTestBase.java | 4 +- .../cql3/statements/TransactionStatementTest.java | 121 +++++- .../service/accord/txn/TxnConditionTest.java | 3 +- .../service/accord/txn/TxnUpdateTest.java | 426 ++++++++++++++++++++- 18 files changed, 1572 insertions(+), 178 deletions(-) diff --cc CHANGES.txt index 3b183e4936,73f3983e8d..3473f50e2c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -6.0-alpha3 +7.0 + * Extract reusable HttpService from cloud metadata connector (CASSANDRA-21195) + * Redact hash and _hash suffixed parameters in system_views.settings (CASSANDRA-21686) + * Allow CQLSSTableWriter to specify SSTable id generator to use (CASSANDRA-21012) + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or end (CASSANDRA-21068) + * Support pluggable default role initialization (CASSANDRA-21546) + * 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: + * Accord: Add support for ELSE/ELSE IF (CASSANDRA-21484) * Accord: Improve Rebootstrap (CASSANDRA-21687) * Block decommission if node is a participant in a CMS reconfiguration (CASSANDRA-21591) * Sharding support for non-vector SAI in-memory indexes (CASSANDRA-18216) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
