You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/12/07 11:59:41 UTC
kylin git commit: KYLIN-242 fix aggregation_gropus to
aggregation_groups
Repository: kylin
Updated Branches:
refs/heads/2.x-staging 9279d87b3 -> 70aa61932
KYLIN-242 fix aggregation_gropus to aggregation_groups
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/70aa6193
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/70aa6193
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/70aa6193
Branch: refs/heads/2.x-staging
Commit: 70aa619328df8cbe5123d7d78be55795f40129e8
Parents: 9279d87
Author: jian <ji...@apache.org>
Authored: Mon Dec 7 18:59:14 2015 +0800
Committer: jian <ji...@apache.org>
Committed: Mon Dec 7 18:59:30 2015 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java | 2 +-
.../localmeta/cube_desc/test_kylin_cube_with_slr_desc.json | 2 +-
.../cube_desc/test_kylin_cube_with_slr_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 +-
.../localmeta/cube_desc/test_streaming_table_cube_desc.json | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/70aa6193/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index 7e79f64..dc5a17b 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -113,7 +113,7 @@ public class CubeDesc extends RootPersistentEntity {
private RowKeyDesc rowkey;
@JsonProperty("hbase_mapping")
private HBaseMappingDesc hbaseMapping;
- @JsonProperty("aggregation_gropus")
+ @JsonProperty("aggregation_groups")
private List<AggregationGroup> aggregationGroups;
@JsonProperty("signature")
private String signature;
http://git-wip-us.apache.org/repos/asf/kylin/blob/70aa6193/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json
index 3355f36..048c147 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_desc.json
@@ -152,7 +152,7 @@
} ]
} ]
},
- "aggregation_gropus" : [ {
+ "aggregation_groups" : [ {
"includes" : [ "cal_dt", "categ_lvl2_name", "categ_lvl3_name", "leaf_categ_id", "lstg_format_name", "lstg_site_id", "meta_categ_name", "seller_id", "slr_segment_cd" ],
"select_rule" : {
"hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME" ] ],
http://git-wip-us.apache.org/repos/asf/kylin/blob/70aa6193/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
index d5c242a..524f924 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_with_slr_left_join_desc.json
@@ -152,7 +152,7 @@
} ]
} ]
},
- "aggregation_gropus" : [ {
+ "aggregation_groups" : [ {
"includes" : [ "cal_dt", "categ_lvl2_name", "categ_lvl3_name", "leaf_categ_id", "lstg_format_name", "lstg_site_id", "meta_categ_name", "seller_id", "slr_segment_cd" ],
"select_rule" : {
"hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME" ] ],
http://git-wip-us.apache.org/repos/asf/kylin/blob/70aa6193/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 ab7a9ba..36c8d95 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
@@ -200,7 +200,7 @@
} ]
} ]
},
- "aggregation_gropus" : [ {
+ "aggregation_groups" : [ {
"includes" : [ "cal_dt", "categ_lvl2_name", "categ_lvl3_name", "leaf_categ_id", "lstg_format_name", "lstg_site_id", "meta_categ_name", "slr_segment_cd" ],
"select_rule" : {
"hierarchy_dims" : [ ],
http://git-wip-us.apache.org/repos/asf/kylin/blob/70aa6193/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 7abc6c0..16d7432 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
@@ -200,7 +200,7 @@
} ]
} ]
},
- "aggregation_gropus" : [ {
+ "aggregation_groups" : [ {
"includes" : [ "cal_dt", "categ_lvl2_name", "categ_lvl3_name", "leaf_categ_id", "lstg_format_name", "lstg_site_id", "meta_categ_name", "slr_segment_cd" ],
"select_rule" : {
"hierarchy_dims" : [ ],
http://git-wip-us.apache.org/repos/asf/kylin/blob/70aa6193/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json b/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json
index 6d5245f..8a1dedf 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_streaming_table_cube_desc.json
@@ -96,7 +96,7 @@
} ]
} ]
},
- "aggregation_gropus" : [ {
+ "aggregation_groups" : [ {
"includes" : [ "DAY_START", "HOUR_START", "ITM", "MINUTE_START", "SITE" ],
"select_rule" : {
"hierarchy_dims" : [ [ "DAY_START", "HOUR_START", "MINUTE_START" ] ],