This is an automated email from the ASF dual-hosted git repository. adelapena pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from da8fe7a Merge branch 'cassandra-3.11' into trunk new dd255ff Fix replica-side filtering returning stale data with CL > 1 new 7014cd5 Merge branch 'cassandra-3.0' into cassandra-3.11 new 69ea5ff Merge branch 'cassandra-3.11' into trunk The 3 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 + src/java/org/apache/cassandra/db/DataRange.java | 10 + .../cassandra/db/PartitionRangeReadCommand.java | 5 + src/java/org/apache/cassandra/db/ReadCommand.java | 6 + .../cassandra/db/SinglePartitionReadCommand.java | 5 + .../db/compaction/CompactionIterator.java | 3 +- .../org/apache/cassandra/db/filter/RowFilter.java | 41 +- .../db/partitions/PartitionIterators.java | 12 + .../partitions/UnfilteredPartitionIterators.java | 21 +- .../cassandra/db/rows/UnfilteredRowIterators.java | 34 +- .../org/apache/cassandra/metrics/TableMetrics.java | 18 +- .../cassandra/service/reads/DataResolver.java | 197 +++++++-- .../service/reads/ReplicaFilteringProtection.java | 480 +++++++++++++++++++++ .../reads/repair/RowIteratorMergeListener.java | 6 +- .../cassandra/utils/concurrent/Accumulator.java | 13 + .../utils/concurrent/AccumulatorTest.java | 54 ++- 16 files changed, 820 insertions(+), 86 deletions(-) create mode 100644 src/java/org/apache/cassandra/service/reads/ReplicaFilteringProtection.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org