Author: jbellis
Date: Wed Apr 1 22:23:58 2009
New Revision: 761093
URL: http://svn.apache.org/viewvc?rev=761093&view=rev
Log:
Previously I only fixed the deletion marker reading of one of the 3 copies of
the next() method. This fixes the other two.
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=761093&r1=761092&r2=761093&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java
(original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/io/SequenceFile.java Wed
Apr 1 22:23:58 2009
@@ -922,8 +922,8 @@
dataSize -= (utfPrefix_ + cfName.length());
/* read if this cf is marked for delete */
- boolean markedForDelete = file_.readBoolean();
- dataSize -= 1;
+ long markedForDeleteAt = file_.readLong();
+ dataSize -= 8;
/* read the total number of columns */
int totalNumCols = file_.readInt();
@@ -949,7 +949,7 @@
/* write the column family name */
bufOut.writeUTF(cfName);
/* write if this cf is marked for delete */
- bufOut.writeBoolean(markedForDelete);
+ bufOut.writeLong(markedForDeleteAt);
/* write number of columns */
bufOut.writeInt(columnRange.count());
/* now write the columns */
@@ -1035,8 +1035,8 @@
dataSize -= (utfPrefix_ + cfName.length());
/* read if this cf is marked for delete */
- boolean markedForDelete = file_.readBoolean();
- dataSize -= 1;
+ long markedForDeleteAt = file_.readLong();
+ dataSize -= 8;
/* read the total number of columns */
int totalNumCols = file_.readInt();
@@ -1061,7 +1061,7 @@
/* write the column family name */
bufOut.writeUTF(cfName);
/* write if this cf is marked for delete */
- bufOut.writeBoolean(markedForDelete);
+ bufOut.writeLong(markedForDeleteAt);
/* write number of columns */
bufOut.writeInt(columnRange.count());
/* now write the columns */
