This is an automated email from the ASF dual-hosted git repository.

frankgh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 86fc67022b3328aa3e87452fa1bcf5f9008f1b8c
Merge: 132b8a6797 7dcc43d460
Author: Francisco Guerrero <[email protected]>
AuthorDate: Mon Nov 2 20:44:53 2026 -0800

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Cursor compaction fails with AssertionError when a static collection 
exceeds a collection guardrail threshold

 CHANGES.txt                                        |  1 +
 .../cassandra/io/sstable/SSTableCursorWriter.java  |  5 ++-
 .../CollectionSizeGuardrailCompactionTest.java     | 39 ++++++++++++++++++----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --cc CHANGES.txt
index e1cac0f206,9f01e569a5..bf714d6e94
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 -6.0-alpha3
 +7.0
 + * Clarify off-heap OOM error message in JVMStabilityInspector 
(CASSANDRA-19831)
 + * FQLTool Replay support for full set of login options (CASSANDRA-17559)
 + * 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:
+  * Cursor compaction fails with AssertionError when a static collection 
exceeds a collection guardrail threshold (CASSANDRA-21827)
   * Support wildcard * in excluded_indexes index hints (CASSANDRA-21715)
   * Prepare scalar constraints when column metadata is created so they are 
enforced after deserialization (CASSANDRA-21818)
   * Throw InvalidConstraintDefinitionException for malformed LENGTH and 
OCTET_LENGTH constraint terms (CASSANDRA-21817)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to