Merge branch 'commands' of https://github.com/abhishekagarwal87/storm into
STORM-1267
Conflicts:
storm-core/test/jvm/org/apache/storm/command/TestCLI.java
STORM-1267: Port set_log_level
STORM-1266: Port rebalance
STORM-1265: Port monitor
This closes #1137
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b8375907
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b8375907
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b8375907
Branch: refs/heads/master
Commit: b83759074b7b0e7b1727dd4fac1c2b5ab9c4cdad
Parents: 56bc603 2d4ad6f
Author: Robert (Bobby) Evans <[email protected]>
Authored: Wed Feb 24 11:30:24 2016 -0600
Committer: Robert (Bobby) Evans <[email protected]>
Committed: Wed Feb 24 11:30:24 2016 -0600
----------------------------------------------------------------------
bin/storm.cmd | 2 +-
bin/storm.py | 6 +-
.../clj/org/apache/storm/command/monitor.clj | 37 ------
.../clj/org/apache/storm/command/rebalance.clj | 47 --------
.../org/apache/storm/command/set_log_level.clj | 76 ------------
.../src/jvm/org/apache/storm/command/CLI.java | 25 +++-
.../jvm/org/apache/storm/command/Monitor.java | 65 +++++++++++
.../jvm/org/apache/storm/command/Rebalance.java | 86 ++++++++++++++
.../org/apache/storm/command/SetLogLevel.java | 116 +++++++++++++++++++
.../src/jvm/org/apache/storm/utils/Utils.java | 61 +++++++---
.../org/apache/storm/command/RebalanceTest.java | 41 +++++++
.../apache/storm/command/SetLogLevelTest.java | 54 +++++++++
.../jvm/org/apache/storm/command/TestCLI.java | 42 +++++--
13 files changed, 458 insertions(+), 200 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b8375907/storm-core/src/jvm/org/apache/storm/command/CLI.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b8375907/storm-core/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b8375907/storm-core/test/jvm/org/apache/storm/command/TestCLI.java
----------------------------------------------------------------------
diff --cc storm-core/test/jvm/org/apache/storm/command/TestCLI.java
index 5b2f220,c9a4b79..d1caa3c
--- a/storm-core/test/jvm/org/apache/storm/command/TestCLI.java
+++ b/storm-core/test/jvm/org/apache/storm/command/TestCLI.java
@@@ -29,20 -31,20 +31,22 @@@ public class TestCLI
@Test
public void testSimple() throws Exception {
Map<String, Object> values = CLI.opt("a", "aa", null)
- .opt("b", "bb", 1, CLI.AS_INT)
- .opt("c", "cc", 1, CLI.AS_INT, CLI.FIRST_WINS)
- .opt("d", "dd", null, CLI.AS_STRING, CLI.INTO_LIST)
- .opt("e", "ee", null, new PairParse(), CLI.INTO_MAP)
- .arg("A")
- .arg("B", CLI.AS_INT)
- .parse("-a100", "--aa", "200", "-c2", "-b", "50", "--cc", "100",
"A-VALUE", "1", "2", "3", "-b40", "-d1", "-d2", "-d3"
- , "-e", "key1=value1", "-e", "key2=value2");
- assertEquals(7, values.size());
- assertEquals("200", (String) values.get("a"));
- assertEquals((Integer) 40, (Integer) values.get("b"));
- assertEquals((Integer) 2, (Integer) values.get("c"));
+ .opt("b", "bb", 1, CLI.AS_INT)
+ .opt("c", "cc", 1, CLI.AS_INT, CLI.FIRST_WINS)
+ .opt("d", "dd", null, CLI.AS_STRING, CLI.INTO_LIST)
+ .opt("e", "ee", null, CLI.AS_INT)
++ .opt("f", "ff", null, new PairParse(), CLI.INTO_MAP)
+ .arg("A")
+ .arg("B", CLI.AS_INT)
- .parse("-a100", "--aa", "200", "-c2", "-b", "50", "--cc", "100",
"A-VALUE", "1", "2", "3", "-b40", "-d1", "-d2", "-d3");
- assertEquals(7, values.size());
++ .parse("-a100", "--aa", "200", "-c2", "-b", "50", "--cc", "100",
"A-VALUE", "1", "2", "3", "-b40", "-d1", "-d2", "-d3"
++ , "-f", "key1=value1", "-f", "key2=value2");
++ assertEquals(8, values.size());
+ assertEquals("200", (String)values.get("a"));
+ assertEquals((Integer)40, (Integer)values.get("b"));
+ assertEquals((Integer)2, (Integer)values.get("c"));
+ assertEquals(null, values.get("e"));
- List<String> d = (List<String>) values.get("d");
+ List<String> d = (List<String>)values.get("d");
assertEquals(3, d.size());
assertEquals("1", d.get(0));
assertEquals("2", d.get(1));
@@@ -52,10 -54,26 +56,26 @@@
assertEquals(1, A.size());
assertEquals("A-VALUE", A.get(0));
- List<Integer> B = (List<Integer>)values.get("B");
+ List<Integer> B = (List<Integer>) values.get("B");
assertEquals(3, B.size());
- assertEquals((Integer)1, B.get(0));
- assertEquals((Integer)2, B.get(1));
- assertEquals((Integer)3, B.get(2));
+ assertEquals((Integer) 1, B.get(0));
+ assertEquals((Integer) 2, B.get(1));
+ assertEquals((Integer) 3, B.get(2));
+
- Map<String, String> e = (Map<String, String>) values.get("e");
- assertEquals(2, e.size());
- assertEquals("value1", e.get("key1"));
- assertEquals("value2", e.get("key2"));
++ Map<String, String> f = (Map<String, String>) values.get("f");
++ assertEquals(2, f.size());
++ assertEquals("value1", f.get("key1"));
++ assertEquals("value2", f.get("key2"));
+ }
+
+ private static final class PairParse implements CLI.Parse {
+
+ @Override
+ public Object parse(String value) {
+ Map<String, String> result = new HashMap<>();
+ String[] splits = value.split("=");
+ result.put(splits[0], splits[1]);
+ return result;
+ }
}
}
