You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/05/09 17:41:57 UTC
[1/6] git commit: Make StreamSession more thread safe
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 d48c797f7 -> 7484bd419
refs/heads/cassandra-2.1 361ad681e -> 7f3d07ac0
refs/heads/trunk 17afc08d6 -> ac1a9cd63
Make StreamSession more thread safe
patch by sankalp kohli; reviewed by yukim for CASSANDRA-7092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7484bd41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7484bd41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7484bd41
Branch: refs/heads/cassandra-2.0
Commit: 7484bd41918cc042642753f1ad1eaf468c6fc3af
Parents: d48c797
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 9 10:40:50 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 9 10:40:50 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamSession.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7484bd41/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 0ba41fb..30e3fa2 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -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;
@@ -123,11 +121,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;
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f3d07ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f3d07ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f3d07ac
Branch: refs/heads/cassandra-2.1
Commit: 7f3d07ac02178c3d3012557f4df18fe116e5ec11
Parents: 361ad68 7484bd4
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 9 10:41:36 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 9 10:41:36 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamSession.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f3d07ac/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
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/ac1a9cd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac1a9cd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac1a9cd6
Branch: refs/heads/trunk
Commit: ac1a9cd63ab06289b1bd7d8cce706a51991eef0c
Parents: 17afc08 7f3d07a
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 9 10:41:45 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 9 10:41:45 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamSession.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f3d07ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f3d07ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f3d07ac
Branch: refs/heads/trunk
Commit: 7f3d07ac02178c3d3012557f4df18fe116e5ec11
Parents: 361ad68 7484bd4
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 9 10:41:36 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 9 10:41:36 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamSession.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f3d07ac/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
[3/6] git commit: Make StreamSession more thread safe
Posted by yu...@apache.org.
Make StreamSession more thread safe
patch by sankalp kohli; reviewed by yukim for CASSANDRA-7092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7484bd41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7484bd41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7484bd41
Branch: refs/heads/trunk
Commit: 7484bd41918cc042642753f1ad1eaf468c6fc3af
Parents: d48c797
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 9 10:40:50 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 9 10:40:50 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamSession.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7484bd41/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 0ba41fb..30e3fa2 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -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;
@@ -123,11 +121,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;
[2/6] git commit: Make StreamSession more thread safe
Posted by yu...@apache.org.
Make StreamSession more thread safe
patch by sankalp kohli; reviewed by yukim for CASSANDRA-7092
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7484bd41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7484bd41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7484bd41
Branch: refs/heads/cassandra-2.1
Commit: 7484bd41918cc042642753f1ad1eaf468c6fc3af
Parents: d48c797
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 9 10:40:50 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 9 10:40:50 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/streaming/StreamSession.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7484bd41/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 0ba41fb..30e3fa2 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -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;
@@ -123,11 +121,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;