Author: jbellis
Date: Sat Apr 18 01:33:24 2009
New Revision: 766199
URL: http://svn.apache.org/viewvc?rev=766199&view=rev
Log:
fix SequenceFile to know about new int in CF serialization. patch by Jun Rao;
reviewed by jbellis for #33
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java?rev=766199&r1=766198&r2=766199&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java Sat
Apr 18 01:33:24 2009
@@ -875,6 +875,10 @@
/* read the column family name */
String cfName = file_.readUTF();
dataSize -= (utfPrefix_ + cfName.length());
+
+ /* read local deletion time */
+ int localDeletionTime = file_.readInt();
+ dataSize -=4;
/* read if this cf is marked for delete */
long markedForDeleteAt = file_.readLong();
@@ -902,6 +906,8 @@
bufOut.writeInt(dataSize + utfPrefix_ + cfName.length() + 4 + 1);
/* write the column family name */
bufOut.writeUTF(cfName);
+ /* write local deletion time */
+ bufOut.writeInt(localDeletionTime);
/* write if this cf is marked for delete */
bufOut.writeLong(markedForDeleteAt);
/* write number of columns */
@@ -949,6 +955,10 @@
String cfName = file_.readUTF();
dataSize -= (utfPrefix_ + cfName.length());
+ /* read local deletion time */
+ int localDeletionTime = file_.readInt();
+ dataSize -=4;
+
/* read if this cf is marked for delete */
long markedForDeleteAt = file_.readLong();
dataSize -= 8;
@@ -984,6 +994,8 @@
bufOut.writeInt(dataSizeReturned + utfPrefix_ +
cfName.length() + 4 + 1);
/* write the column family name */
bufOut.writeUTF(cfName);
+ /* write local deletion time */
+ bufOut.writeInt(localDeletionTime);
/* write if this cf is marked for delete */
bufOut.writeLong(markedForDeleteAt);
/* write number of columns */
