You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by bl...@apache.org on 2015/12/03 07:51:05 UTC
tajo git commit: TAJO-1979: Usage of some TajoShellCommand is omitted.
Repository: tajo
Updated Branches:
refs/heads/master e8dc34375 -> f775d7d29
TAJO-1979: Usage of some TajoShellCommand is omitted.
Closes #862
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/f775d7d2
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/f775d7d2
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/f775d7d2
Branch: refs/heads/master
Commit: f775d7d29d2a7cc5fa7a8e9753548006fac8719f
Parents: e8dc343
Author: Dongkyu Hwangbo <hw...@gmail.com>
Authored: Thu Dec 3 15:49:26 2015 +0900
Committer: JaeHwa Jung <bl...@apache.org>
Committed: Thu Dec 3 15:49:26 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/f775d7d2/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 75fc9ca..f3cac0c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Release 0.12.0 - unreleased
IMPROVEMENT
+ TAJO-1979: Usage of some TajoShellCommand is omitted.
+ (Dongkyu Hwangbo via 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/f775d7d2/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 6f8a6d2..d524d80 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
@@ -72,7 +72,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/f775d7d2/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 105e7a5..5de9984 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
@@ -81,13 +81,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/f775d7d2/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/f775d7d2/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 d603f4a..4f1b133 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
@@ -594,4 +594,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]"));
+ }
}