cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [07/10] Merge branch 'cassandra-2.0' into cassandra-2.1
Date Mon, 20 Oct 2014 15:46:01 GMT
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cca24f4/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/streaming/SessionInfoTest.java
index f015a01,c8b6254..80ef29d
--- a/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java
+++ b/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java
@@@ -46,7 -46,7 +46,7 @@@ public class SessionInfoTes
          }
  
          StreamSummary sending = new StreamSummary(cfId, 10, 100);
-         SessionInfo info = new SessionInfo(local, 0, summaries, Collections.singleton(sending),
StreamSession.State.PREPARING);
 -        SessionInfo info = new SessionInfo(local, local, summaries, Collections.singleton(sending),
StreamSession.State.PREPARING);
++        SessionInfo info = new SessionInfo(local, 0, local, summaries, Collections.singleton(sending),
StreamSession.State.PREPARING);
  
          assert info.getTotalFilesToReceive() == 45;
          assert info.getTotalFilesToSend() == 10;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cca24f4/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
index 4043ac8,b51f75b..3e73b24
--- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
+++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
@@@ -43,7 -44,8 +44,8 @@@ public class StreamTransferTaskTest ext
          String ks = "Keyspace1";
          String cf = "Standard1";
  
-         StreamSession session = new StreamSession(FBUtilities.getBroadcastAddress(), null,
0);
+         InetAddress peer = FBUtilities.getBroadcastAddress();
 -        StreamSession session = new StreamSession(peer, peer, null);
++        StreamSession session = new StreamSession(peer, peer, null, 0);
          ColumnFamilyStore cfs = Keyspace.open(ks).getColumnFamilyStore(cf);
  
          // create two sstables

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cca24f4/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
----------------------------------------------------------------------


Mime
View raw message