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 3bee9024c2228386176e3536e3a298acc6ca9e2a
Merge: db0871ce8b 03304bce53
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Sun Jul 26 11:26:46 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                                |  1 +
 src/java/org/apache/cassandra/cql3/selection/Selector.java |  9 ++++++++-
 .../org/apache/cassandra/db/ClusteringBoundOrBoundary.java |  2 +-
 src/java/org/apache/cassandra/db/ClusteringPrefix.java     | 13 ++++++++++---
 src/java/org/apache/cassandra/db/ReadCommand.java          | 11 +++++++++--
 .../cassandra/db/aggregation/AggregationSpecification.java | 11 +++++++++--
 .../cassandra/db/filter/AbstractClusteringIndexFilter.java |  2 +-
 .../apache/cassandra/db/filter/ClusteringIndexFilter.java  |  7 +++++++
 .../org/apache/cassandra/db/filter/ColumnSubselection.java | 14 ++++++++++++--
 src/java/org/apache/cassandra/db/filter/DataLimits.java    | 11 +++++++++--
 src/java/org/apache/cassandra/db/filter/RowFilter.java     | 14 ++++++++++++--
 .../apache/cassandra/io/sstable/ClusteringDescriptor.java  |  4 ++--
 .../apache/cassandra/io/sstable/SSTableCursorWriter.java   |  2 +-
 13 files changed, 82 insertions(+), 19 deletions(-)

diff --cc CHANGES.txt
index 2ba83fed8b,eb29172879..faf0fc88b7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -6.0-alpha2
 +7.0
 + * 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:
+  * Cache various Enum.values() used in deserialization to avoid per-read 
array allocation (CASSANDRA-21528)
   * Fix Accord transaction error message when altering a table 
(CASSANDRA-20580)
   * Depend only on platform-specific Zstd JNI native libraries 
(CASSANDRA-21483)
   * Expose immediately-executed tasks in the queries virtual table 
(CASSANDRA-21471)


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

Reply via email to