Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8D563200B68 for ; Thu, 4 Aug 2016 16:18:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8BEDF160A6A; Thu, 4 Aug 2016 14:18:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E4782160AAE for ; Thu, 4 Aug 2016 16:18:43 +0200 (CEST) Received: (qmail 87942 invoked by uid 500); 4 Aug 2016 14:18:42 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 87533 invoked by uid 99); 4 Aug 2016 14:18:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Aug 2016 14:18:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7912FEEE1C; Thu, 4 Aug 2016 14:18:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Thu, 04 Aug 2016 14:18:49 -0000 Message-Id: <56c88d8a08dc4d6f99bba13e5e944bad@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] cassandra git commit: Merge branch 'cassandra-3.9' into trunk archived-at: Thu, 04 Aug 2016 14:18:44 -0000 Merge branch 'cassandra-3.9' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90ba50f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90ba50f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90ba50f6 Branch: refs/heads/trunk Commit: 90ba50f6a5592508116800f018bae3c14febe5d3 Parents: 54836ec 2e0ace7 Author: Yuki Morishita Authored: Thu Aug 4 09:18:18 2016 -0500 Committer: Yuki Morishita Committed: Thu Aug 4 09:18:18 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/StreamSession.java | 3 +- .../cassandra/streaming/StreamTransferTask.java | 4 +- .../streaming/messages/FileMessageHeader.java | 20 +++-- .../streaming/messages/OutgoingFileMessage.java | 38 ++++++++- .../streaming/StreamTransferTaskTest.java | 85 ++++++++++++++++++-- 6 files changed, 136 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90ba50f6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90ba50f6/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90ba50f6/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java index dc2eb8f,71f40ee..bfee782 --- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java +++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java @@@ -21,6 -21,9 +21,8 @@@ import java.io.IOException import java.nio.channels.ReadableByteChannel; import java.util.List; + import com.google.common.annotations.VisibleForTesting; + -import org.apache.cassandra.io.compress.CompressionMetadata; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.DataOutputStreamPlus; import org.apache.cassandra.streaming.StreamSession;