This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from cd347bdc58 Merge branch 'cassandra-5.0' into trunk new f7984627e7 Avoid possible consistency violations for SAI intersection queries over partially updated rows at consistency levels that require reconciliation new 58f0e2146b Merge branch 'cassandra-5.0' into trunk The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + .../cql3/restrictions/StatementRestrictions.java | 6 +- .../cassandra/cql3/statements/SelectStatement.java | 9 +- .../cassandra/db/AbstractReadCommandBuilder.java | 2 +- .../org/apache/cassandra/db/ConsistencyLevel.java | 15 +- src/java/org/apache/cassandra/db/ReadCommand.java | 34 +- .../db/compaction/CompactionIterator.java | 29 +- .../org/apache/cassandra/db/filter/RowFilter.java | 243 +++++----- .../cassandra/db/rows/UnfilteredRowIterators.java | 33 +- .../apache/cassandra/index/sai/QueryContext.java | 14 +- .../cassandra/index/sai/StorageAttachedIndex.java | 17 +- .../index/sai/disk/IndexSearchResultIterator.java | 14 +- .../index/sai/disk/PerColumnIndexWriter.java | 4 +- .../cassandra/index/sai/disk/RowMapping.java | 39 +- .../index/sai/disk/v1/MemtableIndexWriter.java | 38 +- .../index/sai/iterators/KeyRangeIterator.java | 2 +- .../index/sai/iterators/KeyRangeUnionIterator.java | 38 +- .../cassandra/index/sai/plan/FilterTree.java | 58 ++- .../apache/cassandra/index/sai/plan/Operation.java | 32 +- .../cassandra/index/sai/plan/QueryController.java | 95 +++- .../cassandra/index/sai/plan/QueryViewBuilder.java | 78 +--- .../sai/plan/StorageAttachedIndexQueryPlan.java | 30 +- .../sai/plan/StorageAttachedIndexSearcher.java | 68 +-- .../cassandra/service/reads/DataResolver.java | 55 ++- .../service/reads/ReplicaFilteringProtection.java | 86 ++-- .../reads/repair/RowIteratorMergeListener.java | 10 +- .../test/ReplicaFilteringProtectionTest.java | 78 ++-- .../test/sai/ConcurrencyFactorTest.java | 9 +- .../test/sai/PartialUpdateHandlingTest.java | 494 +++++++++++++++++++++ .../test/sai/ReplicaFilteringProtectionTest.java | 67 --- .../distributed/test/sai/StrictFilteringTest.java | 227 ++++++++++ test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +- .../org/apache/cassandra/db/ReadCommandTest.java | 6 +- .../db/ReadCommandVerbHandlerOutOfRangeTest.java | 4 +- .../cql/intersection/RandomIntersectionTester.java | 6 +- .../cassandra/index/sai/plan/OperationTest.java | 86 ++-- .../apache/cassandra/index/sasi/SASIIndexTest.java | 4 +- 37 files changed, 1408 insertions(+), 625 deletions(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/sai/PartialUpdateHandlingTest.java delete mode 100644 test/distributed/org/apache/cassandra/distributed/test/sai/ReplicaFilteringProtectionTest.java create mode 100644 test/distributed/org/apache/cassandra/distributed/test/sai/StrictFilteringTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org