This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4da92af589fa5c46604ab71ce7daa05d50a03547 Merge: e3d79464f2 4fc8bb29fc Author: David Capwell <[email protected]> AuthorDate: Tue Jan 7 17:38:42 2025 -0800 Merge branch 'cassandra-4.0' into cassandra-4.1 CHANGES.txt | 1 + .../org/apache/cassandra/db/filter/RowFilter.java | 32 ++++++++++++---------- .../cql3/validation/operations/SelectTest.java | 30 ++++++++++++++++++++ .../cassandra/index/sasi/plan/OperationTest.java | 2 +- 4 files changed, 49 insertions(+), 16 deletions(-) diff --cc CHANGES.txt index 94e0a333c3,7eb0068d79..3e5597558d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,10 +1,12 @@@ -4.0.16 - * Fix gossip issue with gossip-only and bootstrapping nodes missing DC/Rack/Host ID endpoint state (CASSANDRA-19983) +4.1.8 + * Add nodetool checktokenmetadata command that checks TokenMetadata is insync with Gossip endpointState (CASSANDRA-18758) + * Backport Java 11 support for Simulator (CASSANDRA-17178/CASSANDRA-19935) + * 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: + * IndexOutOfBoundsException when accessing partition where the column was deleted (CASSANDRA-20108) - - -4.0.15 * Enhance CQLSSTableWriter to notify clients on sstable production (CASSANDRA-19800) + * Fix gossip issue with gossip-only and bootstrapping nodes missing DC/Rack/Host ID endpoint state (CASSANDRA-19983) * Change the resolution of AbstractCommitLogService#lastSyncedAt to nanos to be aligned with later comparisons (CASSANDRA-20074) * Backport of CASSANDRA-17812: Rate-limit new client connection auth setup to avoid overwhelming bcrypt (CASSANDRA-20057) * Support UDTs and vectors as clustering keys in descending order (CASSANDRA-20050) diff --cc src/java/org/apache/cassandra/db/filter/RowFilter.java index 5e0fb51962,69a57918cf..4730656263 --- a/src/java/org/apache/cassandra/db/filter/RowFilter.java +++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java @@@ -334,7 -301,7 +334,7 @@@ public abstract class RowFilter impleme // Short-circuit all partitions that won't match based on static and partition keys for (Expression e : partitionLevelExpressions) - if (!e.isSatisfiedBy(metadata, partition.partitionKey(), partition.staticRow())) - if (!e.isSatisfiedBy(metadata, partition.partitionKey(), partition.staticRow(), nowInSec)) ++ if (!e.isSatisfiedBy(metadata, partition.partitionKey(), partition.staticRow(), nowInSec)) { partition.close(); return null; @@@ -744,9 -692,14 +744,9 @@@ } else { - ByteBuffer foundValue = getValue(metadata, partitionKey, row); + ByteBuffer foundValue = getValue(metadata, partitionKey, row, nowInSec); return foundValue != null && mapType.getSerializer().getSerializedValue(foundValue, value, mapType.getKeysType()) != null; } - - case IN: - // It wouldn't be terribly hard to support this (though doing so would imply supporting - // IN for 2ndary index) but currently we don't. - throw new AssertionError(); } throw new AssertionError(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
