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/09/28 03:10:33 UTC
[13/33] hive git commit: HIVE-11236 BeeLine-Cli: use the same output
format as old CLI in the new CLI(Ferdinand Xu, reviewed by Xuefu Zhang)
HIVE-11236 BeeLine-Cli: use the same output format as old CLI in the new CLI(Ferdinand Xu, reviewed by Xuefu Zhang)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/30aa1555
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/30aa1555
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/30aa1555
Branch: refs/heads/master
Commit: 30aa15556f85b08b4dd8c072bbf3b6ba792459fd
Parents: eccfdf0
Author: Ferdinand Xu <ch...@intel.com>
Authored: Mon Jul 13 21:49:25 2015 -0400
Committer: Ferdinand Xu <ch...@intel.com>
Committed: Mon Jul 13 21:49:25 2015 -0400
----------------------------------------------------------------------
beeline/src/java/org/apache/hive/beeline/BeeLine.java | 3 +++
.../test/org/apache/hive/beeline/cli/TestHiveCli.java | 12 ++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/30aa1555/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 7c53997..5a22956 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLine.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLine.java
@@ -827,6 +827,9 @@ public class BeeLine implements Closeable {
return code;
}
getOpts().updateBeeLineOptsFromConf();
+ getOpts().setShowHeader(false);
+ getOpts().setOutputFormat("dsv");
+ getOpts().setDelimiterForDSV(' ');
}
if (getOpts().getScriptFile() != null) {
http://git-wip-us.apache.org/repos/asf/hive/blob/30aa1555/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
index fa94c89..ed4e7c6 100644
--- a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
+++ b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
@@ -41,11 +41,11 @@ public class TestHiveCli {
private static final int ERRNO_OTHER = 2;
private final static String SOURCE_CONTEXT =
- "create table if not exists test.testSrcTbl(a string, b string);";
+ "create table if not exists test.testSrcTbl(sc1 string);";
private final static String SOURCE_CONTEXT2 =
- "create table if not exists test.testSrcTbl2(a string);";
+ "create table if not exists test.testSrcTbl2(sc2 string);";
private final static String SOURCE_CONTEXT3 =
- "create table if not exists test.testSrcTbl3(a string);";
+ "create table if not exists test.testSrcTbl3(sc3 string);";
final static String CMD =
"create database if not exists test;\ncreate table if not exists test.testTbl(a string, b "
+ "string);\n";
@@ -107,7 +107,7 @@ public class TestHiveCli {
@Test
public void testSourceCmd() {
File f = generateTmpFile(SOURCE_CONTEXT);
- verifyCMD("source " + f.getPath() + ";" + "desc testSrcTbl;\nquit;\n", "col_name", os,
+ verifyCMD("source " + f.getPath() + ";" + "desc testSrcTbl;\nquit;\n", "sc1", os,
new String[] { "--database", "test" }, ERRNO_OK);
f.delete();
}
@@ -115,7 +115,7 @@ public class TestHiveCli {
@Test
public void testSourceCmd2() {
File f = generateTmpFile(SOURCE_CONTEXT3);
- verifyCMD("source " + f.getPath() + ";" + "desc testSrcTbl3;\nquit;\n", "col_name", os,
+ verifyCMD("source " + f.getPath() + ";" + "desc testSrcTbl3;\nquit;\n", "sc3", os,
new String[] { "--database", "test" }, ERRNO_OK);
f.delete();
}
@@ -153,7 +153,7 @@ public class TestHiveCli {
File f = generateTmpFile(SOURCE_CONTEXT2);
verifyCMD(
"set hiveconf:zzz=" + f.getAbsolutePath() + ";\nsource ${hiveconf:zzz};\ndesc testSrcTbl2;",
- "col_name", os, new String[] { "--database", "test" }, ERRNO_OK);
+ "sc2", os, new String[] { "--database", "test" }, ERRNO_OK);
f.delete();
}