This is an automated email from the ASF dual-hosted git repository. netudima pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e0e4feb120cd23c8a58cef2ed42a0feafdcf1549 Merge: bcd9e662d2 1e3d43b2dd Author: Dmitry Konstantinov <[email protected]> AuthorDate: Wed Jul 29 23:40:30 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Apply performance optimizations for rows merging logic CHANGES.txt | 3 +- build.xml | 62 +++++++++++++++- src/java/org/apache/cassandra/db/DeletionTime.java | 3 +- .../org/apache/cassandra/db/rows/BTreeRow.java | 5 ++ src/java/org/apache/cassandra/db/rows/Row.java | 84 +++++++++++++--------- .../cassandra/db/rows/UnfilteredRowIterators.java | 6 +- .../cassandra/index/sai/utils/RowWithSource.java | 6 ++ .../org/apache/cassandra/utils/MergeIterator.java | 29 ++++++++ .../org/apache/cassandra/db/rows/RowsTest.java | 51 +++++++++++++ 9 files changed, 208 insertions(+), 41 deletions(-) diff --cc CHANGES.txt index c3dfe1b04b,5fe13105fd..5b33484d30 --- 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: + * Apply performance optimizations for rows merging logic (CASSANDRA-21524) * Fix operationMode reporting DECOMMISSION_FAILED instead of LEAVING when resuming a failed decommission (CASSANDRA-21493) * Avoid megamorphic calls when serializing and deserializing fixed-length values (CASSANDRA-21536) * Avoid megamorphic calls for Cell.timestamp/ttl/path/localDeletionTimeAsUnsignedInt methods (CASSANDRA-21526) @@@ -32,7 -25,7 +33,7 @@@ * Always send TCM commit failures as Messaging failures (CASSANDRA-21457) * Fix ReadCommand serializedSize() using incorrect epoch (CASSANDRA-21438) * Allocation improvements in ProtocolVersion, StorageProxy and MerkleTree (CASSANDRA-21199) -- * Don’t leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236) ++ * Don't leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236) * Make nodetool abortbootstrap more robust (CASSANDRA-21235) * Don't clear prepared statement cache on nodetool cms initialize (CASSANDRA-21234) * Improve performance when deserializing cluster metadata (CASSANDRA-21224) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
