natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused filterSSTablesForReads 

Patch by marcuse; reviewed by Jeremiah Jordan for CASSANDRA-9553
This commit is contained in:
Marcus Eriksson 2015-06-05 11:11:01 +02:00
parent eb266ce8d9
commit 4a61ca6878
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -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);
}
};
}

8
src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
View File

@ -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<SSTableReader> filterSSTablesForReads(List<SSTableReader> sstables)
{
return sstables;
}
/**
* Filters SSTables that are to be blacklisted from the given collection
*

9
src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
View File

@ -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)