Repository: cassandra Updated Branches: refs/heads/trunk eb266ce8d -> 4a61ca687
Remove unused filterSSTablesForReads Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9553 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a61ca68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a61ca68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a61ca68 Branch: refs/heads/trunk Commit: 4a61ca6878c0895486fe84c075708da0514a2a5e Parents: eb266ce Author: Marcus Eriksson <[email protected]> Authored: Fri Jun 5 11:11:01 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Jun 8 08:48:27 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- .../cassandra/db/compaction/AbstractCompactionStrategy.java | 8 -------- .../cassandra/db/compaction/CompactionStrategyManager.java | 9 --------- 3 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a61ca68/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 2f6dce1..82d6213 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -1833,7 +1833,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { public List<SSTableReader> apply(View view) { - return compactionStrategyManager.filterSSTablesForReads(view.intervalTree.search(key)); + return view.intervalTree.search(key); } }; } @@ -1848,7 +1848,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { public List<SSTableReader> apply(View view) { - return compactionStrategyManager.filterSSTablesForReads(view.sstablesInBounds(rowBounds)); + return view.sstablesInBounds(rowBounds); } }; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a61ca68/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index 97e7041..28144ca 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -238,14 +238,6 @@ public abstract class AbstractCompactionStrategy } /** - * @return a subset of the suggested sstables that are relevant for read requests. - */ - public List<SSTableReader> filterSSTablesForReads(List<SSTableReader> sstables) - { - return sstables; - } - - /** * Filters SSTables that are to be blacklisted from the given collection * * @param originalCandidates The collection to check for blacklisted SSTables http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a61ca68/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java index 802ec4a..dd6261c 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java @@ -205,15 +205,6 @@ public class CompactionStrategyManager implements INotificationConsumer CompactionManager.instance.submitBackground(cfs); } - /** - * TODO: remove, unused - */ - public List<SSTableReader> filterSSTablesForReads(List<SSTableReader> sstables) - { - // todo: union of filtered sstables or intersection? - return unrepaired.filterSSTablesForReads(repaired.filterSSTablesForReads(sstables)); - } - public int getUnleveledSSTables() { if (repaired instanceof LeveledCompactionStrategy && unrepaired instanceof LeveledCompactionStrategy)
