Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ed57bf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ed57bf5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ed57bf5 Branch: refs/heads/trunk Commit: 0ed57bf5317ad259f39f4d3ff97a651d5c18d7cc Parents: f0def34 44fa2cd Author: Yuki Morishita <yu...@apache.org> Authored: Thu May 1 17:51:54 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu May 1 17:51:54 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableLoader.java | 9 +- .../net/IncomingStreamingConnection.java | 2 +- .../cassandra/repair/StreamingRepairTask.java | 2 +- .../cassandra/streaming/ConnectionHandler.java | 7 +- .../cassandra/streaming/ProgressInfo.java | 10 +- .../apache/cassandra/streaming/SessionInfo.java | 3 + .../cassandra/streaming/StreamCoordinator.java | 272 +++++++++++++++++++ .../apache/cassandra/streaming/StreamEvent.java | 2 + .../apache/cassandra/streaming/StreamPlan.java | 34 +-- .../cassandra/streaming/StreamResultFuture.java | 80 +++--- .../cassandra/streaming/StreamSession.java | 42 ++- .../management/ProgressInfoCompositeData.java | 21 +- .../management/SessionInfoCompositeData.java | 1 + .../streaming/messages/StreamInitMessage.java | 9 +- .../streaming/messages/StreamMessage.java | 2 +- .../org/apache/cassandra/tools/BulkLoader.java | 169 ++++++++---- .../cassandra/streaming/SessionInfoTest.java | 6 +- .../streaming/StreamTransferTaskTest.java | 2 +- 19 files changed, 500 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ed57bf5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0c32f3c,86940ea..5ec4c89 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +3.0 + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + 2.1.0-rc1 + * Parallel streaming for sstableloader (CASSANDRA-3668) Merged from 2.0: * Add Google Compute Engine snitch (CASSANDRA-7132)
