You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2025/05/09 11:27:21 UTC

(cassandra) 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0

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

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

commit 9e1b09f384a1d3df6eea91e53d058720e39b4e60
Merge: 7a8335c273 b4484968bd
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri May 9 06:22:50 2025 -0500

    Merge branch 'cassandra-4.1' into cassandra-5.0

 CHANGES.txt                                                          | 5 +++++
 .../cassandra/streaming/async/StreamingMultiplexedChannel.java       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index c073719105,032a805144..08bc3d6849
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,5 +1,46 @@@
 -4.1.9
 +5.0.5
 + * Optimize initial skipping logic for SAI queries on large partitions (CASSANDRA-20191)
 + * Fix reading mmapped trie-index exceeding 2GiB (CASSANDRA-20351)
 + * zero copy streaming allocates direct memory that isn't used, but does help to fragment the memory space (CASSANDRA-20577)
 + * CQLSSTableWriter supports setting the format (BTI or Big) (CASSANDRA-20609)
 + * Don't allocate in ThreadLocalReadAheadBuffer#close() (CASSANDRA-20551)
 + * Ensure RowFilter#isMutableIntersection() properly evaluates numeric ranges on a single column (CASSANDRA-20566)
 + * Switch memtable-related off-heap objects to Native Endian and Memory to Little Endian (CASSANDRA-20190)
 + * SAI marks an index as non-empty when a partial partition/row modifications is flushed due to repair (CASSANDRA-20567)
 + * SAI fails queries when multiple columns exist and a non-indexed column is a composite with a map (CASSANDRA-19891)
   * Grant permission on keyspaces system_views and system_virtual_schema not possible (CASSANDRA-20171)
 + * Fix marking an SSTable as suspected and BufferPool leakage in case of a corrupted SSTable read during a compaction (CASSANDRA-20396)
 + * Introduce SSTableSimpleScanner for compaction (CASSANDRA-20092)
 + * Avoid purging deletions in RowFilter when reconciliation is required (CASSANDRA-20541)
 + * Fixed multiple single-node SAI query bugs relating to static columns (CASSANDRA-20338)
 + * Upgrade com.datastax.cassandra:cassandra-driver-core:3.11.5 to org.apache.cassandra:cassandra-driver-core:3.12.1 (CASSANDRA-17231)
 +Merged from 4.0:
++ * Honor MAX_PARALLEL_TRANSFERS correctly (CASSANDRA-20532)
 + * Updating a column with a new TTL but same expiration time is non-deterministic and causes repair mismatches. (CASSANDRA-20561)
 + * Avoid computing prepared statement size for unprepared batches (CASSANDRA-20556)
 + * Fix Dropwizard Meter causes timeouts when infrequently used (CASSANDRA-19332)
 +
 +
 +5.0.4
 + * Update netty to 4.1.119.Final and netty-tcnative to 2.0.70.Final (CASSANDRA-20314)
 + * Serialization can lose complex deletions in a mutation with multiple collections in a row (CASSANDRA-20449)
 + * Improve error messages when initializing auth classes (CASSANDRA-20368)
 + * Prioritize legacy 2i over SAI for columns with multiple indexes (CASSANDRA-20334)
 + * Ensure only offline tools can build IntervalTrees without first/last key fields (CASSANDRA-20407)
 + * Improve disk access patterns during compaction and range reads (CASSANDRA-15452)
 + * Improve IntervalTree build throughput (CASSANDRA-19596)
 + * Avoid limit on RFP fetch in the case of an unresolved static row (CASSANDRA-20323)
 + * Include materialized views to the output of DESCRIBE TABLE statements (CASSANDRA-20365)
 + * Heap and GC jvm flags improvements (CASSANDRA-20296)
 + * Fix unparseable YAML in default cassandra.yaml when uncommented for downstream tooling (CASSANDRA-20359)
 + * Avoid fetching entire partitions on unresolved static rows in RFP when no static column predicates exist (CASSANDRA-20243)
 + * Avoid indexing empty values for non-literals and types that do not allow them (CASSANDRA-20313)
 + * Fix incorrect results of min / max in-built functions on clustering columns in descending order (CASSANDRA-20295)
 + * Avoid possible consistency violations for SAI intersection queries over repaired index matches and multiple non-indexed column matches (CASSANDRA-20189)
 + * Skip check for DirectIO when initializing tools (CASSANDRA-20289)
 + * Avoid under-skipping during intersections when an iterator has mixed STATIC and WIDE keys (CASSANDRA-20258)
 + * Correct the default behavior of compareTo() when comparing WIDE and STATIC PrimaryKeys (CASSANDRA-20238)
 +Merged from 4.1:
   * Fix mixed mode paxos ttl commit hang (CASSANDRA-20514)
   * Fix paxos mixed mode infinite loop (CASSANDRA-20493)
   * Optionally skip exception logging on invalid legacy protocol magic exception (CASSANDRA-19483)
diff --cc src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java
index ce11c3996e,548d95772d..751928c190
--- a/src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java
+++ b/src/java/org/apache/cassandra/streaming/async/StreamingMultiplexedChannel.java
@@@ -92,10 -92,10 +92,10 @@@ public class StreamingMultiplexedChanne
      private static final Logger logger = LoggerFactory.getLogger(StreamingMultiplexedChannel.class);
  
      private static final int DEFAULT_MAX_PARALLEL_TRANSFERS = getAvailableProcessors();
 -    private static final int MAX_PARALLEL_TRANSFERS = parseInt(getProperty(PROPERTY_PREFIX + "streaming.session.parallelTransfers", Integer.toString(DEFAULT_MAX_PARALLEL_TRANSFERS)));
 +    private static final int MAX_PARALLEL_TRANSFERS = STREAMING_SESSION_PARALLELTRANSFERS.getInt(DEFAULT_MAX_PARALLEL_TRANSFERS);
  
      // a simple mechansim for allowing a degree of fairness across multiple sessions
-     private static final Semaphore fileTransferSemaphore = newFairSemaphore(DEFAULT_MAX_PARALLEL_TRANSFERS);
+     private static final Semaphore fileTransferSemaphore = newFairSemaphore(MAX_PARALLEL_TRANSFERS);
  
      private final StreamingChannel.Factory factory;
      private final InetAddressAndPort to;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org