You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/09/06 09:59:11 UTC
[39/50] [abbrv] incubator-kylin git commit: KYLIN-975 fix bug when
user configures database.for.intermediatetable
KYLIN-975 fix bug when user configures database.for.intermediatetable
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1dc20b8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1dc20b8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1dc20b8e
Branch: refs/heads/0.7-staging
Commit: 1dc20b8ecc39a465eeb47398bdb4c22aee4e25fa
Parents: 78fd18e
Author: gaodayue <ga...@meituan.com>
Authored: Fri Aug 28 17:54:14 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Sun Sep 6 14:37:59 2015 +0800
----------------------------------------------------------------------
job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java | 3 ++-
.../java/org/apache/kylin/job/cube/GarbageCollectionStep.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1dc20b8e/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java b/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
index 7ad8763..e6fde23 100644
--- a/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
+++ b/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java
@@ -50,8 +50,9 @@ public abstract class AbstractJobBuilder {
return cmd.append(" -").append(paraName).append(" ").append(paraValue);
}
+ // return in full-qualified name, that is "dbname.tablename"
protected String getIntermediateHiveTableName(IJoinedFlatTableDesc intermediateTableDesc, String jobUuid) {
- return intermediateTableDesc.getTableName(jobUuid);
+ return engineConfig.getConfig().getHiveDatabaseForIntermediateTable() + "." + intermediateTableDesc.getTableName(jobUuid);
}
protected String getIntermediateHiveTableLocation(IJoinedFlatTableDesc intermediateTableDesc, String jobUUID) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1dc20b8e/job/src/main/java/org/apache/kylin/job/cube/GarbageCollectionStep.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/cube/GarbageCollectionStep.java b/job/src/main/java/org/apache/kylin/job/cube/GarbageCollectionStep.java
index 2014131..4cb4a80 100644
--- a/job/src/main/java/org/apache/kylin/job/cube/GarbageCollectionStep.java
+++ b/job/src/main/java/org/apache/kylin/job/cube/GarbageCollectionStep.java
@@ -83,7 +83,7 @@ public class GarbageCollectionStep extends AbstractExecutable {
private void dropHiveTable(ExecutableContext context) throws IOException {
final String hiveTable = this.getOldHiveTable();
if (StringUtils.isNotEmpty(hiveTable)) {
- final String dropSQL = "USE " + KylinConfig.getInstanceFromEnv().getHiveDatabaseForIntermediateTable() + ";" + " DROP TABLE IF EXISTS " + hiveTable + ";";
+ final String dropSQL = "DROP TABLE IF EXISTS " + hiveTable + ";";
final String dropHiveCMD = "hive -e \"" + dropSQL + "\"";
ShellCmdOutput shellCmdOutput = new ShellCmdOutput();
context.getConfig().getCliCommandExecutor().execute(dropHiveCMD, shellCmdOutput);