You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/06/28 08:28:15 UTC
[20/21] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b60fb77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b60fb77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b60fb77
Branch: refs/heads/cassandra-3.9
Commit: 8b60fb779c32365d1aab4f5ef27403a8ab00cded
Parents: 7d4a71f cb4540e
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Jun 28 10:21:15 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Jun 28 10:23:09 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 5 +++
.../net/IncomingStreamingConnection.java | 7 ++--
.../apache/cassandra/net/MessagingService.java | 12 +++++-
.../cassandra/streaming/ConnectionHandler.java | 39 +++++++++++++++-----
.../cassandra/streaming/StreamResultFuture.java | 11 +++---
.../streaming/StreamingTransferTest.java | 25 ++++++++++++-
6 files changed, 77 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b60fb77/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 12a6ddb,314a93e..cd13896
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,32 @@@
-3.0.8
- * Fix potential race in schema during new table creation (CASSANDRA-12083)
++3.9
++Merged from 2.1:
++ * Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
++
++
+3.8
+ * Improve details in compaction log message (CASSANDRA-12080)
+ * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
+ * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993)
+ * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579)
+ * Move skip_stop_words filter before stemming (CASSANDRA-12078)
+ * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
+ * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
+ * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966)
+ * Add cross-DC latency metrics (CASSANDRA-11596)
+ * Allow terms in selection clause (CASSANDRA-10783)
+ * Add bind variables to trace (CASSANDRA-11719)
+ * Switch counter shards' clock to timestamps (CASSANDRA-9811)
+ * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
+ * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
+ * Support older ant versions (CASSANDRA-11807)
+ * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
+ * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
+ * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
+ * Faster streaming (CASSANDRA-9766)
+ * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
+ * Add repaired percentage metric (CASSANDRA-11503)
+ * Add Change-Data-Capture (CASSANDRA-8844)
+Merged from 3.0:
* cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070)
* Disable autocompaction during drain (CASSANDRA-11878)
* Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b60fb77/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b60fb77/src/java/org/apache/cassandra/streaming/ConnectionHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b60fb77/src/java/org/apache/cassandra/streaming/StreamResultFuture.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamResultFuture.java
index ab297ed,b299b87..71ca9b1
--- a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java
+++ b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java
@@@ -28,7 -27,7 +28,8 @@@ import com.google.common.util.concurren
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import org.apache.cassandra.net.IncomingStreamingConnection;
+import org.apache.cassandra.utils.FBUtilities;
/**
* A future on the result ({@link StreamState}) of a streaming plan.