svn commit: r939059 - in /cassandra/trunk/src/java/org/apache/cassandra/db/commitlog: CommitLog.java CommitLogSegment.java

[jbellis]

Author: jbellis
Date: Wed Apr 28 19:25:43 2010
New Revision: 939059

URL: http://svn.apache.org/viewvc?rev=939059&view=rev
Log:
write mutation length in commitlog as int, not long
patch by jbellis; reviewed by gdusbabek for CASSANRA-1032

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
    
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=939059&r1=939058&r2=939059&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLog.java 
Wed Apr 28 19:25:43 2010
@@ -203,7 +203,7 @@ public class CommitLog
                 byte[] bytes;
                 try
                 {
-                    bytes = new byte[(int) reader.readLong()]; // readlong can 
throw EOFException too
+                    bytes = new byte[reader.readInt()]; // readInt can throw 
EOFException too
                     reader.readFully(bytes);
                     claimedCRC32 = reader.readLong();
                 }

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java?rev=939059&r1=939058&r2=939059&view=diff
==============================================================================
--- 
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
 (original)
+++ 
cassandra/trunk/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
 Wed Apr 28 19:25:43 2010
@@ -132,7 +132,7 @@ public class CommitLogSegment
             if (serializedRow instanceof DataOutputBuffer)
             {
                 DataOutputBuffer buffer = (DataOutputBuffer) serializedRow;
-                logWriter.writeLong(buffer.getLength());
+                logWriter.writeInt(buffer.getLength());
                 logWriter.write(buffer.getData(), 0, buffer.getLength());
                 checkum.update(buffer.getData(), 0, buffer.getLength());
             }
@@ -140,7 +140,7 @@ public class CommitLogSegment
             {
                 assert serializedRow instanceof byte[];
                 byte[] bytes = (byte[]) serializedRow;
-                logWriter.writeLong(bytes.length);
+                logWriter.writeInt(bytes.length);
                 logWriter.write(bytes);
                 checkum.update(bytes, 0, bytes.length);
             }