Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 181DD18CCC for ; Mon, 30 Nov 2015 03:16:27 +0000 (UTC) Received: (qmail 43729 invoked by uid 500); 30 Nov 2015 03:16:27 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 43698 invoked by uid 500); 30 Nov 2015 03:16:26 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 43689 invoked by uid 99); 30 Nov 2015 03:16:26 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2015 03:16:26 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 79DF6C7EF2 for ; Mon, 30 Nov 2015 03:16:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 2ncsnTijui8f for ; Mon, 30 Nov 2015 03:16:25 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id B556B2304C for ; Mon, 30 Nov 2015 03:16:23 +0000 (UTC) Received: (qmail 43602 invoked by uid 99); 30 Nov 2015 03:16:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2015 03:16:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8EFDDFFEF; Mon, 30 Nov 2015 03:16:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mahongbin@apache.org To: commits@kylin.incubator.apache.org Date: Mon, 30 Nov 2015 03:16:28 -0000 Message-Id: <5d9bf733487f43ca96b9b040ee32a4fa@git.apache.org> In-Reply-To: <68dce566fe3d4b309948a6ad4d25e76d@git.apache.org> References: <68dce566fe3d4b309948a6ad4d25e76d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] incubator-kylin git commit: remove dup col in multiple agg group remove dup col in multiple agg group Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2dda1909 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2dda1909 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2dda1909 Branch: refs/heads/KYLIN-242 Commit: 2dda190927fd808310b76b78594bffddd4e33fef Parents: 2d5f725 Author: honma Authored: Mon Nov 30 11:17:14 2015 +0800 Committer: honma Committed: Mon Nov 30 11:17:14 2015 +0800 ---------------------------------------------------------------------- .../localmeta/cube/test_kylin_cube_topn.json | 10 - .../cube/test_kylin_cube_topn_left_join.json | 10 - .../localmeta/cube_desc/sample.json | 257 ------------------- .../cube_desc/test_kylin_cube_topn_desc.json | 148 ----------- .../test_kylin_cube_topn_left_join_desc.json | 149 ----------- .../test_kylin_cube_without_slr_desc.json | 3 +- ...t_kylin_cube_without_slr_left_join_desc.json | 3 +- 7 files changed, 2 insertions(+), 578 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/examples/test_case_data/localmeta/cube/test_kylin_cube_topn.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_topn.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_topn.json deleted file mode 100644 index 903fc15..0000000 --- a/examples/test_case_data/localmeta/cube/test_kylin_cube_topn.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "uuid" : "33354455-a33e-4b69-83dd-0bb8b1f8c53b", - "last_modified" : 0, - "name" : "test_kylin_cube_topn", - "owner" : null, - "version" : null, - "descriptor" : "test_kylin_cube_topn_desc", - "segments" : [ ], - "create_time" : null -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/examples/test_case_data/localmeta/cube/test_kylin_cube_topn_left_join.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_topn_left_join.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_topn_left_join.json deleted file mode 100644 index 6f57561..0000000 --- a/examples/test_case_data/localmeta/cube/test_kylin_cube_topn_left_join.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "uuid" : "44454455-a33e-4b69-83dd-0bb8b1f8c53b", - "last_modified" : 0, - "name" : "test_kylin_cube_topn_left_join", - "owner" : null, - "version" : null, - "descriptor" : "test_kylin_cube_topn_left_join_desc", - "segments" : [ ], - "create_time" : null -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/examples/test_case_data/localmeta/cube_desc/sample.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/sample.json b/examples/test_case_data/localmeta/cube_desc/sample.json deleted file mode 100644 index 9581b70..0000000 --- a/examples/test_case_data/localmeta/cube_desc/sample.json +++ /dev/null @@ -1,257 +0,0 @@ -{ - "uuid": "a24ca905-1fc6-4f67-985c-38fa5aeafd92", - "name": "test_kylin_cube_with_slr_desc", - "description": null, - "dimensions": [ - { - "name": "CAL_DT", - "table": "EDW.TEST_CAL_DT", - "column": null, - "derived": [ - "WEEK_BEG_DT" - ], - }, - { - "id": 1, - "name": "CATEGORY", - "table": "DEFAULT.TEST_CATEGORY_GROUPINGS", - "column": null, - "derived": [ - "USER_DEFINED_FIELD1", - "USER_DEFINED_FIELD3", - "UPD_DATE", - "UPD_USER" - ], - "hierarchy": false - }, - { - "id": 2, - "name": "CATEGORY_HIERARCHY", - "table": "DEFAULT.TEST_CATEGORY_GROUPINGS", - "column": [ - "META_CATEG_NAME", - "CATEG_LVL2_NAME", - "CATEG_LVL3_NAME" - ], - "derived": null, - "hierarchy": true - }, - { - "id": 3, - "name": "LSTG_FORMAT_NAME", - "table": "DEFAULT.TEST_KYLIN_FACT", - "column": [ - "LSTG_FORMAT_NAME" - ], - "derived": null, - "hierarchy": false - }, - { - "id": 4, - "name": "SITE_ID", - "table": "EDW.TEST_SITES", - "column": null, - "derived": [ - "SITE_NAME", - "CRE_USER" - ], - "hierarchy": false - }, - { - "id": 5, - "name": "SELLER_TYPE_CD", - "table": "EDW.TEST_SELLER_TYPE_DIM", - "column": null, - "derived": [ - "SELLER_TYPE_DESC" - ], - "hierarchy": false - }, - { - "id": 6, - "name": "SELLER_ID", - "table": "DEFAULT.TEST_KYLIN_FACT", - "column": [ - "SELLER_ID" - ], - "derived": null, - "hierarchy": false - } - ], - "measures": [ - { - "id": 1, - "name": "GMV_SUM", - "function": { - "expression": "SUM", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 2, - "name": "GMV_MIN", - "function": { - "expression": "MIN", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 3, - "name": "GMV_MAX", - "function": { - "expression": "MAX", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 4, - "name": "TRANS_CNT", - "function": { - "expression": "COUNT", - "parameter": { - "type": "constant", - "value": "1" - }, - "returntype": "bigint" - }, - "dependent_measure_ref": null - }, - { - "id": 5, - "name": "ITEM_COUNT_SUM", - "function": { - "expression": "SUM", - "parameter": { - "type": "column", - "value": "ITEM_COUNT" - }, - "returntype": "bigint" - }, - "dependent_measure_ref": null - } - ], - "rowkey": { - "rowkey_columns": [ - { - "column": "seller_id", - "length": 18, - "dictionary": null, - "mandatory": true - }, - { - "column": "cal_dt", - "length": 0, - "dictionary": "true", - "mandatory": false - }, - { - "column": "leaf_categ_id", - "length": 0, - "dictionary": "true", - "mandatory": false - }, - { - "column": "meta_categ_name", - "length": 0, - "dictionary": "true", - "mandatory": false - }, - { - "column": "categ_lvl2_name", - "length": 0, - "dictionary": "true", - "mandatory": false - }, - { - "column": "categ_lvl3_name", - "length": 0, - "dictionary": "true", - "mandatory": false - }, - { - "column": "lstg_format_name", - "length": 12, - "dictionary": null, - "mandatory": false - }, - { - "column": "lstg_site_id", - "length": 0, - "dictionary": "true", - "mandatory": false - }, - { - "column": "slr_segment_cd", - } - ], - "aggregation_groups": [ - { - "include": [ - "leaf_categ_id", - "meta_categ_name", - "categ_lvl2_name", - "categ_lvl3_name", - "cal_dt" - ], - "selective_rules": { - "hierarchy_dims": [ - [ - "meta_categ_name", - "categ_lvl2_name", - "categ_lvl3_name" - ] - ], - "mandatory_dims": [ - "mandatory" - ], - "joint_dims": [ - [ - "leaf_categ_id", - "cal_dt" - ] - ] - } - } - ] - }, - "last_modified": 1422435345330, - "model_name": "test_kylin_inner_join_model_desc", - "null_string": null, - "hbase_mapping": { - "column_family": [ - { - "name": "f1", - "columns": [ - { - "qualifier": "m", - "measure_refs": [ - "gmv_sum", - "gmv_min", - "gmv_max", - "trans_cnt", - "item_count_sum" - ] - } - ] - } - ] - }, - "notify_list": null, - "engine_type": 2, - "storage_type": 2 -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/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 deleted file mode 100644 index fddbb10..0000000 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_desc.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "uuid": "4334a905-1fc6-4f67-985c-38fa5aeafd92", - "name": "test_kylin_cube_topn_desc", - "description": null, - "dimensions": [ - { - "id": 0, - "name": "CAL_DT", - "table": "EDW.TEST_CAL_DT", - "column": null, - "derived": [ - "WEEK_BEG_DT" - ], - "hierarchy": false - } - ], - "measures": [ - { - "id": 1, - "name": "GMV_SUM", - "function": { - "expression": "SUM", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 2, - "name": "GMV_MIN", - "function": { - "expression": "MIN", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 3, - "name": "GMV_MAX", - "function": { - "expression": "MAX", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 4, - "name": "TRANS_CNT", - "function": { - "expression": "COUNT", - "parameter": { - "type": "constant", - "value": "1" - }, - "returntype": "bigint" - }, - "dependent_measure_ref": null - }, - { - "id": 5, - "name": "ITEM_COUNT_SUM", - "function": { - "expression": "SUM", - "parameter": { - "type": "column", - "value": "ITEM_COUNT" - }, - "returntype": "bigint" - }, - "dependent_measure_ref": null - }, - { - "id": 6, - "name": "TOP_SELLER", - "function": { - "expression": "TOP_N", - "parameter": { - "type": "column", - "value": "PRICE", - "displaycolumn": "SELLER_ID" - }, - "returntype": "topn(100)" - }, - "dependent_measure_ref": null - } - ], - "rowkey": { - "rowkey_columns": [ - { - "column": "cal_dt", - "length": 0, - "dictionary": "true", - "mandatory": false - } - ], - "aggregation_groups": [ - [ - "cal_dt" - ] - ] - }, - "last_modified": 1422435345330, - "model_name": "test_kylin_inner_join_model_desc", - "null_string": null, - "hbase_mapping": { - "column_family": [ - { - "name": "f1", - "columns": [ - { - "qualifier": "m", - "measure_refs": [ - "gmv_sum", - "gmv_min", - "gmv_max", - "trans_cnt", - "item_count_sum" - ] - } - ] - }, { - "name": "f2", - "columns": [ - { - "qualifier": "m", - "measure_refs": [ - "top_seller" - ] - } - ] - } - ] - }, - "notify_list": null, - "engine_type": 2, - "storage_type": 2 -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/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 deleted file mode 100644 index 6aecaae..0000000 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_topn_left_join_desc.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "uuid": "5445a905-1fc6-4f67-985c-38fa5aeafd92", - "name": "test_kylin_cube_topn_left_join_desc", - "description": null, - "dimensions": [ - { - "id": 0, - "name": "CAL_DT", - "table": "EDW.TEST_CAL_DT", - "column": null, - "derived": [ - "WEEK_BEG_DT" - ], - "hierarchy": false - } - ], - "measures": [ - { - "id": 1, - "name": "GMV_SUM", - "function": { - "expression": "SUM", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 2, - "name": "GMV_MIN", - "function": { - "expression": "MIN", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 3, - "name": "GMV_MAX", - "function": { - "expression": "MAX", - "parameter": { - "type": "column", - "value": "PRICE" - }, - "returntype": "decimal(19,4)" - }, - "dependent_measure_ref": null - }, - { - "id": 4, - "name": "TRANS_CNT", - "function": { - "expression": "COUNT", - "parameter": { - "type": "constant", - "value": "1" - }, - "returntype": "bigint" - }, - "dependent_measure_ref": null - }, - { - "id": 5, - "name": "ITEM_COUNT_SUM", - "function": { - "expression": "SUM", - "parameter": { - "type": "column", - "value": "ITEM_COUNT" - }, - "returntype": "bigint" - }, - "dependent_measure_ref": null - }, - { - "id": 6, - "name": "TOP_SELLER", - "function": { - "expression": "TOP_N", - "parameter": { - "type": "column", - "value": "PRICE", - "displaycolumn": "SELLER_ID" - }, - "returntype": "topn(100)" - }, - "dependent_measure_ref": null - } - ], - "rowkey": { - "rowkey_columns": [ - { - "column": "cal_dt", - "length": 0, - "dictionary": "true", - "mandatory": false - } - ], - "aggregation_groups": [ - [ - "cal_dt" - ] - ] - }, - "last_modified": 1422435345330, - "model_name": "test_kylin_left_join_model_desc", - "null_string": null, - "hbase_mapping": { - "column_family": [ - { - "name": "f1", - "columns": [ - { - "qualifier": "m", - "measure_refs": [ - "gmv_sum", - "gmv_min", - "gmv_max", - "trans_cnt", - "item_count_sum" - ] - } - ] - }, - { - "name": "f2", - "columns": [ - { - "qualifier": "m", - "measure_refs": [ - "top_seller" - ] - } - ] - } - ] - }, - "notify_list": null, - "engine_type": 2, - "storage_type": 2 -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/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 3f9957b..4c8b7a9 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 @@ -238,8 +238,7 @@ "leaf_categ_id", "meta_categ_name", "categ_lvl3_name", - "categ_lvl2_name", - "lstg_format_name" + "categ_lvl2_name" ] ] }, http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2dda1909/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 907e338..fafafda 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 @@ -238,8 +238,7 @@ "leaf_categ_id", "meta_categ_name", "categ_lvl3_name", - "categ_lvl2_name", - "lstg_format_name" + "categ_lvl2_name" ] ] },