Author: slebresne
Date: Tue Jun 14 07:55:43 2011
New Revision: 1135399
URL: http://svn.apache.org/viewvc?rev=1135399&view=rev
Log:
Seek back after deserializing a row to update cache with
patch by jbellis; reviewed by slebresne for CASSANDRA-2752
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1135399&r1=1135398&r2=1135399&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Jun 14 07:55:43 2011
@@ -51,6 +51,7 @@
* remove active-pull schema requests (CASSANDRA-2715)
* avoid marking entire list of sstables as actively being compacted
in multithreaded compaction (CASSANDRA-2765)
+ * seek back after deserializing a row to update cache with (CASSANDRA-2752)
0.8.0-final
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1135399&r1=1135398&r2=1135399&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
Tue Jun 14 07:55:43 2011
@@ -410,8 +410,10 @@ public class SSTableWriter extends SSTab
if (row == null)
{
// If not provided, read from disk.
+ long position = dfile.getFilePointer();
cf = ColumnFamily.create(cfs.metadata);
ColumnFamily.serializer().deserializeColumns(dfile, cf, true, true);
+ dfile.seek(position);
}
else
{
