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 2015/09/09 10:59:13 UTC
incubator-kylin git commit: KYLIN-998 allow configurable hive database
Repository: incubator-kylin
Updated Branches:
refs/heads/2.x-staging 5248354c0 -> 3c6c9c929
KYLIN-998 allow configurable hive database
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/3c6c9c92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/3c6c9c92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/3c6c9c92
Branch: refs/heads/2.x-staging
Commit: 3c6c9c9296ad3907973b88efaf2cf99a20de43e1
Parents: 5248354
Author: shaofengshi <sh...@apache.org>
Authored: Wed Sep 9 16:58:52 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Sep 9 16:58:52 2015 +0800
----------------------------------------------------------------------
job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java | 2 ++
.../src/main/java/org/apache/kylin/source/hive/HiveMRInput.java | 2 +-
.../org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3c6c9c92/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
index e3a12ea..5ca3b29 100644
--- a/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
+++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithStreamTest.java
@@ -119,6 +119,7 @@ public class BuildIIWithStreamTest {
IIJoinedFlatTableDesc intermediateTableDesc = new IIJoinedFlatTableDesc(desc);
JobEngineConfig jobEngineConfig = new JobEngineConfig(kylinConfig);
final String uuid = UUID.randomUUID().toString();
+ final String useDatabaseHql = "USE " + kylinConfig.getHiveDatabaseForIntermediateTable() + ";";
final String dropTableHql = JoinedFlatTable.generateDropTableStatement(intermediateTableDesc);
final String createTableHql = JoinedFlatTable.generateCreateTableStatement(intermediateTableDesc, JobBuilderSupport.getJobWorkingDir(jobEngineConfig, uuid));
String insertDataHqls;
@@ -132,6 +133,7 @@ public class BuildIIWithStreamTest {
ShellExecutable step = new ShellExecutable();
StringBuffer buf = new StringBuffer();
buf.append("hive -e \"");
+ buf.append(useDatabaseHql + "\n");
buf.append(dropTableHql + "\n");
buf.append(createTableHql + "\n");
buf.append(insertDataHqls + "\n");
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3c6c9c92/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 b4edd2e..4491e2b 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
@@ -157,7 +157,7 @@ public class HiveMRInput implements IMRInput {
final String hiveTable = this.getIntermediateTableIdentity();
if (config.isHiveKeepFlatTable() == false && StringUtils.isNotEmpty(hiveTable)) {
- final String dropSQL = "DROP TABLE IF EXISTS " + hiveTable + ";";
+ final String dropSQL = "USE " + context.getConfig().getHiveDatabaseForIntermediateTable() + ";" + " DROP TABLE IF EXISTS " + hiveTable + ";";
final String dropHiveCMD = "hive -e \"" + dropSQL + "\"";
ShellCmdOutput shellCmdOutput = new ShellCmdOutput();
try {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3c6c9c92/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
index 93d6a86..1779d6e 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/DeprecatedGCStep.java
@@ -86,7 +86,7 @@ public class DeprecatedGCStep extends AbstractExecutable {
private void dropHiveTable(ExecutableContext context) throws IOException {
final String hiveTable = this.getOldHiveTable();
if (StringUtils.isNotEmpty(hiveTable)) {
- final String dropSQL = "DROP TABLE IF EXISTS " + hiveTable + ";";
+ final String dropSQL = "USE " + context.getConfig().getHiveDatabaseForIntermediateTable() + ";" + " DROP TABLE IF EXISTS " + hiveTable + ";";
final String dropHiveCMD = "hive -e \"" + dropSQL + "\"";
ShellCmdOutput shellCmdOutput = new ShellCmdOutput();
context.getConfig().getCliCommandExecutor().execute(dropHiveCMD, shellCmdOutput);