You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/17 13:54:55 UTC
[1/2] git commit: Fix prepared statement for protocol v2
Updated Branches:
refs/heads/trunk 7906851f0 -> 0cba309cd
Fix prepared statement for protocol v2
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6035
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36f21781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36f21781
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36f21781
Branch: refs/heads/trunk
Commit: 36f21781965b1cc947ac7488d5e3cddd58090729
Parents: ef7abac
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 17 13:52:55 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 17 13:52:55 2013 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/transport/messages/ResultMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36f21781/src/java/org/apache/cassandra/transport/messages/ResultMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java
index 8650c13..3d41793 100644
--- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java
@@ -271,7 +271,7 @@ public abstract class ResultMessage extends Message.Response
size += CBUtil.sizeOfBytes(prepared.statementId.bytes);
size += ResultSet.Metadata.codec.encodedSize(prepared.metadata, version);
if (version > 1)
- ResultSet.Metadata.codec.encodedSize(prepared.resultMetadata, version);
+ size += ResultSet.Metadata.codec.encodedSize(prepared.resultMetadata, version);
return size;
}
};
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cba309c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cba309c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cba309c
Branch: refs/heads/trunk
Commit: 0cba309cd52c5844189cc6b0e1de770b27953d57
Parents: 7906851 36f2178
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 17 13:54:42 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 17 13:54:42 2013 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/transport/messages/ResultMessage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------