Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 fe8e21109 -> 0a438d59e refs/heads/trunk 1f533260a -> 7da45312a
V5 protocol flags decoding broken patch by Robert Stupp; reviewed by Stefania for CASSANDRA-13443 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a438d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a438d59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a438d59 Branch: refs/heads/cassandra-3.11 Commit: 0a438d59e65ee79bca7ffc44b8b958e62448e5c3 Parents: fe8e211 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Apr 13 11:06:29 2017 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Apr 13 11:06:29 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryOptions.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a438d59/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7998e10..5516bbd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.0 + * V5 protocol flags decoding broken (CASSANDRA-13443) * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422) * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329) * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a438d59/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 1ba8f89..f1787a7 100644 --- a/src/java/org/apache/cassandra/cql3/QueryOptions.java +++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java @@ -403,7 +403,7 @@ public abstract class QueryOptions ConsistencyLevel consistency = CBUtil.readConsistencyLevel(body); EnumSet<Flag> flags = Flag.deserialize(version.isGreaterOrEqualTo(ProtocolVersion.V5) ? (int)body.readUnsignedInt() - : (int)body.readByte()); + : (int)body.readUnsignedByte()); List<ByteBuffer> values = Collections.<ByteBuffer>emptyList(); List<String> names = null;
