cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix broken native protocol serialization methods
Date Wed, 04 Sep 2013 12:55:04 GMT
Updated Branches:
  refs/heads/cassandra-2.0 d1595b217 -> 06dc4d0fd


Fix broken native protocol serialization methods


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06dc4d0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06dc4d0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06dc4d0f

Branch: refs/heads/cassandra-2.0
Commit: 06dc4d0fd278ce0b4b8f86eaca1ff45269c0da17
Parents: d1595b2
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Sep 4 14:54:40 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Sep 4 14:54:57 2013 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/QueryOptions.java               | 2 ++
 .../org/apache/cassandra/transport/messages/RegisterMessage.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06dc4d0f/src/java/org/apache/cassandra/cql3/QueryOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java
index 52062a6..c8c6b8e 100644
--- a/src/java/org/apache/cassandra/cql3/QueryOptions.java
+++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java
@@ -231,6 +231,8 @@ public class QueryOptions
                 flags.add(Flag.SKIP_METADATA);
             if (options.getPageSize() >= 0)
                 flags.add(Flag.PAGE_SIZE);
+            if (options.getPagingState() != null)
+                flags.add(Flag.PAGING_STATE);
             if (options.getSerialConsistency() != ConsistencyLevel.SERIAL)
                 flags.add(Flag.SERIAL_CONSISTENCY);
             return flags;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06dc4d0f/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java
index a091800..fc6ade7 100644
--- a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java
@@ -50,7 +50,7 @@ public class RegisterMessage extends Message.Request
         {
             int size = 2;
             for (Event.Type type : msg.eventTypes)
-                CBUtil.sizeOfEnumValue(type);
+                size += CBUtil.sizeOfEnumValue(type);
             return size;
         }
     };


Mime
View raw message