svn commit: r821174 - in /incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io: IndexHelper.java SSTableWriter.java

[jbellis]

Author: jbellis
Date: Fri Oct  2 21:28:39 2009
New Revision: 821174

URL: http://svn.apache.org/viewvc?rev=821174&view=rev
Log:
add asserts.  patch by jbellis for CASSANDRA-466

Modified:
    
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/IndexHelper.java
    
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/SSTableWriter.java

Modified: 
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/IndexHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/IndexHelper.java?rev=821174&r1=821173&r2=821174&view=diff
==============================================================================
--- 
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/IndexHelper.java
 (original)
+++ 
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/IndexHelper.java
 Fri Oct  2 21:28:39 2009
@@ -60,7 +60,8 @@
         int size = in.readInt();
         totalBytesRead += 4;
         /* skip the serialized bloom filter */
-        in.skipBytes(size);
+        if (in.skipBytes(size) != size)
+            throw new EOFException();
         totalBytesRead += size;
         return totalBytesRead;
     }
@@ -78,7 +79,8 @@
         int totalBytesRead = 4;
 
         /* skip the column index data */
-        file.skipBytes(columnIndexSize);
+        if (file.skipBytes(columnIndexSize) != columnIndexSize)
+            throw new EOFException();
         totalBytesRead += columnIndexSize;
 
         return totalBytesRead;

Modified: 
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/SSTableWriter.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/SSTableWriter.java?rev=821174&r1=821173&r2=821174&view=diff
==============================================================================
--- 
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/SSTableWriter.java
 (original)
+++ 
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/io/SSTableWriter.java
 Fri Oct  2 21:28:39 2009
@@ -97,6 +97,7 @@
         long currentPosition = beforeAppend(decoratedKey);
         dataFile.writeUTF(decoratedKey);
         int length = buffer.getLength();
+        assert length > 0;
         dataFile.writeInt(length);
         dataFile.write(buffer.getData(), 0, length);
         afterAppend(decoratedKey, currentPosition);
@@ -106,6 +107,7 @@
     {
         long currentPosition = beforeAppend(decoratedKey);
         dataFile.writeUTF(decoratedKey);
+        assert value.length > 0;
         dataFile.writeInt(value.length);
         dataFile.write(value);
         afterAppend(decoratedKey, currentPosition);