This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 629b02599e1bf0d9dacca495539dec95d445c239
Merge: a39f3b066f 29746cffbb
Author: Marcus Eriksson <marc...@apache.org>
AuthorDate: Mon May 12 13:31:18 2025 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../org/apache/cassandra/db/lifecycle/LogFile.java | 19 ++-
.../apache/cassandra/db/lifecycle/LogRecord.java | 69 +++++++-
.../cassandra/db/lifecycle/LogTransaction.java | 2 +
.../cassandra/db/lifecycle/LogTransactionTest.java | 174 ++++++++++++++++++++-
5 files changed, 254 insertions(+), 11 deletions(-)
diff --cc CHANGES.txt
index 37ded12b3b,b61e044cfd..0fc414363c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -249,10 -46,8 +249,11 @@@ Merged from 4.1
* Optionally skip exception logging on invalid legacy protocol magic
exception (CASSANDRA-19483)
* Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)
* Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking
thread is interrupted (CASSANDRA-20084)
+ * Run audit_logging_options through santiation and validation on startup
(CASSANDRA-20208)
+ * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
+ * Fix race condition in DecayingEstimatedHistogramReservoir during rescale
(CASSANDRA-19365)
Merged from 4.0:
+ * Handle sstable metadata stats file getting a new mtime after compaction
has finished (CASSANDRA-18119)
* 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)
diff --cc src/java/org/apache/cassandra/db/lifecycle/LogRecord.java
index 5f45156eb6,fb11455e90..d39b23bf9c
--- a/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogRecord.java
@@@ -46,7 -51,7 +51,8 @@@ import org.apache.cassandra.io.util.Fil
import org.apache.cassandra.io.util.PathUtils;
import org.apache.cassandra.utils.FBUtilities;
+ import static org.apache.cassandra.io.sstable.Descriptor.TMP_EXT;
+import static org.apache.cassandra.utils.LocalizeString.toUpperCaseLocalized;
/**
* A decoded line in a transaction log file replica.
diff --cc test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
index 1f010bf30e,c1e5b5b41f..096cd02c08
--- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
@@@ -38,6 -37,8 +37,7 @@@ import java.util.stream.Stream
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
+ import org.apache.cassandra.db.streaming.ComponentContext;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.Util;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
