[kylin] 03/05: KYLIN-3287, fix when a shard by column is in dict encoding, dict building error.

[billyliu]

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

billyliu pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 80d01612462bcca129bc950fe101db4c8e9cf6f4
Author: Jiatao Tao <245915...@qq.com>
AuthorDate: Mon Mar 12 14:55:34 2018 +0800

    KYLIN-3287, fix when a shard by column is in dict encoding, dict building 
error.
---
 .../java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java     | 2 +-
 examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
index a457677..dab4880 100644
--- 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
+++ 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/CreateDictionaryJob.java
@@ -82,7 +82,7 @@ public class CreateDictionaryJob extends AbstractHadoopJob {
                 List<TblColRef> uhcColumns = 
cube.getDescriptor().getAllUHCColumns();
 
                 Path colDir;
-                if (uhcColumns.contains(col)) {
+                if (config.isBuildUHCDictWithMREnabled() && 
uhcColumns.contains(col)) {
                     colDir = new Path(dictPath, col.getIdentity());
                 } else {
                     colDir = new Path(factColumnsInputPath, col.getIdentity());
diff --git 
a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json 
b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
index 809e188..ec1100a 100644
--- a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
+++ b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
@@ -342,7 +342,8 @@
       },
       {
         "column": "TEST_KYLIN_FACT.LEAF_CATEG_ID",
-        "encoding": "dict"
+        "encoding": "dict",
+        "isShardBy" : true
       },
       {
         "column": "TEST_CATEGORY_GROUPINGS.META_CATEG_NAME",

-- 
To stop receiving notification emails like this one, please contact
billy...@apache.org.