Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05253cc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05253cc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05253cc2 Branch: refs/heads/cassandra-2.2 Commit: 05253cc28d572f13287e66e5200306058cac1d14 Parents: 30be921 b3177f1 Author: Tyler Hobbs <tylerho...@apache.org> Authored: Thu Jun 4 10:20:09 2015 -0500 Committer: Tyler Hobbs <tylerho...@apache.org> Committed: Thu Jun 4 10:20:09 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/transport/Frame.java | 4 ++- .../transport/messages/ErrorMessage.java | 13 +++++++-- .../cassandra/transport/ProtocolErrorTest.java | 30 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05253cc2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 43a6cc5,eea1640..0ff9363 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,6 +1,26 @@@ -2.1.6 +2.2 + * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400) + * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546) + * Empty INITCOND treated as null in aggregate (CASSANDRA-9457) + * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609) + * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493) + * Clean up gossiper logic for old versions (CASSANDRA-9370) + * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) + * ant test-all results incomplete when parsed (CASSANDRA-9463) + * Disallow frozen<> types in function arguments and return types for + clarity (CASSANDRA-9411) + * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431) + * Update commitlog archiving examples now that commitlog segments are + not recycled (CASSANDRA-9350) + * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568) + * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399) + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429) + * Add ability to stop compaction by ID (CASSANDRA-7207) + * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438) +Merged from 2.1: + * Use ProtocolError code instead of ServerError code for native protocol + error responses to unsupported protocol versions (CASSANDRA-9451) * Default commitlog_sync_batch_window_in_ms changed to 2ms (CASSANDRA-9504) * Fix empty partition assertion in unsorted sstable writing tools (CASSANDRA-9071) * Ensure truncate without snapshot cannot produce corrupt responses (CASSANDRA-9388) http://git-wip-us.apache.org/repos/asf/cassandra/blob/05253cc2/src/java/org/apache/cassandra/transport/Frame.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/transport/Frame.java index 0c038ea,f5c3834..14fe589 --- a/src/java/org/apache/cassandra/transport/Frame.java +++ b/src/java/org/apache/cassandra/transport/Frame.java @@@ -180,11 -180,10 +182,11 @@@ public class Fram int firstByte = buffer.getByte(idx++); Message.Direction direction = Message.Direction.extractFromVersion(firstByte); - int version = firstByte & 0x7F; + int version = firstByte & PROTOCOL_VERSION_MASK; if (version > Server.CURRENT_VERSION) - throw new ProtocolException("Invalid or unsupported protocol version: " + version); + throw new ProtocolException(String.format("Invalid or unsupported protocol version (%d); highest supported is %d ", + version, Server.CURRENT_VERSION)); // Wait until we have the complete V3+ header if (version >= Server.VERSION_3 && buffer.readableBytes() < Header.MODERN_LENGTH) http://git-wip-us.apache.org/repos/asf/cassandra/blob/05253cc2/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java ----------------------------------------------------------------------