Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D01710428 for ; Fri, 6 Dec 2013 15:52:32 +0000 (UTC) Received: (qmail 55140 invoked by uid 500); 6 Dec 2013 15:52:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55086 invoked by uid 500); 6 Dec 2013 15:52:22 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 54848 invoked by uid 99); 6 Dec 2013 15:52:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Dec 2013 15:52:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8062789CA80; Fri, 6 Dec 2013 15:52:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Fri, 06 Dec 2013 15:52:23 -0000 Message-Id: In-Reply-To: <49b2c9d65acf4eb99c72c4db7b902c96@git.apache.org> References: <49b2c9d65acf4eb99c72c4db7b902c96@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B06/16=5D_git_commit=3A_add_describe=5Flocal=5Fring_fo?= =?utf-8?q?r_Hadoop=27s_benefit_patch_by_Piotr_Ko=C5=82aczkowski=3B_reviewed?= =?utf-8?q?_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 Authored: Thu Dec 5 20:49:19 2013 -0600 Committer: Jonathan Ellis 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 describe_ring(1:required string keyspace) throws (1:InvalidRequestException ire), + + /** same as describe_ring, but considers only nodes in the local DC */ + list 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 */