Repository: cassandra Updated Branches: refs/heads/trunk a053d9e06 -> a59294bcf
use 'table' naming in tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a59294bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a59294bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a59294bc Branch: refs/heads/trunk Commit: a59294bcf5d672575a08daebc093b83a8ea5ae68 Parents: a053d9e Author: Dave Brosius <[email protected]> Authored: Wed Apr 15 14:55:42 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed Apr 15 14:55:42 2015 -0400 ---------------------------------------------------------------------- .../cassandra/tools/nodetool/GetEndpoints.java | 6 +++--- .../apache/cassandra/tools/nodetool/Snapshot.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a59294bc/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java index 1da5108..49d2148 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java @@ -37,12 +37,12 @@ public class GetEndpoints extends NodeToolCmd @Override public void execute(NodeProbe probe) { - checkArgument(args.size() == 3, "getendpoints requires ks, cf and key args"); + checkArgument(args.size() == 3, "getendpoints requires keyspace, table and partition key arguments"); String ks = args.get(0); - String cf = args.get(1); + String table = args.get(1); String key = args.get(2); - List<InetAddress> endpoints = probe.getEndpoints(ks, cf, key); + List<InetAddress> endpoints = probe.getEndpoints(ks, table, key); for (InetAddress endpoint : endpoints) { System.out.println(endpoint.getHostAddress()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/a59294bc/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java index 14c14ad..2318620 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Snapshot.java @@ -37,13 +37,13 @@ public class Snapshot extends NodeToolCmd private List<String> keyspaces = new ArrayList<>(); @Option(title = "table", name = {"-cf", "--column-family", "--table"}, description = "The table name (you must specify one and only one keyspace for using this option)") - private String columnFamily = null; + private String table = null; @Option(title = "tag", name = {"-t", "--tag"}, description = "The name of the snapshot") private String snapshotName = Long.toString(System.currentTimeMillis()); - @Option(title = "ktlist", name = { "-kc", "--kc.list", "-kt", "--kt-list" }, description = "The list of Keyspace.table to take snapshot.(you must not specify only keyspace)") - private String kcList = null; + @Option(title = "ktlist", name = { "-kt", "--kt-list", "-kc", "--kc.list" }, description = "The list of Keyspace.table to take snapshot.(you must not specify only keyspace)") + private String ktList = null; @Override public void execute(NodeProbe probe) @@ -55,11 +55,11 @@ public class Snapshot extends NodeToolCmd sb.append("Requested creating snapshot(s) for "); // Create a separate path for kclist to avoid breaking of already existing scripts - if (null != kcList && !kcList.isEmpty()) + if (null != ktList && !ktList.isEmpty()) { - kcList = kcList.replace(" ", ""); - if (keyspaces.isEmpty() && null == columnFamily) - sb.append("[").append(kcList).append("]"); + ktList = ktList.replace(" ", ""); + if (keyspaces.isEmpty() && null == table) + sb.append("[").append(ktList).append("]"); else { throw new IOException( @@ -68,7 +68,7 @@ public class Snapshot extends NodeToolCmd if (!snapshotName.isEmpty()) sb.append(" with snapshot name [").append(snapshotName).append("]"); System.out.println(sb.toString()); - probe.takeMultipleColumnFamilySnapshot(snapshotName, kcList.split(",")); + probe.takeMultipleColumnFamilySnapshot(snapshotName, ktList.split(",")); System.out.println("Snapshot directory: " + snapshotName); } else @@ -83,7 +83,7 @@ public class Snapshot extends NodeToolCmd System.out.println(sb.toString()); - probe.takeSnapshot(snapshotName, columnFamily, toArray(keyspaces, String.class)); + probe.takeSnapshot(snapshotName, table, toArray(keyspaces, String.class)); System.out.println("Snapshot directory: " + snapshotName); } }
