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 338449c0d0aec31d17b313d8697be32c036a6b3f
Merge: 38e0277503 c9ffe11645
Author: Francisco Guerrero <[email protected]>
AuthorDate: Wed Jun 17 06:51:19 2026 -0500

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      putShortVolatile is not volatile in InMemoryTrie

 .../apache/cassandra/db/tries/InMemoryTrie.java    |   2 +-
 .../io/sstable/AbstractSSTableIterator.java        |  28 ++++-
 .../io/sstable/format/bti/BtiTableWriter.java      |  17 +--
 .../cassandra/io/tries/ReverseValueIterator.java   |  27 ++++-
 .../apache/cassandra/io/tries/ValueIterator.java   | 119 +++++++++++----------
 src/java/org/apache/cassandra/io/tries/Walker.java |   2 +-
 .../io/tries/ReverseValueIteratorLeakTest.java     | 112 +++++++++++++++++++
 7 files changed, 231 insertions(+), 76 deletions(-)


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

Reply via email to