Author: jbellis Date: Fri Dec 17 02:58:20 2010 New Revision: 1050269 URL: http://svn.apache.org/viewvc?rev=1050269&view=rev Log: fix CleanupHelper to deal with snapshots patch by jbellis
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/CleanupHelper.java Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java?rev=1050269&r1=1050268&r2=1050269&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java (original) +++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java Fri Dec 17 02:58:20 2010 @@ -159,11 +159,8 @@ public class FileUtils { if (dir.isDirectory()) { - String[] children = dir.list(); - for (int i = 0; i < children.length; i++) - { - deleteDir(new File(dir, children[i])); - } + for (String aChildren : dir.list()) + deleteDir(new File(dir, aChildren)); } // The directory is now empty so now it can be smoked Modified: cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/CleanupHelper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/CleanupHelper.java?rev=1050269&r1=1050268&r2=1050269&view=diff ============================================================================== --- cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/CleanupHelper.java (original) +++ cassandra/branches/cassandra-0.6/test/unit/org/apache/cassandra/CleanupHelper.java Fri Dec 17 02:58:20 2010 @@ -43,9 +43,7 @@ public class CleanupHelper public static void cleanup() throws IOException { // clean up commitlog - String[] directoryNames = { - DatabaseDescriptor.getLogFileLocation(), - }; + String[] directoryNames = { DatabaseDescriptor.getLogFileLocation(), }; for (String dirName : directoryNames) { File dir = new File(dirName); @@ -53,11 +51,7 @@ public class CleanupHelper { throw new RuntimeException("No such directory: " + dir.getAbsolutePath()); } - for (File f : dir.listFiles()) - { - FileUtils.deleteWithConfirm(f); - } - FileUtils.deleteWithConfirm(dir); + FileUtils.deleteDir(dir); } // clean up data directory which are stored as data directory/table/data files @@ -68,19 +62,7 @@ public class CleanupHelper { throw new RuntimeException("No such directory: " + dir.getAbsolutePath()); } - for (File tableFile : dir.listFiles()) - { - // table directory - if (tableFile.isDirectory()) - { - for (File dataFile : tableFile.listFiles()) - { - FileUtils.deleteWithConfirm(dataFile); - } - } - FileUtils.deleteWithConfirm(tableFile); - } - FileUtils.deleteWithConfirm(dir); + FileUtils.deleteDir(dir); } }