From d5fb0bf80df94f36d017f728c14810b460d141d7 Mon Sep 17 00:00:00 2001 From: gaodayue Date: Fri, 28 Aug 2015 17:54:14 +0800 Subject: [PATCH] KYLIN-975 fix bug when user configures database.for.intermediatetable --- job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java | 3 ++- job/src/main/java/org/apache/kylin/job/cube/GarbageCollectionStep.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 13f1b15..96b87c5 100644 --- a/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java +++ b/job/src/main/java/org/apache/kylin/job/AbstractJobBuilder.java @@ -53,8 +53,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) { 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 b4f6e8e..0f191df 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 setClusterHql = "-hiveconf " + FileSystem.FS_DEFAULT_NAME_KEY + "=\"" + HadoopUtil.getCurrentConfiguration().get(FileSystem.FS_DEFAULT_NAME_KEY) + "\""; final String dropHiveCMD = "hive " + setClusterHql + " -e \"" + dropSQL + "\""; logger.info("executing: " + dropHiveCMD); -- 2.3.2 (Apple Git-55)