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/12/06 16:52:23 UTC
[06/16] git commit: add describe_local_ring for Hadoop's benefit patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-6268
add describe_local_ring for Hadoop's benefit
patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-6268
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86e949f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86e949f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86e949f3
Branch: refs/heads/cassandra-2.0
Commit: 86e949f321cb1ce3b0bc0c9ed387218cc8a2b7b9
Parents: 57613dc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 5 20:49:19 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 5 20:49:19 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
interface/cassandra.thrift | 7 +-
.../org/apache/cassandra/thrift/Cassandra.java | 2336 ++++++++++++------
.../org/apache/cassandra/thrift/CfDef.java | 88 +-
.../org/apache/cassandra/thrift/Constants.java | 2 +-
.../hadoop/AbstractColumnFamilyInputFormat.java | 10 +-
.../cassandra/service/StorageService.java | 69 +-
.../cassandra/thrift/CassandraServer.java | 13 +
8 files changed, 1720 insertions(+), 806 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86e949f3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 166c566..3b1f2f6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
* Warn when collection read has > 65K elements (CASSANDRA-5428)
* Fix cache persistence when both row and key cache are enabled
(CASSANDRA-6413)
+ * (Hadoop) add describe_local_ring (CASSANDRA-6268)
1.2.12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86e949f3/interface/cassandra.thrift
----------------------------------------------------------------------
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index c64b2d7..1fc7201 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -55,7 +55,7 @@ namespace rb CassandraThrift
# An effort should be made not to break forward-client-compatibility either
# (e.g. one should avoid removing obsolete fields from the IDL), but no
# guarantees in this respect are made by the Cassandra project.
-const string VERSION = "19.36.1"
+const string VERSION = "19.36.2"
#
@@ -718,6 +718,11 @@ service Cassandra {
list<TokenRange> describe_ring(1:required string keyspace)
throws (1:InvalidRequestException ire),
+
+ /** same as describe_ring, but considers only nodes in the local DC */
+ list<TokenRange> describe_local_ring(1:required string keyspace)
+ throws (1:InvalidRequestException ire),
+
/** get the mapping between token->node ip
without taking replication into consideration
https://issues.apache.org/jira/browse/CASSANDRA-4092 */