cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 15 Aug 2014 18:27:03 GMT
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/ff88f237
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff88f237
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff88f237

Branch: refs/heads/trunk
Commit: ff88f237662e0ad3389373bc4466bf80c10420d1
Parents: fe8829f de5bb58
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Aug 15 13:26:39 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Aug 15 13:26:39 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../config/YamlConfigurationLoader.java         |   7 +-
 .../cassandra/io/sstable/SSTableLoader.java     |  22 ++-
 .../cassandra/streaming/ConnectionHandler.java  |  49 +------
 .../streaming/DefaultConnectionFactory.java     |  75 ++++++++++
 .../streaming/StreamConnectionFactory.java      |  30 ++++
 .../cassandra/streaming/StreamCoordinator.java  |  13 +-
 .../apache/cassandra/streaming/StreamPlan.java  |  17 ++-
 .../cassandra/streaming/StreamResultFuture.java |   2 +-
 .../cassandra/streaming/StreamSession.java      |  13 +-
 .../tools/BulkLoadConnectionFactory.java        |  68 +++++++++
 .../org/apache/cassandra/tools/BulkLoader.java  | 139 +++++++++++++------
 .../streaming/StreamTransferTaskTest.java       |   2 +-
 13 files changed, 337 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff88f237/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff88f237/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff88f237/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff88f237/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
index f9ae82e,4043ac8..5d246f4
--- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
@@@ -57,10 -40,10 +57,10 @@@ public class StreamTransferTaskTes
      @Test
      public void testScheduleTimeout() throws Exception
      {
 -        String ks = "Keyspace1";
 +        String ks = KEYSPACE1;
          String cf = "Standard1";
  
-         StreamSession session = new StreamSession(FBUtilities.getBroadcastAddress(), 0);
+         StreamSession session = new StreamSession(FBUtilities.getBroadcastAddress(), null,
0);
          ColumnFamilyStore cfs = Keyspace.open(ks).getColumnFamilyStore(cf);
  
          // create two sstables


Mime
View raw message