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 17:24:23 UTC
[1/3] git commit: we can actually give a ring for system tables that
are not LocalStrategy
Updated Branches:
refs/heads/cassandra-1.2 b1d7405fd -> 7861f1731
refs/heads/trunk 5556414c3 -> cfc163df0
we can actually give a ring for system tables that are not LocalStrategy
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7861f173
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7861f173
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7861f173
Branch: refs/heads/cassandra-1.2
Commit: 7861f1731feb18f8bd0e87963e53c89a2dac45ed
Parents: b1d7405
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 19 00:40:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 19 00:40:20 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7861f173/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 49db272..e73aa2e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1080,7 +1080,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public List<TokenRange> describeRing(String keyspace) throws InvalidRequestException
{
- if (keyspace == null || !Schema.instance.getNonSystemTables().contains(keyspace))
+ if (keyspace == null || Table.open(keyspace).getReplicationStrategy() instanceof LocalStrategy)
throw new InvalidRequestException("There is no ring for the keyspace: " + keyspace);
List<TokenRange> ranges = new ArrayList<TokenRange>();
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfc163df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfc163df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfc163df
Branch: refs/heads/trunk
Commit: cfc163df0296ae179285281ad9d6ed46ee185b85
Parents: 5556414 7861f17
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 19 10:24:19 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 19 10:24:19 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfc163df/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/3] git commit: we can actually give a ring for system tables that
are not LocalStrategy
Posted by jb...@apache.org.
we can actually give a ring for system tables that are not LocalStrategy
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7861f173
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7861f173
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7861f173
Branch: refs/heads/trunk
Commit: 7861f1731feb18f8bd0e87963e53c89a2dac45ed
Parents: b1d7405
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 19 00:40:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 19 00:40:20 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7861f173/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 49db272..e73aa2e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1080,7 +1080,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public List<TokenRange> describeRing(String keyspace) throws InvalidRequestException
{
- if (keyspace == null || !Schema.instance.getNonSystemTables().contains(keyspace))
+ if (keyspace == null || Table.open(keyspace).getReplicationStrategy() instanceof LocalStrategy)
throw new InvalidRequestException("There is no ring for the keyspace: " + keyspace);
List<TokenRange> ranges = new ArrayList<TokenRange>();