svn commit: r1074217 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java

[jb...@apache.org]

Author: jbellis
Date: Thu Feb 24 17:05:13 2011
New Revision: 1074217

URL: http://svn.apache.org/viewvc?rev=1074217&view=rev
Log:
r/m unused code from Srub

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1074217&r1=1074216&r2=1074217&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java Thu Feb 24 17:05:13 2011
@@ -505,15 +505,13 @@ public class CompactionManager implement
     private void doScrub(ColumnFamilyStore cfs) throws IOException
     {
         assert !cfs.isIndex();
-        Table table = cfs.table;
-        Collection<Range> ranges = StorageService.instance.getLocalRanges(table.name);
 
         for (final SSTableReader sstable : cfs.getSSTables())
         {
             logger.info("Scrubbing " + sstable);
 
             // Calculate the expected compacted filesize
-            String compactionFileLocation = table.getDataFileLocation(sstable.length());
+            String compactionFileLocation = cfs.table.getDataFileLocation(sstable.length());
             if (compactionFileLocation == null)
                 throw new IOException("disk full");