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 bf79036ae0e6e9fbc37d6358ed2ef60c109b1a21 Merge: 9394991853 f06770f036 Author: Dmitry Konstantinov <[email protected]> AuthorDate: Thu May 7 13:40:59 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Reduce memory allocations in SelectStatement.getQuery CHANGES.txt | 1 + .../restrictions/ClusteringColumnRestrictions.java | 4 +++- .../cassandra/cql3/statements/SelectStatement.java | 19 ++++++++++++++----- .../cassandra/db/SinglePartitionReadCommand.java | 11 +++++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index 231b6fbc2c,96177c8656..78cacab692 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ +7.0 + * 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: + * Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246) + * Differentiate between legitimate cases where the first entry is the same as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() (CASSANDRA-21255) + * Introduce minimum_threshold for data resurrection startup check (CASSANDRA-21293) +Merged from 5.0: + * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348) + + 6.0-alpha2 + * Reduce memory allocations in SelectStatement.getQuery (CASSANDRA-21351) * Avoid allocation by getFunctions in SelectStatement.authorize (CASSANDRA-21347) * Avoid unit conversion in DatabaseDescriptor.getMaxValueSize() for every deserializing Cell (CASSANDRA-21295) * Fix single token batch atomicity with Accord/non-Accord batches by using the batch log (CASSANDRA-20588) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
