Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/574e8df2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/574e8df2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/574e8df2 Branch: refs/heads/cassandra-3.8 Commit: 574e8df207f46d1af361a4a651e6b6cdde18688c Parents: 78f077d bc23632 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Jul 6 08:08:42 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Jul 6 08:08:42 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/ColumnFamilyStore.java | 14 +++---- .../cassandra/db/PartitionRangeReadCommand.java | 2 +- .../cassandra/db/SizeEstimatesRecorder.java | 8 +++- .../compaction/AbstractCompactionStrategy.java | 2 +- .../db/compaction/CompactionController.java | 2 +- .../DateTieredCompactionStrategy.java | 2 +- .../TimeWindowCompactionStrategy.java | 2 +- .../apache/cassandra/db/lifecycle/Tracker.java | 2 +- .../org/apache/cassandra/db/lifecycle/View.java | 36 +++++++++-------- .../apache/cassandra/db/view/ViewBuilder.java | 4 +- .../cassandra/index/SecondaryIndexManager.java | 2 +- .../index/internal/CassandraIndex.java | 2 +- .../io/sstable/IndexSummaryManager.java | 2 +- .../cassandra/streaming/StreamSession.java | 12 ++++-- .../apache/cassandra/db/lifecycle/ViewTest.java | 8 ++-- .../index/internal/CustomCassandraIndex.java | 2 +- .../io/sstable/SSTableRewriterTest.java | 41 +++++++++++++++++++- 18 files changed, 100 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aa3e939,b3063b4..afeef2c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,6 +1,9 @@@ -3.0.9 +3.9 + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073) + * Increase size of flushExecutor thread pool (CASSANDRA-12071) +Merged from 3.0: + * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996) + * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944) * Fix column ordering of results with static columns for Thrift requests in a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of those static columns in query results (CASSANDRA-12123) http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java index bca1877,842ad5f..a8959c2 --- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java +++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java @@@ -173,9 -173,9 +173,9 @@@ public class PartitionRangeReadCommand metric.rangeLatency.addNano(latencyNanos); } - protected UnfilteredPartitionIterator queryStorage(final ColumnFamilyStore cfs, ReadOrderGroup orderGroup) + protected UnfilteredPartitionIterator queryStorage(final ColumnFamilyStore cfs, ReadExecutionController executionController) { - ColumnFamilyStore.ViewFragment view = cfs.select(View.select(SSTableSet.LIVE, dataRange().keyRange())); + ColumnFamilyStore.ViewFragment view = cfs.select(View.selectLive(dataRange().keyRange())); Tracing.trace("Executing seq scan across {} sstables for {}", view.sstables.size(), dataRange().keyRange().getString(metadata().getKeyValidator())); // fetch data from current memtable, historical memtables, and SSTables in the correct order. http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/lifecycle/Tracker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/lifecycle/View.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/db/view/ViewBuilder.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/index/internal/CassandraIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/test/unit/org/apache/cassandra/db/lifecycle/ViewTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/574e8df2/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ----------------------------------------------------------------------
