Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/402f8e00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/402f8e00 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/402f8e00 Branch: refs/heads/trunk Commit: 402f8e00606a54dcac46c60463358501a6a2e686 Parents: cd5aacc c9ead48 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Dec 13 16:27:05 2016 -0800 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Dec 13 16:27:05 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 10 ++- .../cassandra/db/PartitionRangeReadCommand.java | 4 +- .../cassandra/db/compaction/CompactionTask.java | 81 ++++++++++---------- .../cassandra/db/lifecycle/LogTransaction.java | 3 +- .../apache/cassandra/db/lifecycle/Tracker.java | 34 ++++---- .../cassandra/index/SecondaryIndexManager.java | 4 +- .../db/lifecycle/LifecycleTransactionTest.java | 5 +- .../cassandra/db/lifecycle/TrackerTest.java | 6 +- .../org/apache/cassandra/tools/ToolsTester.java | 3 - 10 files changed, 85 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/402f8e00/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/402f8e00/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/402f8e00/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java index 9477aeb,045fc26..df4d63c --- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java +++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java @@@ -219,7 -221,9 +219,9 @@@ public class PartitionRangeReadCommand if (!sstable.isRepaired()) oldestUnrepairedTombstone = Math.min(oldestUnrepairedTombstone, sstable.getMinLocalDeletionTime()); } - return checkCacheFilter(UnfilteredPartitionIterators.mergeLazily(iterators, nowInSec()), cfs); + // iterators can be empty for offline tools - return iterators.isEmpty() ? EmptyIterators.unfilteredPartition(metadata(), isForThrift()) ++ return iterators.isEmpty() ? EmptyIterators.unfilteredPartition(metadata()) + : checkCacheFilter(UnfilteredPartitionIterators.mergeLazily(iterators, nowInSec()), cfs); } catch (RuntimeException | Error e) {
