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

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 26eb6c624e3fcca5fcdcaaa78cd5afb3fd9df397
Merge: cc86fc8865 5447b5ebb5
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Sat Jan 18 11:48:44 2025 +0100

    Merge branch 'cassandra-5.0' into trunk

 CHANGES.txt                                            |  1 +
 src/java/org/apache/cassandra/db/ReadCommand.java      | 18 ++++++++++++++++++
 .../cassandra/db/transform/StoppingTransformation.java |  4 ++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 517b7b6958,e5e2cf19b3..3c25b4c688
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -129,26 -7,14 +129,27 @@@ Merged from 5.0
   * Streamline the serialized format for index status gossip messages 
(CASSANDRA-20058)
   * Batch clusterings into single SAI partition post-filtering reads 
(CASSANDRA-19497)
   * Ban the usage of "var" instead of full types in the production code 
(CASSANDRA-20038)
 - * Suppress CVE-2024-45772 from lucene-core-9.7.0.jar (CASSANDRA-20024)
 + * Suppress CVE-2024-45772, upgrade to lucene-core-9.12.0.jar 
(CASSANDRA-20024)
 + * Use SinglePartitionReadCommand for index queries that use strict filtering 
(CASSANDRA-19968)
 + * Always write local expiration time as an int to LivenessInfo digest 
(CASSANDRA-19989)
 + * Enables IAuthenticator's to return own AuthenticateMessage 
(CASSANDRA-19984)
 + * Use ParameterizedClass for all auth-related implementations 
(CASSANDRA-19946)
 + * Correct out-of-date metrics and configuration documentation for SAI 
(CASSANDRA-19898)
 + * Make configuration entries in memtable section order-independent 
(CASSANDRA-19906)
 + * Add guardrail for enabling usage of VectorType (CASSANDRA-19903)
 + * Set executable flag for shell scripts in .build directory for source 
artifact (CASSANDRA-19896)
 + * Throw ConfigurationException when commitlog_disk_access_mode is direct but 
direct IO is not supported by filesystem (CASSANDRA-19812)
 + * Memtable allocation type unslabbed_heap_buffers_logged will cause an 
assertion error for TrieMemtables and SegmentedTrieMemtables (CASSANDRA-19835)
 + * Minor improvements in Cassandra shutdown and startup logs (CASSANDRA-19818)
 + * Fix direct IO support always being evaluated to false upon the first start 
of a node (CASSANDRA-19779)
 + * Deprecate and ignore use_deterministic_table_id (CASSANDRA-19809)
 + * Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
 + * Add java.base/java.lang.reflect among opens for jvm11-client.options 
(CASSANDRA-19780)
  Merged from 4.1:
   * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
 - * Add nodetool checktokenmetadata command that checks TokenMetadata is 
insync with Gossip endpointState (CASSANDRA-18758)
 - * Equality check for Paxos.Electorate should not depend on collection types 
(CASSANDRA-19935)
 + * Fix race condition in DecayingEstimatedHistogramReservoir during rescale 
(CASSANDRA-19365)
  Merged from 4.0:
+  * Do not attach rows and partitions to QueryCancellationChecker when already 
attached (CASSANDRA-20135)
   * Allow hint delivery during schema mismatch (CASSANDRA-20188)
   * IndexOutOfBoundsException when accessing partition where the column was 
deleted (CASSANDRA-20108)
   * Enhance CQLSSTableWriter to notify clients on sstable production 
(CASSANDRA-19800)
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index abf227eb8c,b4be5c7646..3bb50cbcfa
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -38,10 -38,9 +38,12 @@@ import org.slf4j.LoggerFactory
  import io.netty.util.concurrent.FastThreadLocal;
  import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.filter.*;
+ import org.apache.cassandra.db.transform.BasePartitions;
+ import org.apache.cassandra.db.transform.BaseRows;
 +import org.apache.cassandra.exceptions.CoordinatorBehindException;
  import org.apache.cassandra.exceptions.QueryCancelledException;
 +import org.apache.cassandra.exceptions.UnknownTableException;
 +import org.apache.cassandra.metrics.TCMMetrics;
  import org.apache.cassandra.net.MessageFlag;
  import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.net.ParamType;


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

Reply via email to