You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/06/22 15:55:05 UTC
git commit: Fix ReadResponseSerializer.serializedSize() for digest
reads
Updated Branches:
refs/heads/cassandra-1.2 043a63c63 -> 57eb87b57
Fix ReadResponseSerializer.serializedSize() for digest reads
patch by Sergio Bossa; reviewed by Aleksey Yeschenko for
CASSANDRA-5476
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57eb87b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57eb87b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57eb87b5
Branch: refs/heads/cassandra-1.2
Commit: 57eb87b57cc7c69d99238ced08e50cc23b0127ba
Parents: 043a63c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Jun 22 16:54:21 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Jun 22 16:54:21 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/ReadResponse.java | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57eb87b5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 593bf7c..78c630f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.7
+ * Fix ReadResponseSerializer.serializedSize() for digest reads (CASSANDRA-5476)
+
+
1.2.6
* Fix tracing when operation completes before all responses arrive (CASSANDRA-5668)
* Fix cross-DC mutation forwarding (CASSANDRA-5632)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57eb87b5/src/java/org/apache/cassandra/db/ReadResponse.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java b/src/java/org/apache/cassandra/db/ReadResponse.java
index 1f21006..af86f10 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -105,6 +105,7 @@ class ReadResponseSerializer implements IVersionedSerializer<ReadResponse>
TypeSizes typeSizes = TypeSizes.NATIVE;
ByteBuffer buffer = response.isDigestQuery() ? response.digest() : ByteBufferUtil.EMPTY_BYTE_BUFFER;
int size = typeSizes.sizeof(buffer.remaining());
+ size += buffer.remaining();
size += typeSizes.sizeof(response.isDigestQuery());
if (!response.isDigestQuery())
size += Row.serializer.serializedSize(response.row(), version);