Repository: kylin Updated Branches: refs/heads/KYLIN-2603 4f300bc49 -> 136a59874 (forced update)
KYLIN-2577 fix UT Signed-off-by: Li Yang <liy...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7ad42a4d Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7ad42a4d Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7ad42a4d Branch: refs/heads/KYLIN-2603 Commit: 7ad42a4d0ca5bbe11bcfd1c2c371693f44c8378e Parents: 6dd5e37 Author: Cheng Wang <cheng.w...@kyligence.io> Authored: Thu May 11 12:38:29 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu May 11 12:42:33 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java | 2 +- .../test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7ad42a4d/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java b/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java index b7e6c15..7a1633b 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/HiveCmdBuilder.java @@ -83,8 +83,8 @@ public class HiveCmdBuilder { bw.newLine(); } buf.append("beeline "); - buf.append(parseProps()); buf.append(kylinConfig.getHiveBeelineParams()); + buf.append(parseProps()); buf.append(" -f "); buf.append(tmpHql.getAbsolutePath()); buf.append(";ret_code=$?;rm -f "); http://git-wip-us.apache.org/repos/asf/kylin/blob/7ad42a4d/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java b/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java index d847575..d69d4d2 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/HiveCmdBuilderTest.java @@ -75,7 +75,7 @@ public class HiveCmdBuilderTest { hiveCmdBuilder.addStatement("SHOW\n TABLES;"); String cmd = hiveCmdBuilder.build(); - assertTrue(cmd.startsWith("beeline -u jdbc_url -f")); + assertTrue(cmd.startsWith("beeline -u jdbc_url")); String hqlFile = cmd.substring(cmd.lastIndexOf("-f ") + 3).trim(); hqlFile = hqlFile.substring(0, hqlFile.length() - ";exit $ret_code".length());
