natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
David Capwell 2025-01-07 17:46:32 -08:00
parent 8fcbe3ff6e 8125a69480
commit 6843514597
5 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -138,6 +138,7 @@ Merged from 5.0:
Merged from 4.1:
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
Merged from 4.0:
* IndexOutOfBoundsException when accessing partition where the column was deleted (CASSANDRA-20108)
* Enhance CQLSSTableWriter to notify clients on sstable production (CASSANDRA-19800)
* Change the resolution of AbstractCommitLogService#lastSyncedAt to nanos to be aligned with later comparisons (CASSANDRA-20074)
* Support UDTs and vectors as clustering keys in descending order (CASSANDRA-20050)

29
src/java/org/apache/cassandra/db/filter/RowFilter.java
View File

@ -224,7 +224,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
// 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))
{
partition.close();
return null;
@ -251,7 +251,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
return null;
for (Expression e : rowLevelExpressions)
if (!e.isSatisfiedBy(metadata, pk, purged))
if (!e.isSatisfiedBy(metadata, pk, purged, nowInSec))
return null;
return row;
@ -303,7 +303,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
for (Expression e : expressions)
{
if (!e.isSatisfiedBy(metadata, partitionKey, purged))
if (!e.isSatisfiedBy(metadata, partitionKey, purged, nowInSec))
return false;
}
return true;
@ -515,9 +515,9 @@ public class RowFilter implements Iterable<RowFilter.Expression>
* (i.e. it should come from a RowIterator).
* @return whether the row is satisfied by this expression.
*/
public abstract boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row);
public abstract boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec);
protected ByteBuffer getValue(TableMetadata metadata, DecoratedKey partitionKey, Row row)
protected ByteBuffer getValue(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
{
switch (column.kind)
{
@ -529,7 +529,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
return row.clustering().bufferAt(column.position());
default:
Cell<?> cell = row.getCell(column);
return cell == null ? null : cell.buffer();
return cell == null || cell.isTombstone() || !cell.isLive(nowInSec) ? null : cell.buffer();
}
}
@ -690,7 +690,8 @@ public class RowFilter implements Iterable<RowFilter.Expression>
super(column, operator, value);
}
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row)
@Override
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
{
// We support null conditions for LWT (in ColumnCondition) but not for RowFilter.
// TODO: we should try to merge both code someday.
@ -704,7 +705,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
// representation. See CASSANDRA-11629
if (column.type.isCounter())
{
ByteBuffer foundValue = getValue(metadata, partitionKey, row);
ByteBuffer foundValue = getValue(metadata, partitionKey, row, nowInSec);
if (foundValue == null)
return false;
@ -714,7 +715,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
else
{
// Note that CQL expression are always of the form 'x < 4', i.e. the tested value is on the left.
ByteBuffer foundValue = getValue(metadata, partitionKey, row);
ByteBuffer foundValue = getValue(metadata, partitionKey, row, nowInSec);
return foundValue != null && operator.isSatisfiedBy(column.type, foundValue, value);
}
}
@ -729,7 +730,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
}
else
{
ByteBuffer foundValue = getValue(metadata, partitionKey, row);
ByteBuffer foundValue = getValue(metadata, partitionKey, row, nowInSec);
return foundValue != null && operator.isSatisfiedBy(column.type, foundValue, value);
}
}
@ -814,7 +815,8 @@ public class RowFilter implements Iterable<RowFilter.Expression>
return CompositeType.build(ByteBufferAccessor.instance, key, value);
}
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row)
@Override
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
{
assert key != null;
// We support null conditions for LWT (in ColumnCondition) but not for RowFilter.
@ -832,7 +834,7 @@ public class RowFilter implements Iterable<RowFilter.Expression>
}
else
{
ByteBuffer serializedMap = getValue(metadata, partitionKey, row);
ByteBuffer serializedMap = getValue(metadata, partitionKey, row, nowInSec);
if (serializedMap == null)
return false;
@ -933,7 +935,8 @@ public class RowFilter implements Iterable<RowFilter.Expression>
}
// Filtering by custom expressions isn't supported yet, so just accept any row
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row)
@Override
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
{
return true;
}

30
test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
View File

@ -2554,6 +2554,36 @@ public class SelectTest extends CQLTester
});
}
@Test
public void filteringOnDeletedStaticColumnValue() throws Throwable
{
// Create table with int-only columns
createTable("CREATE TABLE %s (pk0 int, pk1 int, ck0 int, ck1 int, s0 tinyint static, v0 int, v1 int, PRIMARY KEY ((pk0, pk1), ck0, ck1))");
// Insert rows
execute("INSERT INTO %s (pk0, pk1, s0, ck0, ck1, v0, v1) VALUES (?, ?, ?, ?, ?, ?, ?)", 1000, 2000, (byte) 126, 100, 1, 20, 30);
execute("INSERT INTO %s (pk0, pk1, s0, ck0, ck1, v0, v1) VALUES (?, ?, ?, ?, ?, ?, ?)", 1000, 2000, (byte) 125, 200, 2, 40, 50);
execute("INSERT INTO %s (pk0, pk1, s0, ck0, ck1, v0, v1) VALUES (?, ?, ?, ?, ?, ?, ?)", 1000, 3000, (byte) 122, 300, 3, 60, 70);
execute("DELETE s0,v0,v1 FROM %s WHERE pk0=1000 AND pk1=2000 and ck0=100 and ck1=1");
beforeAndAfterFlush(() -> {
// Verify the columns are deleted
assertRows(execute("SELECT pk0, pk1, s0, ck0, ck1, v0, v1 FROM %s WHERE s0=? ALLOW FILTERING", (byte) 122),
row(1000, 3000, (byte) 122, 300, 3, 60, 70));
});
execute("DELETE v0 FROM %s WHERE pk0=1000 AND pk1=3000 AND ck0=300 AND ck1=3");
beforeAndAfterFlush(() -> {
assertRows(execute("SELECT pk0, pk1, s0, ck0, ck1, v0, v1 FROM %s WHERE s0=? ALLOW FILTERING", (byte) 122),
row(1000, 3000, (byte) 122, 300, 3, null, 70));
assertRows(execute("SELECT pk0, pk1, s0, ck0, ck1, v0, v1 FROM %s WHERE pk0=1000 AND pk1=3000 AND ck0=300 AND ck1=3"),
row(1000, 3000, (byte) 122, 300, 3, null, 70));
});
}
@Test
public void containsFilteringOnNonClusteringColumn() throws Throwable {
createTable("CREATE TABLE %s (a int, b int, c int, d list<int>, PRIMARY KEY (a, b, c))");

2
test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java
View File

@ -515,7 +515,7 @@ public class OperationTest
}
@Override
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row)
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
{
throw new UnsupportedOperationException();
}

2
test/unit/org/apache/cassandra/index/sasi/plan/OperationTest.java
View File

@ -651,7 +651,7 @@ public class OperationTest extends SchemaLoader
}
@Override
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row)
public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
{
throw new UnsupportedOperationException();
}