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 44133E845 for ; Tue, 25 Jun 2013 01:00:49 +0000 (UTC) Received: (qmail 93599 invoked by uid 500); 25 Jun 2013 01:00:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 93539 invoked by uid 500); 25 Jun 2013 01:00:48 -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 93485 invoked by uid 99); 25 Jun 2013 01:00:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 01:00:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7959E82F794; Tue, 25 Jun 2013 01:00:48 +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: Tue, 25 Jun 2013 01:00:48 -0000 Message-Id: <56285bd84dca490eaa44036e81eea87e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B1/3=5D_git_commit=3A_allow_sstable2json_on_2i_CFs_pat?= =?utf-8?q?ch_by_Micha=C5=82_Michalski=3B_reviewed_by_jbellis_for_CASSANDRA-?= =?utf-8?q?5694?= Updated Branches: refs/heads/cassandra-1.2 57eb87b57 -> 07c627aae refs/heads/trunk ab6232aea -> a684ee095 allow sstable2json on 2i CFs patch by Michał Michalski; reviewed by jbellis for CASSANDRA-5694 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07c627aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07c627aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07c627aa Branch: refs/heads/cassandra-1.2 Commit: 07c627aaed6d381aee79e2e7e388fd115e3cd410 Parents: 57eb87b Author: Jonathan Ellis Authored: Mon Jun 24 18:00:27 2013 -0700 Committer: Jonathan Ellis Committed: Mon Jun 24 18:00:27 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/tools/SSTableExport.java | 27 ++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07c627aa/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 78c630f..be0c1d0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 1.2.7 * Fix ReadResponseSerializer.serializedSize() for digest reads (CASSANDRA-5476) + * allow sstable2json on 2i CFs (CASSANDRA-5694) 1.2.6 http://git-wip-us.apache.org/repos/asf/cassandra/blob/07c627aa/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java index 1d898ef..c407ca1 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@ -503,9 +503,32 @@ public class SSTableExport DatabaseDescriptor.loadSchemas(); Descriptor descriptor = Descriptor.fromFilename(ssTableFileName); - if (Schema.instance.getCFMetaData(descriptor) == null) + + // Start by validating keyspace name + if (Schema.instance.getKSMetaData(descriptor.ksname) == null) + { + System.err.println(String.format("Filename %s references to nonexistent keyspace: %s!", + ssTableFileName, descriptor.ksname)); + System.exit(1); + } + Table table = Table.open(descriptor.ksname); + + // Make it work for indexes too - find parent cf if necessary + String baseName = descriptor.cfname; + if (descriptor.cfname.contains(".")) + { + String[] parts = descriptor.cfname.split("\\.", 2); + baseName = parts[0]; + } + + // IllegalArgumentException will be thrown here if ks/cf pair does not exist + try + { + table.getColumnFamilyStore(baseName); + } + catch (IllegalArgumentException e) { - System.err.println(String.format("The provided column family is not part of this cassandra database: keyspace = %s, column family = %s", + System.err.println(String.format("The provided column family is not part of this cassandra keyspace: keyspace = %s, column family = %s", descriptor.ksname, descriptor.cfname)); System.exit(1); }