You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/09/19 01:47:10 UTC
[34/50] [abbrv] incubator-kylin git commit: KYLIN-998 support
non-default hive database
KYLIN-998 support non-default 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/c4b4b11d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c4b4b11d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c4b4b11d
Branch: refs/heads/master
Commit: c4b4b11dc5d952906019ece31f10aec1ecd5d9fd
Parents: 204b517
Author: shaofengshi <sh...@apache.org>
Authored: Wed Sep 9 09:49:02 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Sep 9 09:50:14 2015 +0800
----------------------------------------------------------------------
job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java | 4 ----
.../org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java | 5 +++--
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c4b4b11d/job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java b/job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
index 03119c3..eb6d27b 100644
--- a/job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
+++ b/job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
@@ -52,10 +52,6 @@ import org.xml.sax.SAXException;
public class JoinedFlatTable {
- public static String getTableDir(IJoinedFlatTableDesc intermediateTableDesc, String storageDfsDir, String jobUUID) {
- return storageDfsDir + "/" + intermediateTableDesc.getTableName(jobUUID);
- }
-
public static String generateCreateTableStatement(IJoinedFlatTableDesc intermediateTableDesc, String storageDfsDir, String jobUUID) {
StringBuilder ddl = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c4b4b11d/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
index 0f6f9cb..3b25ee1 100644
--- a/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
+++ b/job/src/main/java/org/apache/kylin/job/hadoop/cube/StorageCleanupJob.java
@@ -226,9 +226,10 @@ public class StorageCleanupJob extends AbstractHadoopJob {
private void cleanUnusedIntermediateHiveTable(Configuration conf) throws IOException {
int uuidLength = 36;
-
+ final String useDatabaseHql = "USE " + KylinConfig.getInstanceFromEnv().getHiveDatabaseForIntermediateTable() + ";";
StringBuilder buf = new StringBuilder();
buf.append("hive -e \"");
+ buf.append(useDatabaseHql);
buf.append("show tables " + "\'kylin_intermediate_*\'" + "; ");
buf.append("\"");
@@ -279,7 +280,7 @@ public class StorageCleanupJob extends AbstractHadoopJob {
if (delete == true) {
buf.delete(0, buf.length());
buf.append("hive -e \"");
-
+ buf.append(useDatabaseHql);
for (String delHive : allHiveTablesNeedToBeDeleted) {
buf.append("drop table if exists " + delHive + "; ");
log.info("Remove " + delHive + " from hive tables.");