[kylin] branch master updated: KYLIN-4343 Cleanup intermediate dict table

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new d05a23f  KYLIN-4343 Cleanup intermediate dict table
d05a23f is described below

commit d05a23fd9e2545521e24a18d1796b8fe65f8d16b
Author: XiaoxiangYu <hit_la...@126.com>
AuthorDate: Tue Jun 16 19:38:30 2020 +0800

    KYLIN-4343 Cleanup intermediate dict table
---
 .../java/org/apache/kylin/engine/mr/common/BatchConstants.java     | 4 ++--
 .../src/main/java/org/apache/kylin/source/hive/HiveInputBase.java  | 7 +++++--
 .../src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java
index f8ab007..d0e2936 100644
--- 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java
+++ 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/BatchConstants.java
@@ -114,8 +114,8 @@ public interface BatchConstants {
     String ARG_BASE64_ENCODED_STEP_NAME = "base64StepName";
     String ARG_SQL_COUNT = "sqlCount";
     String ARG_BASE64_ENCODED_SQL = "base64EncodedSql";
-    String ARG_GLOBAL_DIC_PART_REDUCE_STATS = "global_dic_part_reduce_stats";
-    String ARG_GLOBAL_DIC_MAX_DISTINCT_COUNT = "globa_dicl_max_distinct_count";
+    String ARG_GLOBAL_DIC_PART_REDUCE_STATS = "global_dict_part_reduce_stats";
+    String ARG_GLOBAL_DIC_MAX_DISTINCT_COUNT = 
"global_dict_max_distinct_count";
 
     /**
      * logger and counter
diff --git 
a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java 
b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java
index c60a2ce..1c57117 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/HiveInputBase.java
@@ -375,9 +375,12 @@ public class HiveInputBase {
             String[] mrHiveDicts = 
flatDesc.getSegment().getConfig().getMrHiveDictColumns();
             if (Objects.nonNull(mrHiveDicts) && mrHiveDicts.length > 0) {
                 String dictDb = 
flatDesc.getSegment().getConfig().getMrHiveDictDB();
-                String tableName = dictDb + "." + flatDesc.getTableName() + "_"
-                        + MRHiveDictUtil.DictHiveType.GroupBy.getName();
+                String tableName = dictDb + "." + flatDesc.getTableName()
+                        + 
flatDesc.getSegment().getConfig().getMrHiveDistinctValueTableSuffix();
+                String tableName2 = dictDb + "." + flatDesc.getTableName()
+                        + 
flatDesc.getSegment().getConfig().getMrHiveDictTableSuffix();
                 deleteTables.add(tableName);
+                deleteTables.add(tableName2);
             }
             step.setIntermediateTables(deleteTables);
 
diff --git 
a/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java 
b/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java
index 573ecd3..f0e31cc 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/MRHiveDictUtil.java
@@ -71,7 +71,7 @@ public class MRHiveDictUtil {
     protected static final Pattern HDFS_LOCATION = Pattern.compile("LOCATION 
\'(.*)\';");
 
     public enum DictHiveType {
-        GroupBy("group_by"), MrDictLockPath("/mr_dict_lock/"), 
MrEphemeralDictLockPath(
+        MrDictLockPath("/mr_dict_lock/"), MrEphemeralDictLockPath(
                 "/mr_dict_ephemeral_lock/");
         private String name;