svn commit: r1071390 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[jbellis]

Author: jbellis
Date: Wed Feb 16 20:38:57 2011
New Revision: 1071390

URL: http://svn.apache.org/viewvc?rev=1071390&view=rev
Log:
read saved caches with DataInputStream
patch by mdennis; reviewed by jbellis for CASSANDRA-2174

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1071390&r1=1071389&r2=1071390&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Feb 16 20:38:57 2011
@@ -2,7 +2,7 @@
  * Keep endpoint state until aVeryLongTime (CASSANDRA-2115)
  * lower-latency read repair (CASSANDRA-2069)
  * add hinted_handoff_throttle_delay_in_ms option (CASSANDRA-2161)
- * don't save empty caches (CASSANDRA-2172)
+ * fixes for cache save/load (CASSANDRA-2172, -2174)
 
 
 0.7.2

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=1071390&r1=1071389&r2=1071390&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
 Wed Feb 16 20:38:57 2011
@@ -246,13 +246,13 @@ public class ColumnFamilyStore implement
         Set<DecoratedKey> keys = new TreeSet<DecoratedKey>();
         if (path.exists())
         {
-            ObjectInputStream in = null;
+            DataInputStream in = null;
             try
             {
                 long start = System.currentTimeMillis();
 
                 logger.info(String.format("reading saved cache %s", path));
-                in = new ObjectInputStream(new BufferedInputStream(new 
FileInputStream(path)));
+                in = new DataInputStream(new BufferedInputStream(new 
FileInputStream(path)));
                 while (in.available() > 0)
                 {
                     int size = in.readInt();