natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Yuki Morishita 2014-05-09 10:41:36 -05:00
parent 361ad681ec 7484bd4191
commit 7f3d07ac02
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/apache/cassandra/streaming/StreamSession.java
View File

@ -20,11 +20,9 @@ package org.apache.cassandra.streaming;
import java.io.IOException;
import java.net.InetAddress;
import java.util.*;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.*;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -119,11 +117,11 @@ public class StreamSession implements IEndpointStateChangeSubscriber, IFailureDe
private StreamResultFuture streamResult;
// stream requests to send to the peer
private final List<StreamRequest> requests = new ArrayList<>();
private final Set<StreamRequest> requests = Sets.newConcurrentHashSet();
// streaming tasks are created and managed per ColumnFamily ID
private final Map<UUID, StreamTransferTask> transfers = new HashMap<>();
private final Map<UUID, StreamTransferTask> transfers = new ConcurrentHashMap<>();
// data receivers, filled after receiving prepare message
private final Map<UUID, StreamReceiveTask> receivers = new HashMap<>();
private final Map<UUID, StreamReceiveTask> receivers = new ConcurrentHashMap<>();
private final StreamingMetrics metrics;
public final ConnectionHandler handler;