You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2016/04/04 14:14:21 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f52f299c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f52f299c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f52f299c
Branch: refs/heads/trunk
Commit: f52f299cdf4cf5d2fea6253a41561d439cebcb3e
Parents: 736a0ce a33038b
Author: Robert Stupp <sn...@snazy.de>
Authored: Mon Apr 4 14:10:25 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Mon Apr 4 14:10:25 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
.../apache/cassandra/net/IncomingStreamingConnection.java | 9 ++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f52f299c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8305852,b6438b8..d03705a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,25 @@@
-2.2.6
++3.0.6
++Merged from 2.2:
+ * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
++
++
+3.0.5
+ * Fix rare NPE on schema upgrade from 2.x to 3.x (CASSANDRA-10943)
+ * Improve backoff policy for cqlsh COPY FROM (CASSANDRA-11320)
+ * Improve IF NOT EXISTS check in CREATE INDEX (CASSANDRA-11131)
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
* DatabaseDescriptor should log stacktrace in case of Eception during seed provider creation (CASSANDRA-11312)
* Use canonical path for directory in SSTable descriptor (CASSANDRA-10587)
* Add cassandra-stress keystore option (CASSANDRA-9325)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f52f299c/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
index 19e0671,79a814d..82ce18e
--- a/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingStreamingConnection.java
@@@ -57,11 -56,12 +57,12 @@@ public class IncomingStreamingConnectio
{
try
{
- // streaming connections are per-session and have a fixed version. we can't do anything with a wrong-version stream connection, so drop it.
+ // streaming connections are per-session and have a fixed version.
+ // we can't do anything with a wrong-version stream connection, so drop it.
if (version != StreamMessage.CURRENT_VERSION)
- throw new IOException(String.format("Received stream using protocol version %d (my version %d). Terminating connection", version, MessagingService.current_version));
+ throw new IOException(String.format("Received stream using protocol version %d (my version %d). Terminating connection", version, StreamMessage.CURRENT_VERSION));
- DataInput input = new DataInputStream(socket.getInputStream());
+ DataInputPlus input = new DataInputStreamPlus(socket.getInputStream());
StreamInitMessage init = StreamInitMessage.serializer.deserialize(input, version);
//Set SO_TIMEOUT on follower side