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/11/12 02:47:45 UTC
incubator-kylin git commit: KYLIN-1137 column name need be upper case
in cube desc
Repository: incubator-kylin
Updated Branches:
refs/heads/KYLIN-1126 6476549c9 -> 03c631095
KYLIN-1137 column name need be upper case in cube desc
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/03c63109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/03c63109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/03c63109
Branch: refs/heads/KYLIN-1126
Commit: 03c631095c5e3a70689bbb7a74e2dce5efd915a3
Parents: 6476549
Author: shaofengshi <sh...@apache.org>
Authored: Thu Nov 12 09:46:54 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 12 09:47:19 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/engine/mr/steps/MergeCuboidMapper.java | 2 +-
.../localmeta/cube_desc/test_kylin_cube_topn_desc.json | 2 +-
.../localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json | 2 +-
.../localmeta/cube_desc/test_kylin_cube_without_slr_desc.json | 2 +-
.../cube_desc/test_kylin_cube_without_slr_left_join_desc.json | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/03c63109/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidMapper.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidMapper.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidMapper.java
index b3b38dc..d3d0d7c 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidMapper.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidMapper.java
@@ -240,7 +240,7 @@ public class MergeCuboidMapper extends KylinMapper<Text, Text, Text, Text> {
TopNCounter<ByteArray> topNCounters = (TopNCounter<ByteArray>) measureObjs[idx];
MeasureDesc measureDesc = measuresDescs.get(idx);
- String displayCol = measureDesc.getFunction().getParameter().getDisplayColumn();
+ String displayCol = measureDesc.getFunction().getParameter().getDisplayColumn().toUpperCase();
TblColRef col = cubeDesc.findColumnRef(cubeDesc.getFactTable(), displayCol);
DictionaryManager dictMgr = DictionaryManager.getInstance(config);
Dictionary<?> sourceDict = dictMgr.getDictionary(sourceCubeSegment.getDictResPath(col));
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/03c63109/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json
index 84cdaf4..fddbb10 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json
@@ -88,7 +88,7 @@
"parameter": {
"type": "column",
"value": "PRICE",
- "displaycolumn": "seller_id"
+ "displaycolumn": "SELLER_ID"
},
"returntype": "topn(100)"
},
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/03c63109/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json
index f7e700d..6aecaae 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json
@@ -88,7 +88,7 @@
"parameter": {
"type": "column",
"value": "PRICE",
- "displaycolumn": "seller_id"
+ "displaycolumn": "SELLER_ID"
},
"returntype": "topn(100)"
},
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/03c63109/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json
index bd979e0..3f9957b 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_desc.json
@@ -170,7 +170,7 @@
"parameter": {
"type": "column",
"value": "PRICE",
- "displaycolumn": "seller_id"
+ "displaycolumn": "SELLER_ID"
},
"returntype": "topn(100)"
},
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/03c63109/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
index 08a132e..93d85b4 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
@@ -170,7 +170,7 @@
"parameter": {
"type": "column",
"value": "PRICE",
- "displaycolumn": "seller_id"
+ "displaycolumn": "SELLER_ID"
},
"returntype": "topn(100)"
},