You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/09/28 21:10:22 UTC
[20/43] hive git commit: HIVE-11624:Beeline-cli: support
hive.cli.print.header in new CLI[beeline-cli branch](Ke Jia,
reviewed by Ferdinand Xu)
HIVE-11624:Beeline-cli: support hive.cli.print.header in new CLI[beeline-cli branch](Ke Jia, 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/1f5c745c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1f5c745c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1f5c745c
Branch: refs/heads/llap
Commit: 1f5c745cd0347321b0462e6a1a9d4b6ebf17599d
Parents: 80f6184
Author: Ke Jia <ke...@intel.com>
Authored: Tue Aug 25 01:57:47 2015 -0400
Committer: Ferdinand Xu <ch...@intel.com>
Committed: Tue Aug 25 01:57:47 2015 -0400
----------------------------------------------------------------------
beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java | 9 ++++++++-
.../src/test/org/apache/hive/beeline/cli/TestHiveCli.java | 7 +++++++
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/1f5c745c/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
index 72e9037..b6f244b 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
@@ -409,7 +409,14 @@ class BeeLineOpts implements Completer {
}
public boolean getShowHeader() {
- return showHeader;
+ if (beeLine.isBeeLine()) {
+ return showHeader;
+ } else {
+ boolean header;
+ HiveConf conf = beeLine.getCommands().getHiveConf(true);
+ header = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_CLI_PRINT_HEADER);
+ return header;
+ }
}
public void setHeaderInterval(int headerInterval) {
http://git-wip-us.apache.org/repos/asf/hive/blob/1f5c745c/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 c7eaa8e..7f6ab13 100644
--- a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
+++ b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
@@ -95,6 +95,13 @@ public class TestHiveCli {
}
@Test
+ public void testSetHeaderValue() {
+ verifyCMD(
+ "create database if not exists test;\ncreate table if not exists test.testTbl(a string, b string);\nset hive.cli.print.header=true;\n select * from test.testTbl;\n",
+ "testtbl.a testtbl.b", os, null, ERRNO_OK);
+ }
+
+ @Test
public void testHelp() {
verifyCMD(null, "usage: hive", os, new String[] { "-H" }, ERRNO_ARGS);
}