svn commit: r1185675 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/db/ReadResponse.java

[sl...@apache.org]

Author: slebresne
Date: Tue Oct 18 14:10:36 2011
New Revision: 1185675

URL: http://svn.apache.org/viewvc?rev=1185675&view=rev
Log:
Fix computed serialized size by ReadResponseSerializer
patch by slebresne; reviewed by jbellis for CASSANDRA-3373

Modified:
    cassandra/branches/cassandra-1.0/CHANGES.txt
    cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ReadResponse.java

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1185675&r1=1185674&r2=1185675&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Oct 18 14:10:36 2011
@@ -6,7 +6,7 @@
  * (CQL) update grammar to require key clause in DELETE statement
    (CASSANDRA-3349)
  * (CQL) allow numeric keyspace names in USE statement (CASSANDRA-3350)
- * reduce network copies (CASSANDRA-3333)
+ * reduce network copies (CASSANDRA-3333, 3373)
  * (Hadoop) skip empty rows when slicing the entire row (CASSANDRA-2855)
  * Fix handling of tombstone by SSTableExport/Import (CASSANDRA-3357)
  * fix ColumnIndexer to use long offsets (CASSANDRA-3358)

Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ReadResponse.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ReadResponse.java?rev=1185675&r1=1185674&r2=1185675&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ReadResponse.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ReadResponse.java Tue Oct 18 14:10:36 2011
@@ -114,7 +114,6 @@ class ReadResponseSerializer implements 
     public long serializedSize(ReadResponse response, int version)
     {
         int size = DBConstants.intSize;
-        size += (response.isDigestQuery() ? response.digest() : ByteBufferUtil.EMPTY_BYTE_BUFFER).remaining();
         size += DBConstants.boolSize;
         if (response.isDigestQuery())
             size += response.digest().remaining();