You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/06/19 20:56:10 UTC
[1/2] git commit: make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Updated Branches:
refs/heads/cassandra-1.2 42be16fc8 -> 5b525c1fc
refs/heads/trunk 1daa8e4fd -> 86081fa78
make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b525c1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b525c1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b525c1f
Branch: refs/heads/cassandra-1.2
Commit: 5b525c1fc3cca4ae8884593b83c89546d317cd49
Parents: 42be16f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 19 13:55:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 19 13:56:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b525c1f/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 925a811..1f6682b 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -85,7 +85,7 @@ public class TokenMetadata
private final Set<Pair<Token, InetAddress>> movingEndpoints = new HashSet<Pair<Token, InetAddress>>();
// tokens which are migrating to new endpoints
- private final Map<Token, InetAddress> relocatingTokens = new HashMap<Token, InetAddress>();
+ private final ConcurrentMap<Token, InetAddress> relocatingTokens = new ConcurrentHashMap<Token, InetAddress>();
/* Use this lock for manipulating the token map */
private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
[2/2] git commit: make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Posted by jb...@apache.org.
make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86081fa7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86081fa7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86081fa7
Branch: refs/heads/trunk
Commit: 86081fa78ce2e3346db77fb55df93c550cf3f57a
Parents: 1daa8e4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 19 13:55:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 19 13:56:07 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86081fa7/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 925a811..1f6682b 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -85,7 +85,7 @@ public class TokenMetadata
private final Set<Pair<Token, InetAddress>> movingEndpoints = new HashSet<Pair<Token, InetAddress>>();
// tokens which are migrating to new endpoints
- private final Map<Token, InetAddress> relocatingTokens = new HashMap<Token, InetAddress>();
+ private final ConcurrentMap<Token, InetAddress> relocatingTokens = new ConcurrentHashMap<Token, InetAddress>();
/* Use this lock for manipulating the token map */
private final ReadWriteLock lock = new ReentrantReadWriteLock(true);