From 4a61ca6878c0895486fe84c075708da0514a2a5e Mon Sep 17 00:00:00 2001 From: Marcus Eriksson Date: Fri, 5 Jun 2015 11:11:01 +0200 Subject: [PATCH] Remove unused filterSSTablesForReads Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9553 --- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- .../db/compaction/AbstractCompactionStrategy.java | 8 -------- .../db/compaction/CompactionStrategyManager.java | 9 --------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 2f6dce1ed5..82d621330f 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 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 apply(View view) { - return compactionStrategyManager.filterSSTablesForReads(view.sstablesInBounds(rowBounds)); + return view.sstablesInBounds(rowBounds); } }; } diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index 97e7041ebc..28144ca1cf 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -237,14 +237,6 @@ public abstract class AbstractCompactionStrategy CompactionManager.instance.submitBackground(cfs); } - /** - * @return a subset of the suggested sstables that are relevant for read requests. - */ - public List filterSSTablesForReads(List sstables) - { - return sstables; - } - /** * Filters SSTables that are to be blacklisted from the given collection * diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java index 802ec4a21f..dd6261c72d 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 filterSSTablesForReads(List sstables) - { - // todo: union of filtered sstables or intersection? - return unrepaired.filterSSTablesForReads(repaired.filterSSTablesForReads(sstables)); - } - public int getUnleveledSSTables() { if (repaired instanceof LeveledCompactionStrategy && unrepaired instanceof LeveledCompactionStrategy)