Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/594f1c1d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/594f1c1d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/594f1c1d Branch: refs/heads/cassandra-3.11 Commit: 594f1c1dfba44530e2b25f83a1e9d71f79aba7f6 Parents: 2556676 35e32f2 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Sep 19 11:18:20 2017 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Sep 19 11:18:20 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/DataResolver.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/594f1c1d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 54117df,74e70e1..01955f6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.15 +3.11.1 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a single leaf and overflow collisions (CASSANDRA-13869) + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) + * BTree.Builder memory leak (CASSANDRA-13754) + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798) + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Fix short read protection for tables with no clustering columns (CASSANDRA-13880) * Make isBuilt volatile in PartitionUpdate (CASSANDRA-13619) * Prevent integer overflow of timestamps in CellTest and RowsTest (CASSANDRA-13866) * Fix counter application order in short read protection (CASSANDRA-12872) http://git-wip-us.apache.org/repos/asf/cassandra/blob/594f1c1d/src/java/org/apache/cassandra/service/DataResolver.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/DataResolver.java index 5708832,99399a3..4b0bd3c --- a/src/java/org/apache/cassandra/service/DataResolver.java +++ b/src/java/org/apache/cassandra/service/DataResolver.java @@@ -536,11 -522,15 +538,15 @@@ public class DataResolver extends Respo // Also note that we only get here once all the results for this node have been returned, and so // if the node had returned the requested number but we still get there, it imply some results were // skipped during reconciliation. - if (lastCount == counter.counted() || !counter.isDoneForPartition()) + if (lastCount == counted(counter) || !counter.isDoneForPartition()) return null; - lastCount = counted(counter); - assert !postReconciliationCounter.isDoneForPartition(); + // clustering of the last row returned is empty, meaning that there is only one row per partition, + // and we already have it. + if (lastClustering == Clustering.EMPTY) + return null; + - lastCount = counter.counted(); ++ lastCount = counted(counter); // We need to try to query enough additional results to fulfill our query, but because we could still // get short reads on that additional query, just querying the number of results we miss may not be --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
