You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/12/17 16:26:57 UTC
[1/3] git commit: Simplify TokenMetadata.cachedOnlyTokenMap()
Updated Branches:
refs/heads/trunk c821d8b08 -> f943433ae
Simplify TokenMetadata.cachedOnlyTokenMap()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13348c47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13348c47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13348c47
Branch: refs/heads/trunk
Commit: 13348c47a415bb0887ee722af33384cf18362497
Parents: 829047a
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Dec 17 18:25:31 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Dec 17 18:25:31 2013 +0300
----------------------------------------------------------------------
.../apache/cassandra/locator/TokenMetadata.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13348c47/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 cf0c472..22a9042 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -620,25 +620,15 @@ public class TokenMetadata
if (tm != null)
return tm;
- // synchronize is to prevent thundering herd (CASSANDRA-6345); lock.readLock is for correctness vs updates to our internals
+ // synchronize to prevent thundering herd (CASSANDRA-6345)
synchronized (this)
{
if ((tm = cachedTokenMap.get()) != null)
return tm;
- lock.readLock().lock();
- try
- {
- tm = new TokenMetadata(SortedBiMultiValMap.<Token, InetAddress>create(tokenToEndpointMap, null, inetaddressCmp),
- HashBiMap.create(endpointToHostIdMap),
- new Topology(topology));
- cachedTokenMap.set(tm);
- return tm;
- }
- finally
- {
- lock.readLock().unlock();
- }
+ tm = cloneOnlyTokenMap();
+ cachedTokenMap.set(tm);
+ return tm;
}
}
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22d87444
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22d87444
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22d87444
Branch: refs/heads/trunk
Commit: 22d87444cef2a0fe4f9a01eea313526e69c70521
Parents: 3590275 13348c4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Dec 17 18:26:10 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Dec 17 18:26:10 2013 +0300
----------------------------------------------------------------------
.../apache/cassandra/locator/TokenMetadata.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/22d87444/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f943433a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f943433a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f943433a
Branch: refs/heads/trunk
Commit: f943433ae8f62f2ecb2c21e7be924ded09d669f2
Parents: c821d8b 22d8744
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Dec 17 18:26:46 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Dec 17 18:26:46 2013 +0300
----------------------------------------------------------------------
.../apache/cassandra/locator/TokenMetadata.java | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f943433a/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------