diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java index 72e9037..01fdfbb 100644 --- a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java +++ b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java @@ -202,7 +202,7 @@ public Properties toProperties() for (int i = 0; names != null && i < names.length; i++) { Object o = beeLine.getReflector().invoke(this, "get" + names[i], new Object[0]); props.setProperty(PROPERTY_PREFIX + names[i], - o == null ? "" : o.toString()); + o == null ? "" : o.toString()); } beeLine.debug("properties: " + props.toString()); return props; @@ -409,7 +409,14 @@ public void setShowHeader(boolean showHeader) { } 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) { 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..f194846 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,11 @@ public void testSetPromptValue() { } @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); } @@ -123,7 +128,7 @@ public void testSourceCmd() { public void testSourceCmd2() { File f = generateTmpFile(SOURCE_CONTEXT3); verifyCMD("source " + f.getPath() + ";" + "desc testSrcTbl3;\nquit;\n", "sc3", os, - new String[] { "--database", "test" }, ERRNO_OK); + new String[]{"--database", "test" }, ERRNO_OK); f.delete(); } @@ -160,7 +165,7 @@ public void testVariablesForSource() { File f = generateTmpFile(SOURCE_CONTEXT2); verifyCMD( "set hiveconf:zzz=" + f.getAbsolutePath() + ";\nsource ${hiveconf:zzz};\ndesc testSrcTbl2;", - "sc2", os, new String[] { "--database", "test" }, ERRNO_OK); + "sc2", os, new String[]{"--database", "test"}, ERRNO_OK); f.delete(); }