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 <yu...@apache.org> Authored: Thu Aug 4 09:18:18 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> 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;
