svn commit: r1073750 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/io/sstable/CacheWriter.java

[jb...@apache.org]

Author: jbellis
Date: Wed Feb 23 14:10:50 2011
New Revision: 1073750

URL: http://svn.apache.org/viewvc?rev=1073750&view=rev
Log:
fix cache saving on Windows
patch by jbellis; reviewed by mdennis for CASSANDRA-2207

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/CacheWriter.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1073750&r1=1073749&r2=1073750&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Feb 23 14:10:50 2011
@@ -20,6 +20,7 @@
  * fix EOFing on requests for the last bytes in a file (CASSANDRA-2213)
  * fix BRAF performance when seeking to EOF (CASSANDRA-2218)
  * check for memtable flush_after_mins exceeded every 10s (CASSANDRA-2183)
+ * fix cache saving on Windows (CASSANDRA-2207)
 
 
 0.7.2

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/CacheWriter.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/CacheWriter.java?rev=1073750&r1=1073749&r2=1073750&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/CacheWriter.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/CacheWriter.java Wed Feb 23 14:10:50 2011
@@ -89,8 +89,10 @@ public class CacheWriter<K, V> implement
         {
             out.close();
         }
+
+        path.delete(); // ignore error if it didn't exist
         if (!tmpFile.renameTo(path))
-            throw new IOException("Unable to rename cache to " + path);
+            throw new IOException("Unable to rename " + tmpFile + " to " + path);
         logger.info(String.format("Saved %s (%d items) in %d ms",
                                   path.getName(), keys.size(), (System.currentTimeMillis() - start)));
     }