svn commit: r986454 - in /cassandra/trunk/src/java/org/apache/cassandra: db/ColumnFamilyStore.java io/sstable/SSTableDeletingReference.java

[jbellis]

Author: jbellis
Date: Tue Aug 17 19:08:29 2010
New Revision: 986454

URL: http://svn.apache.org/viewvc?rev=986454&view=rev
Log:
call deleteSSTableStatistics from SSTableDeletingReference.  patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=986454&r1=986453&r2=986454&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue 
Aug 17 19:08:29 2010
@@ -355,9 +355,9 @@ public class ColumnFamilyStore implement
         {
             if (file.getName().contains("-Data.db"))
             {
-                if (SSTable.deleteIfCompacted(file.getAbsolutePath()))
+                final String delPath = file.getAbsolutePath();
+                if (SSTable.deleteIfCompacted(delPath))
                 {
-                    final String delPath = file.getAbsolutePath();
                     runnables.add(new Runnable()
                     {
                         public void run()

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java?rev=986454&r1=986453&r2=986454&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableDeletingReference.java
 Tue Aug 17 19:08:29 2010
@@ -30,6 +30,7 @@ import java.util.TimerTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.cassandra.db.StatisticsTable;
 import org.apache.cassandra.io.DeletionService;
 import org.apache.cassandra.io.util.FileUtils;
 
@@ -95,6 +96,7 @@ public class SSTableDeletingReference ex
                 FileUtils.deleteWithConfirm(new 
File(SSTable.indexFilename(path)));
                 FileUtils.deleteWithConfirm(new 
File(SSTable.filterFilename(path)));
                 FileUtils.deleteWithConfirm(new 
File(SSTable.compactedFilename(path)));
+                
StatisticsTable.deleteSSTableStatistics(datafile.getAbsolutePath());
             }
             catch (IOException e)
             {