Author: jbellis
Date: Sat Nov 20 01:23:37 2010
New Revision: 1037101
URL: http://svn.apache.org/viewvc?rev=1037101&view=rev
Log:
avoid attempting to delete compacted sstables twice on restart
patch by jbellis to fix regression introduced by CASSANDRA-1736
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1037101&r1=1037100&r2=1037101&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Sat Nov 20 01:23:37 2010
@@ -462,7 +462,10 @@ public class ColumnFamilyStore implement
Set<Component> components = sstableFiles.getValue();
if (components.contains(Component.COMPACTED_MARKER) ||
desc.temporary)
+ {
SSTable.delete(desc, components);
+ continue;
+ }
File dataFile = new File(desc.filenameFor(Component.DATA));
if (components.contains(Component.DATA) && dataFile.length() > 0)
