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 061749b0ae48d5b3be1f78754f177bdd745c7a1e Merge: ac19ddc68d 0d2160631a Author: Dmitry Konstantinov <[email protected]> AuthorDate: Thu Jun 4 19:27:50 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Avoid ByteBuffer wrapping in cql3.selection.Selector.InputRow to reduce memory allocation rate CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/ResultSet.java | 57 +++++++++++---- .../apache/cassandra/cql3/UntypedResultSet.java | 26 +++++-- .../cassandra/cql3/selection/ResultSetBuilder.java | 15 ++-- .../apache/cassandra/cql3/selection/Selection.java | 37 +++++----- .../apache/cassandra/cql3/selection/Selector.java | 54 ++++++++++++--- .../cassandra/cql3/selection/SimpleSelector.java | 19 +++-- .../cql3/statements/DescribeStatement.java | 8 +-- .../cql3/statements/ModificationStatement.java | 10 ++- .../cassandra/cql3/statements/SelectStatement.java | 80 ++++++++++++---------- .../org/apache/cassandra/db/ClusteringPrefix.java | 5 ++ .../cassandra/db/marshal/CollectionType.java | 9 +++ .../org/apache/cassandra/db/marshal/ListType.java | 9 +++ .../org/apache/cassandra/db/marshal/MapType.java | 14 ++++ .../org/apache/cassandra/db/marshal/SetType.java | 9 +++ .../org/apache/cassandra/db/marshal/UserType.java | 21 +++++- .../org/apache/cassandra/transport/CBUtil.java | 9 +++ .../org/apache/cassandra/utils/ByteBufferUtil.java | 10 +++ .../apache/cassandra/transport/BurnTestUtil.java | 2 +- .../apache/cassandra/transport/DriverBurnTest.java | 4 +- .../cassandra/transport/SimpleClientBurnTest.java | 7 +- .../apache/cassandra/distributed/impl/RowUtil.java | 45 ++++++------ .../cassandra/cql3/PreparedStatementsTest.java | 17 +++-- .../cassandra/cql3/UntypedResultSetTest.java | 4 +- .../db/guardrails/AbstractGenerationalTest.java | 16 ++--- .../stress/operations/predefined/CqlOperation.java | 9 ++- 26 files changed, 348 insertions(+), 149 deletions(-) diff --cc CHANGES.txt index f5a51e4f59,ed6154823c..22e9334304 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -6.0-alpha2 +7.0 + * 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: + * Avoid ByteBuffer wrapping in cql3.selection.Selector.InputRow to reduce memory allocation rate (CASSANDRA-21362) * Reduce cost to calculate BTreeRow.minDeletionTime (CASSANDRA-21414) * Implement custom CassandraThread to keep direct references to frequently used thread local objects (CASSANDRA-21020) * Avoid megamorphic call overhead at RandomAccessReader#current (CASSANDRA-21399) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
