This is an automated email from the ASF dual-hosted git repository.

iamaleksey pushed a commit to branch cassandra-6.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f67f4ead459469b62e7dc41d3a18df6a1f7b198f
Merge: f1b6eafc76 64a3fc0d3f
Author: Aleksey Yeshchenko <[email protected]>
AuthorDate: Mon Jun 15 11:19:09 2026 +0100

    Merge branch 'cassandra-5.0' into cassandra-6.0

 CHANGES.txt                                                        | 1 +
 src/java/org/apache/cassandra/cache/SerializingCacheProvider.java  | 2 +-
 src/java/org/apache/cassandra/dht/AbstractBounds.java              | 6 +++---
 src/java/org/apache/cassandra/exceptions/RequestFailureReason.java | 5 ++++-
 src/java/org/apache/cassandra/gms/GossipDigestAck.java             | 5 ++++-
 src/java/org/apache/cassandra/gms/GossipDigestSyn.java             | 4 ++--
 src/java/org/apache/cassandra/net/CustomParamsSerializer.java      | 2 +-
 src/java/org/apache/cassandra/repair/RepairJobDesc.java            | 2 +-
 .../org/apache/cassandra/schema/SchemaMutationsSerializer.java     | 5 ++++-
 src/java/org/apache/cassandra/streaming/StreamRequest.java         | 7 +++++--
 src/java/org/apache/cassandra/utils/BloomFilterSerializer.java     | 2 +-
 src/java/org/apache/cassandra/utils/EstimatedHistogram.java        | 2 +-
 12 files changed, 28 insertions(+), 15 deletions(-)

diff --cc CHANGES.txt
index b03e6d6627,6fd1abe903..cf7a3f4f53
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,5 +1,54 @@@
 -5.0.9
 +6.0-alpha2
 + * Allocation improvements in ProtocolVersion, StorageProxy and MerkleTree 
(CASSANDRA-21199)
 + * 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)
 + * Minor TokenMap performance improvement (CASSANDRA-21223)
 + * Handle lost response when committing PrepareMove (CASSANDRA-21222)
 + * SEPExecutor.maybeExecuteImmediately does not always execute tasks 
immediately despite available worker capacity (CASSANDRA-21429)
 + * Safely regain ranges and delete retired command stores (CASSANDRA-21212)
 + * Reduce memory allocations in miscellaneous places along read path 
(CASSANDRA-21360)
 + * 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)
 + * Enable async GC logging for JDK versions which support it to avoid 
potential hiccups caused by GC log file I/O blocking (CASSANDRA-21372)
 + * Add rowsMutatedPerWriteHistogram metric to track rows mutated per write 
request (CASSANDRA-21320)
 + * Add TotalRowsRead and TotalRowsMutated counters to TableMetrics for 
accurate per-table row throughput tracking (CASSANDRA-21321)
 + * Move exception handling of SPI startup checks when iterating over them 
(CASSANDRA-21409)
 + * Avoid type lookup in SerializationHeader#getType if schema and SSTable are 
aligned (CASSANDRA-21402)
 + * Replace LongAdder in metric-like logic with ThreadLocalCounter 
(CASSANDRA-21400)
 + * BTreeRow.hasLiveData: avoid Cell iteration if there are no cell tombstones 
(CASSANDRA-21363)
 + * Reduce memory allocations in row merge logic (CASSANDRA-21359)
 + * Restore option to avoid hint transfer during decommission (CASSANDRA-21341)
 + * Add an offline cluster metadata tool (CASSANDRA-19151)
 + * Accord: Tail Latency Improvements (CASSANDRA-21361)
 + * Artificial Latency Injection (CASSANDRA-17024)
 + * Accord: Clean Shutdown/Restart, Rebootstrap, et al (CASSANDRA-21355)
 + * 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)
 + * Avoid CompactionOptions parsing for every read by 
WithoutPurgeableTombstones (CASSANDRA-21294)
 + * 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)
 + * Synchronously publish changes to local gossip state following metadata 
updates (CASSANDRA-21239)
 + * Change default for cassandra.set_sep_thread_name to false to reduce CPU 
usage (CASSANDRA-21089)
 + * Avoid permission checks for masked columns when the table doesn't have any 
(CASSANDRA-21299)
 + * Reduce allocations and array copies due to buffer resizing in 
LocalDataResponse during row serialization (CASSANDRA-21285)
 + * Implement a guardrail for client driver versions (CASSANDRA-21146)
 + * Enable IAuthenticator to declare supported and alterable role options 
(CASSANDRA-20834)
 + * Avoid capturing lambda allocation in 
UnfilteredSerializer.deserializeRowBody (CASSANDRA-21289)
 + * Avoid Cell iterator allocation for alive rows in MetricsRecording 
transformation of ReadCommand (CASSANDRA-21288)
 + * Reuse a single TrackedDataInputPlus instance per UnfilteredSerializer 
(CASSANDRA-21296)
 + * In-tree docs are included in binary artifacts (tarball, deb, rpm) as html 
and man pages (CASSANDRA-17260)
 + * Add tooling to repair system peers and peers_v2 if inconsistent with 
cluster metadata (CASSANDRA-21187)
 + * Fix a removed TTLed row re-appearance in a materialized view after a 
cursor compaction (CASSANDRA-21152)
 + * Rework ZSTD dictionary compression logic to create a trainer per training 
(CASSANDRA-21209)
 +Merged from 5.0:
+  * Fix RequestFailureReason serializer and nits in a few others 
(CASSANDRA-21437)
   * Remove golang dependency in gen-doc and replace with python implementation 
(CASSANDRA-21432)
   * Use estimated compressed size for tables to check if there is enough free 
space for a compaction (CASSANDRA-21245)
   * Fix failing select on system_views.settings for non-string keys 
(CASSANDRA-21348)
diff --cc src/java/org/apache/cassandra/streaming/StreamRequest.java
index 8aaf17c17a,656403812c..aac8f22e31
--- a/src/java/org/apache/cassandra/streaming/StreamRequest.java
+++ b/src/java/org/apache/cassandra/streaming/StreamRequest.java
@@@ -63,8 -63,20 +63,9 @@@ public class StreamReques
          this.columnFamilies.addAll(columnFamilies);
      }
  
 -    public String toString()
 -    {
 -        return MoreObjects.toStringHelper(this)
 -                          .add("keyspace", keyspace)
 -                          .add("tables", columnFamilies)
 -                          .add("full", full)
 -                          .add("transientReplicas", transientReplicas)
 -                          .omitNullValues()
 -                          .toString();
 -    }
 -
      public static class StreamRequestSerializer implements 
IVersionedSerializer<StreamRequest>
      {
+         @Override
          public void serialize(StreamRequest request, DataOutputPlus out, int 
version) throws IOException
          {
              out.writeUTF(request.keyspace);


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

Reply via email to