You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/07/26 03:33:53 UTC
[34/55] [abbrv] kylin git commit: KYLIN-1912: Fix Beeline build
intermediate statement issue
KYLIN-1912: Fix Beeline build intermediate statement issue
Signed-off-by: lidongsjtu <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1c257be0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1c257be0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1c257be0
Branch: refs/heads/1.5.x-CDH5.7
Commit: 1c257be08f39cf39453efe951ce6abca5f47b218
Parents: 5268c54
Author: Yiming Liu <li...@gmail.com>
Authored: Fri Jul 22 07:48:48 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Fri Jul 22 12:28:22 2016 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java | 4 ++++
.../src/main/java/org/apache/kylin/source/hive/HiveMRInput.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c257be0/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java
----------------------------------------------------------------------
diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java
index 6316b9c..5a5b4e0 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveCmdBuilder.java
@@ -20,6 +20,7 @@ package org.apache.kylin.source.hive;
import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
@@ -78,6 +79,9 @@ public class HiveCmdBuilder {
buf.append(tmpHql.getAbsolutePath());
logger.info("The statements to execute in beeline: \n" + hqlBuf);
+ if (logger.isDebugEnabled()) {
+ logger.debug("THe SQL to execute in beeline: \n" + IOUtils.toString(new FileReader(tmpHql)));
+ }
} catch (IOException e) {
throw new RuntimeException(e);
} finally {
http://git-wip-us.apache.org/repos/asf/kylin/blob/1c257be0/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
----------------------------------------------------------------------
diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
index e4492da..5de9a98 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveMRInput.java
@@ -186,7 +186,7 @@ public class HiveMRInput implements IMRInput {
StringBuilder hiveInitBuf = new StringBuilder();
hiveInitBuf.append(JoinedFlatTable.generateHiveSetStatements(conf));
- final String useDatabaseHql = "USE " + conf.getConfig().getHiveDatabaseForIntermediateTable() + ";";
+ final String useDatabaseHql = "USE " + conf.getConfig().getHiveDatabaseForIntermediateTable() + ";\n";
final String dropTableHql = JoinedFlatTable.generateDropTableStatement(flatTableDesc);
final String createTableHql = JoinedFlatTable.generateCreateTableStatement(flatTableDesc, JobBuilderSupport.getJobWorkingDir(conf, jobId));
String insertDataHqls;