Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 d0b41d009 -> 8d1acd93f
Nodetool rebuild_index requires named indexes argument patch by Stunnicliffe reviewed by dbrosius for cassandra-7038 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d1acd93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d1acd93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d1acd93 Branch: refs/heads/cassandra-1.2 Commit: 8d1acd93fe86030bdb84bba5251f7999ba70e1b7 Parents: d0b41d0 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Tue Apr 22 01:33:39 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Apr 22 01:33:39 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeCmd.java | 5 +---- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1acd93/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b4498fa..8cfffad 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) * Fix batchlog to account for CF truncation records (CASSANDRA-6999) * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) + * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) 1.2.16 http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1acd93/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java index 6c02877..4901806 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -1370,11 +1370,8 @@ public class NodeCmd break; case REBUILD_INDEX: - if (arguments.length < 2) { badUse("rebuild_index requires ks and cf args"); } - if (arguments.length >= 3) + if (arguments.length <= 2) { badUse("rebuild_index requires ks, cf and idx args"); } probe.rebuildIndex(arguments[0], arguments[1], arguments[2].split(",")); - else - probe.rebuildIndex(arguments[0], arguments[1]); break; http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1acd93/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml ---------------------------------------------------------------------- diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml index 8fe0519..ea2f0d7 100644 --- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml +++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml @@ -181,7 +181,7 @@ commands: Load newly placed SSTables to the system without restart. - name: rebuild_index <keyspace> <cf-name> <idx1,idx1> help: | - a full rebuilds of native secondry index for a given column family. IndexNameExample: Standard3.IdxName,Standard3.IdxName1 + a full rebuild of native secondary indexes for a given column family. IndexNameExample: Standard3.IdxName,Standard3.IdxName1 - name: setcachecapacity <key-cache-capacity> <row-cache-capacity> help: | Set global key and row cache capacities (in MB units).
