You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2025/11/07 19:54:51 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.
dcapwell pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4091613298089e9b4908f977bc379c728dcf7e8c
Merge: 5ea935d6b8 e4ea61c1cc
Author: David Capwell <dc...@apache.org>
AuthorDate: Fri Nov 7 11:51:26 2025 -0800
Merge branch 'cassandra-4.1' into cassandra-5.0
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategy.java | 28 +++++++++++++++++++---
.../compaction/LeveledCompactionStrategyTest.java | 18 ++++++++++++++
.../schema/CreateTableValidationTest.java | 16 ++++++++++++-
4 files changed, 59 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index eb95066bbe,6b13602e5f..688430f674
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,14 +1,62 @@@
-4.1.11
+5.0.7
+ * Heap dump should not be generated on handled exceptions (CASSANDRA-20974)
+Merged from 4.1:
* ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
+Merged from 4.0:
+ * Updated dtest-api to 0.0.18 and removed JMX-related classes that now live in the dtest-api (CASSANDRA-20884)
+
+5.0.6
+ * Fix range queries on early-open BTI files (CASSANDRA-20976)
+ * Avoid re-initializing underlying iterator in LazilyInitializedUnfilteredRowIterator after closing (CASSANDRA-20972)
+ * Flush SAI segment builder when current SSTable writer is switched (CASSANDRA-20752)
+ * Throw RTE instead of FSError when RTE is thrown from FileUtis.write in TOCComponent (CASSANDRA-20917)
+ * Upgrade jackson-dataformat-yaml to 2.19.2 and snakeyaml to 2.1 (CASSANDRA-18875)
+ * Represent complex settings as JSON on system_views.settings table (CASSANDRA-20827)
+ * Expose StorageService.dropPreparedStatements via JMX (CASSANDRA-20870)
+ * Sort SSTable TOC entries for determinism (CASSANDRA-20494)
+Merged from 4.1:
* Redact security-sensitive information in system_views.settings (CASSANDRA-20856)
Merged from 4.0:
+ * Leveled Compaction doesn't validate maxBytesForLevel when the table is altered/created (CASSANDRA-20570)
- * Updated dtest-api to 0.0.18 and removed JMX-related classes that now live in the dtest-api (CASSANDRA-20884)
* Fixed incorrect error message constant for keyspace name length validation (CASSANDRA-20915)
- * update shaded cassandra-driver-core to 3.11.5 (CASSANDRA-20904)
+ * Prevent too long table names not fitting file names (CASSANDRA-20389)
+ * Update Jackson to 2.19.2 (CASSANDRA-20848)
+ * Update commons-lang3 to 3.18.0 (CASSANDRA-20849)
+ * Add NativeTransportMaxConcurrentConnectionsPerIp to StorageProxyMBean (CASSANDRA-20642)
+ * Make secondary index implementations notified about rows in fully expired SSTables in compaction (CASSANDRA-20829)
-4.1.10
+5.0.5
+ * Do not source cassandra-env.sh unnecessarily in nodetool and other tooling (CASSANDRA-20745)
+ * Make source distribution buildable by ant artifacts as doc/scripts/process-native-protocol-specs-in-docker.sh was not executable (CASSANDRA-20802)
+ * Fix StorageService JMX mbean not available during bootstrap (CASSANDRA-19902)
+ * SSTableIndexWriter#abort() should log more quietly in cases where an exception is not provided (CASSANDRA-20695)
+ * Avoid availability gap between UP and queryability marking for already built SAI indexes on bounce (CASSANDRA-20732)
+ * Make Commitlog flush data safely in Direct IO mode (CASSANDRA-20692)
+ * Get SAI MemtableIndex refs before SSTableIndex refs at query time (CASSANDRA-20709)
+ * Fix MAX_SEGMENT_SIZE < chunkSize in MmappedRegions::updateState (CASSANDRA-20636)
+ * Full Java 17 support (CASSANDRA-20681)
+ * Ensure replica filtering protection does not trigger unnecessary short read protection reads (CASSANDRA-20639)
+ * Unified Compaction does not properly validate min and target sizes (CASSANDRA-20398)
+ * Avoid lambda usage in TrieMemoryIndex range queries and ensure queue size tracking is per column (CASSANDRA-20668)
+ * Avoid CQLSH throwing an exception loading .cqlshrc on non-supported platforms (CASSANDRA-20478)
+ * Relax validation of snapshot name as a part of SSTable files path validation (CASSANDRA-20649)
+ * 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.1:
* Improve CommitLogSegmentReader to skip SyncBlocks correctly in case of CRC errors (CASSANDRA-20664)
* Do not crash on first boot with data_disk_usage_max_disk_size set when data directory is not created yet (CASSANDRA-20787)
* Rework / simplification of nodetool get/setguardrailsconfig commands (CASSANDRA-20778)
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 58166630bc,b2ba17a31a..a09dc7262a
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@@ -42,7 -44,7 +43,8 @@@ import org.apache.cassandra.exceptions.
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.format.SSTableReader;
+import static org.apache.cassandra.config.CassandraRelevantProperties.TOLERATE_SSTABLE_SIZE;
+ import static org.apache.cassandra.db.compaction.LeveledGenerations.MAX_LEVEL_COUNT;
public class LeveledCompactionStrategy extends AbstractCompactionStrategy
{
diff --cc test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java
index 6e18b93dec,99d49618dc..e1554a6d02
--- a/test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java
+++ b/test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java
@@@ -18,9 -18,21 +18,10 @@@
*/
package org.apache.cassandra.schema;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.CQLTester;
-import org.apache.cassandra.cql3.QueryOptions;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.InvalidRequestException;
+ import org.apache.cassandra.exceptions.RequestValidationException;
-import org.apache.cassandra.transport.Message;
-import org.apache.cassandra.transport.ProtocolVersion;
-import org.apache.cassandra.transport.SimpleClient;
-import org.apache.cassandra.transport.messages.QueryMessage;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org