Updated Branches: refs/heads/cassandra-2.0 546cbf5ff -> 70239e17b refs/heads/trunk 7dd9ea2e8 -> dca300d6c
change progressindicator members to CHM patch by jbellis for CASSANDRA-6129 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70239e17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70239e17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70239e17 Branch: refs/heads/cassandra-2.0 Commit: 70239e17b55b9e13b7f356683d78887f0c9a83c4 Parents: 546cbf5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 2 12:42:06 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 2 12:42:10 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/BulkLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70239e17/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index 8c732bc..cd3c7e1 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -21,6 +21,7 @@ import java.io.File; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import org.apache.commons.cli.*; @@ -84,8 +85,8 @@ public class BulkLoader // Return true when everything is at 100% static class ProgressIndicator implements StreamEventHandler { - private final Map<InetAddress, SessionInfo> sessionsByHost = new HashMap<>(); - private final Map<InetAddress, Set<ProgressInfo>> progressByHost = new HashMap<>(); + private final Map<InetAddress, SessionInfo> sessionsByHost = new ConcurrentHashMap<>(); + private final Map<InetAddress, Set<ProgressInfo>> progressByHost = new ConcurrentHashMap<>(); private long start; private long lastProgress;
