git commit: Nodetool rebuild_index requires named indexes argument
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).
[1/2] git commit: Nodetool rebuild_index requires named indexes argument
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 1104653a4 - bc6f4d003
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-2.0
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).
git commit: Nodetool rebuild_index requires named indexes argument
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 2b89cf6a8 - 743d921ae
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/743d921a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/743d921a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/743d921a
Branch: refs/heads/cassandra-2.1
Commit: 743d921ae8591545ff01022db9a41a84ef1edcd1
Parents: 2b89cf6
Author: Sam Tunnicliffe s...@beobal.com
Authored: Tue Apr 22 01:46:31 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Apr 22 01:46:31 2014 -0400
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 15 ---
2 files changed, 5 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/743d921a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5d15eac..d94f13b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,6 +46,7 @@
* Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
* Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
* Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
+ * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
Merged from 2.0:
* Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
* Allow compaction of system tables during startup (CASSANDRA-6913)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/743d921a/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index edcfec3..2c8d0c2 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2130,24 +2130,17 @@ public class NodeTool
}
}
-@Command(name = rebuild_index, description = A full rebuilds of native
secondry index for a given column family)
+@Command(name = rebuild_index, description = A full rebuild of native
secondary indexes for a given column family)
public static class RebuildIndex extends NodeToolCmd
{
-@Arguments(usage = keyspace cfname [indexName...], description
= The keyspace and column family name followed by an optional list of index
names (IndexNameExample: Standard3.IdxName Standard3.IdxName1))
+@Arguments(usage = keyspace cfname indexName..., description =
The keyspace and column family name followed by a list of index names
(IndexNameExample: Standard3.IdxName Standard3.IdxName1))
ListString args = new ArrayList();
@Override
public void execute(NodeProbe probe)
{
-checkArgument(args.size() = 2, rebuild_index requires ks and cf
args);
-
-ListString indexNames = new ArrayList();
-if (args.size() 2)
-{
-indexNames.addAll(args.subList(2, args.size()));
-}
-
-probe.rebuildIndex(args.get(0), args.get(1), toArray(indexNames,
String.class));
+checkArgument(args.size() = 3, rebuild_index requires ks, cf and
idx args);
+probe.rebuildIndex(args.get(0), args.get(1),
toArray(args.subList(2, args.size()), String.class));
}
}
[1/3] git commit: Nodetool rebuild_index requires named indexes argument
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 743d921ae - 30e2bff69
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-2.1
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).
[1/5] git commit: Nodetool rebuild_index requires named indexes argument
Repository: cassandra
Updated Branches:
refs/heads/trunk 462c2dcc0 - 33fa4f648
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/trunk
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).
[3/5] git commit: Nodetool rebuild_index requires named indexes argument
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/743d921a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/743d921a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/743d921a
Branch: refs/heads/trunk
Commit: 743d921ae8591545ff01022db9a41a84ef1edcd1
Parents: 2b89cf6
Author: Sam Tunnicliffe s...@beobal.com
Authored: Tue Apr 22 01:46:31 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Apr 22 01:46:31 2014 -0400
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 15 ---
2 files changed, 5 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/743d921a/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 5d15eac..d94f13b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,6 +46,7 @@
* Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
* Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
* Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
+ * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
Merged from 2.0:
* Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
* Allow compaction of system tables during startup (CASSANDRA-6913)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/743d921a/src/java/org/apache/cassandra/tools/NodeTool.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java
b/src/java/org/apache/cassandra/tools/NodeTool.java
index edcfec3..2c8d0c2 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2130,24 +2130,17 @@ public class NodeTool
}
}
-@Command(name = rebuild_index, description = A full rebuilds of native
secondry index for a given column family)
+@Command(name = rebuild_index, description = A full rebuild of native
secondary indexes for a given column family)
public static class RebuildIndex extends NodeToolCmd
{
-@Arguments(usage = keyspace cfname [indexName...], description
= The keyspace and column family name followed by an optional list of index
names (IndexNameExample: Standard3.IdxName Standard3.IdxName1))
+@Arguments(usage = keyspace cfname indexName..., description =
The keyspace and column family name followed by a list of index names
(IndexNameExample: Standard3.IdxName Standard3.IdxName1))
ListString args = new ArrayList();
@Override
public void execute(NodeProbe probe)
{
-checkArgument(args.size() = 2, rebuild_index requires ks and cf
args);
-
-ListString indexNames = new ArrayList();
-if (args.size() 2)
-{
-indexNames.addAll(args.subList(2, args.size()));
-}
-
-probe.rebuildIndex(args.get(0), args.get(1), toArray(indexNames,
String.class));
+checkArgument(args.size() = 3, rebuild_index requires ks, cf and
idx args);
+probe.rebuildIndex(args.get(0), args.get(1),
toArray(args.subList(2, args.size()), String.class));
}
}
