Repository: tajo Updated Branches: refs/heads/branch-0.11.1 c2b3620a9 -> e63721eb4
TAJO-1979: Usage of some TajoShellCommand is omitted. Signed-off-by: JaeHwa Jung <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e63721eb Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e63721eb Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e63721eb Branch: refs/heads/branch-0.11.1 Commit: e63721eb411820e1173e44ed823c18e6789496be Parents: c2b3620 Author: Dongkyu Hwangbo <[email protected]> Authored: Thu Dec 3 15:59:30 2015 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Thu Dec 3 15:59:30 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../cli/tsql/commands/ConnectDatabaseCommand.java | 2 +- .../apache/tajo/cli/tsql/commands/SetCommand.java | 4 ++-- .../tajo/cli/tsql/commands/UnsetCommand.java | 4 ++-- .../org/apache/tajo/cli/tsql/TestTajoCli.java | 18 ++++++++++++++++++ 5 files changed, 26 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e63721eb/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2b90f79..9d64534 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,9 @@ Release 0.11.1 - unreleased IMPROVEMENT + TAJO-1979: Usage of some TajoShellCommand is omitted. + (Contributed by Dongkyu Hwangbo, committed by jaehwa) + TAJO-1998: Waiting for gracefully stopping in tajo-deamon.sh is too short. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/e63721eb/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java index 647cbbd..6cc6669 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/ConnectDatabaseCommand.java @@ -76,7 +76,7 @@ public class ConnectDatabaseCommand extends TajoShellCommand { @Override public String getUsage() { - return ""; + return "[database_name]"; } @Override http://git-wip-us.apache.org/repos/asf/tajo/blob/e63721eb/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/SetCommand.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/SetCommand.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/SetCommand.java index 0ae07d5..456a7a1 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/SetCommand.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/SetCommand.java @@ -82,13 +82,13 @@ public class SetCommand extends TajoShellCommand { } else if (cmd.length == 3) { set(cmd[1], cmd[2]); } else { - context.getOutput().println("usage: \\set [[NAME] VALUE]"); + context.getOutput().println("usage: \\set " + getUsage()); } } @Override public String getUsage() { - return ""; + return "[[NAME] VALUE]"; } @Override http://git-wip-us.apache.org/repos/asf/tajo/blob/e63721eb/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/UnsetCommand.java ---------------------------------------------------------------------- diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/UnsetCommand.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/UnsetCommand.java index b540ca1..73b9773 100644 --- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/UnsetCommand.java +++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/UnsetCommand.java @@ -37,13 +37,13 @@ public class UnsetCommand extends TajoShellCommand { if (cmd.length == 2) { client.unsetSessionVariables(Lists.newArrayList(cmd[1])); } else { - context.getOutput().println("usage: \\unset NAME"); + context.getOutput().println("usage: \\unset " + getUsage()); } } @Override public String getUsage() { - return ""; + return "[NAME]"; } @Override http://git-wip-us.apache.org/repos/asf/tajo/blob/e63721eb/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java b/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java index 68c2441..b766c13 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/cli/tsql/TestTajoCli.java @@ -582,4 +582,22 @@ public class TestTajoCli { } } } + + @Test + public void testPrintUsageOfConnectDatabaseCommand() { + tajoCli.executeMetaCommand("\\help c"); + assertTrue(new String(out.toByteArray()).contains("[database_name]")); + } + + @Test + public void testPrintUsageOfSetCommand() { + tajoCli.executeMetaCommand("\\set a b c"); + assertTrue(new String(out.toByteArray()).contains("[[NAME] VALUE]")); + } + + @Test + public void testPrintUsageOfUnsetCommand() { + tajoCli.executeMetaCommand("\\help unset"); + assertTrue(new String(out.toByteArray()).contains("[NAME]")); + } }
