You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2015/10/28 13:11:38 UTC
[45/55] [abbrv] hive git commit: HIVE-12259: Command containing
semicolon is broken in Beeline (Chaoyu Tang, reviewed by Ferdinand Xu)
HIVE-12259: Command containing semicolon is broken in Beeline (Chaoyu Tang, reviewed by Ferdinand Xu)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ccdd1740
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ccdd1740
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ccdd1740
Branch: refs/heads/spark
Commit: ccdd1740a582ed49bcfba0d940e60438e1c7cb08
Parents: 86346fb
Author: ctang <ct...@gmail.com>
Authored: Tue Oct 27 08:16:24 2015 -0400
Committer: ctang <ct...@gmail.com>
Committed: Tue Oct 27 08:16:24 2015 -0400
----------------------------------------------------------------------
beeline/src/java/org/apache/hive/beeline/BeeLine.java | 4 ++--
.../java/org/apache/hive/beeline/TestBeeLineWithArgs.java | 8 ++++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/ccdd1740/beeline/src/java/org/apache/hive/beeline/BeeLine.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLine.java b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
index 69e9418..4e04997 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -1108,8 +1108,8 @@ public class BeeLine implements Closeable {
}
if (isBeeLine) {
- if (line.startsWith(COMMAND_PREFIX) && !line.contains(";")) {
- // handle the case "!cmd" for beeline
+ if (line.startsWith(COMMAND_PREFIX)) {
+ // handle SQLLine command in beeline which starts with ! and does not end with ;
return execCommandWithPrefix(line);
} else {
return commands.sql(line, getOpts().getEntireLineAsCommand());
http://git-wip-us.apache.org/repos/asf/hive/blob/ccdd1740/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
index 0465ef3..7cc0acf 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/beeline/TestBeeLineWithArgs.java
@@ -752,4 +752,12 @@ public class TestBeeLineWithArgs {
final String EXPECTED_PATTERN = "Stage-1 map =";
testScriptFile(SCRIPT_TEXT, EXPECTED_PATTERN, true, argList);
}
+
+ @Test
+ public void testConnectionUrlWithSemiColon() throws Throwable{
+ List<String> argList = getBaseArgs(miniHS2.getJdbcURL("default", "sess_var_list?var1=value1"));
+ final String SCRIPT_TEXT = "set var1";
+ final String EXPECTED_PATTERN = "var1=value1";
+ testScriptFile(SCRIPT_TEXT, EXPECTED_PATTERN, true, argList);
+ }
}