Repository: kylin Updated Branches: refs/heads/KYLIN-2314 523e6a7ff -> 9ef51f593
fix UT Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9ef51f59 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9ef51f59 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9ef51f59 Branch: refs/heads/KYLIN-2314 Commit: 9ef51f59388e2bf172878028dfc83f189e71e963 Parents: 523e6a7 Author: Yang Li <liy...@apache.org> Authored: Fri Dec 23 21:04:35 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Fri Dec 23 21:04:35 2016 +0800 ---------------------------------------------------------------------- .../localmeta/cube_desc/ci_inner_join_cube.json | 34 +-- .../localmeta/cube_desc/ci_left_join_cube.json | 34 +-- .../test_kylin_snowflake_sales_cube.json | 268 ------------------- 3 files changed, 34 insertions(+), 302 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9ef51f59/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json ---------------------------------------------------------------------- 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 204e09a..1ebd7f3 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 @@ -62,11 +62,11 @@ }, { "name" : "SELLER_BUYER_LEVEL", "table" : "SELLER_ACCOUNT", - "column" : "BUYER_LEVEL" + "column" : "ACCOUNT_BUYER_LEVEL" }, { "name" : "SELLER_SELLER_LEVEL", "table" : "SELLER_ACCOUNT", - "column" : "SELLER_LEVEL" + "column" : "ACCOUNT_SELLER_LEVEL" }, { "name" : "SELLER_COUNTRY", "table" : "SELLER_ACCOUNT", @@ -82,11 +82,11 @@ }, { "name" : "BUYER_BUYER_LEVEL", "table" : "BUYER_ACCOUNT", - "column" : "BUYER_LEVEL" + "column" : "ACCOUNT_BUYER_LEVEL" }, { "name" : "BUYER_SELLER_LEVEL", "table" : "BUYER_ACCOUNT", - "column" : "SELLER_LEVEL" + "column" : "ACCOUNT_SELLER_LEVEL" }, { "name" : "BUYER_COUNTRY", "table" : "BUYER_ACCOUNT", @@ -201,7 +201,7 @@ "expression" : "EXTENDED_COLUMN", "parameter": { "type": "column", - "value": "TEST_FACT_KYLIN.ORDER_ID", + "value": "TEST_KYLIN_FACT.ORDER_ID", "next_parameter": { "type": "column", "value": "TEST_ORDER.TEST_EXTENDED_COLUMN" @@ -313,10 +313,10 @@ "column" : "TEST_ORDER.BUYER_ID", "encoding" : "int:4" }, { - "column" : "BUYER_ACCOUNT.BUYER_LEVEL", + "column" : "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "encoding" : "dict" }, { - "column" : "BUYER_ACCOUNT.SELLER_LEVEL", + "column" : "BUYER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "encoding" : "dict" }, { "column" : "BUYER_ACCOUNT.ACCOUNT_COUNTRY", @@ -325,10 +325,10 @@ "column" : "BUYER_COUNTRY.NAME", "encoding" : "dict" }, { - "column" : "SELLER_ACCOUNT.BUYER_LEVEL", + "column" : "SELLER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "encoding" : "dict" }, { - "column" : "SELLER_ACCOUNT.SELLER_LEVEL", + "column" : "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "encoding" : "dict" }, { "column" : "SELLER_ACCOUNT.ACCOUNT_COUNTRY", @@ -392,8 +392,8 @@ "TEST_CATEGORY_GROUPINGS.CATEG_LVL3_NAME", "TEST_KYLIN_FACT.SELLER_ID", - "SELLER_ACCOUNT.BUYER_LEVEL", - "SELLER_ACCOUNT.SELLER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_COUNTRY.NAME", @@ -401,8 +401,8 @@ "TEST_ORDER.TEST_DATE_ENC", "TEST_ORDER.TEST_TIME_ENC", "TEST_ORDER.BUYER_ID", - "BUYER_ACCOUNT.BUYER_LEVEL", - "BUYER_ACCOUNT.SELLER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME" ], "select_rule" : { @@ -419,8 +419,8 @@ "TEST_KYLIN_FACT.SLR_SEGMENT_CD" ], [ "TEST_KYLIN_FACT.SELLER_ID", - "SELLER_ACCOUNT.BUYER_LEVEL", - "SELLER_ACCOUNT.SELLER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_COUNTRY.NAME" ], @@ -428,8 +428,8 @@ "TEST_ORDER.TEST_DATE_ENC", "TEST_ORDER.TEST_TIME_ENC", "TEST_ORDER.BUYER_ID", - "BUYER_ACCOUNT.BUYER_LEVEL", - "BUYER_ACCOUNT.SELLER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME" ] ] } http://git-wip-us.apache.org/repos/asf/kylin/blob/9ef51f59/examples/test_case_data/localmeta/cube_desc/ci_left_join_cube.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/ci_left_join_cube.json b/examples/test_case_data/localmeta/cube_desc/ci_left_join_cube.json index f3ccdda..4048b6e 100644 --- a/examples/test_case_data/localmeta/cube_desc/ci_left_join_cube.json +++ b/examples/test_case_data/localmeta/cube_desc/ci_left_join_cube.json @@ -62,11 +62,11 @@ }, { "name" : "SELLER_BUYER_LEVEL", "table" : "SELLER_ACCOUNT", - "column" : "BUYER_LEVEL" + "column" : "ACCOUNT_BUYER_LEVEL" }, { "name" : "SELLER_SELLER_LEVEL", "table" : "SELLER_ACCOUNT", - "column" : "SELLER_LEVEL" + "column" : "ACCOUNT_SELLER_LEVEL" }, { "name" : "SELLER_COUNTRY", "table" : "SELLER_ACCOUNT", @@ -82,11 +82,11 @@ }, { "name" : "BUYER_BUYER_LEVEL", "table" : "BUYER_ACCOUNT", - "column" : "BUYER_LEVEL" + "column" : "ACCOUNT_BUYER_LEVEL" }, { "name" : "BUYER_SELLER_LEVEL", "table" : "BUYER_ACCOUNT", - "column" : "SELLER_LEVEL" + "column" : "ACCOUNT_SELLER_LEVEL" }, { "name" : "BUYER_COUNTRY", "table" : "BUYER_ACCOUNT", @@ -201,7 +201,7 @@ "expression" : "EXTENDED_COLUMN", "parameter": { "type": "column", - "value": "TEST_FACT_KYLIN.ORDER_ID", + "value": "TEST_KYLIN_FACT.ORDER_ID", "next_parameter": { "type": "column", "value": "TEST_ORDER.TEST_EXTENDED_COLUMN" @@ -313,10 +313,10 @@ "column" : "TEST_ORDER.BUYER_ID", "encoding" : "int:4" }, { - "column" : "BUYER_ACCOUNT.BUYER_LEVEL", + "column" : "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "encoding" : "dict" }, { - "column" : "BUYER_ACCOUNT.SELLER_LEVEL", + "column" : "BUYER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "encoding" : "dict" }, { "column" : "BUYER_ACCOUNT.ACCOUNT_COUNTRY", @@ -325,10 +325,10 @@ "column" : "BUYER_COUNTRY.NAME", "encoding" : "dict" }, { - "column" : "SELLER_ACCOUNT.BUYER_LEVEL", + "column" : "SELLER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "encoding" : "dict" }, { - "column" : "SELLER_ACCOUNT.SELLER_LEVEL", + "column" : "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "encoding" : "dict" }, { "column" : "SELLER_ACCOUNT.ACCOUNT_COUNTRY", @@ -392,8 +392,8 @@ "TEST_CATEGORY_GROUPINGS.CATEG_LVL3_NAME", "TEST_KYLIN_FACT.SELLER_ID", - "SELLER_ACCOUNT.BUYER_LEVEL", - "SELLER_ACCOUNT.SELLER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_COUNTRY.NAME", @@ -401,8 +401,8 @@ "TEST_ORDER.TEST_DATE_ENC", "TEST_ORDER.TEST_TIME_ENC", "TEST_ORDER.BUYER_ID", - "BUYER_ACCOUNT.BUYER_LEVEL", - "BUYER_ACCOUNT.SELLER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME" ], "select_rule" : { @@ -419,8 +419,8 @@ "TEST_KYLIN_FACT.SLR_SEGMENT_CD" ], [ "TEST_KYLIN_FACT.SELLER_ID", - "SELLER_ACCOUNT.BUYER_LEVEL", - "SELLER_ACCOUNT.SELLER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_COUNTRY.NAME" ], @@ -428,8 +428,8 @@ "TEST_ORDER.TEST_DATE_ENC", "TEST_ORDER.TEST_TIME_ENC", "TEST_ORDER.BUYER_ID", - "BUYER_ACCOUNT.BUYER_LEVEL", - "BUYER_ACCOUNT.SELLER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", + "BUYER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME" ] ] } http://git-wip-us.apache.org/repos/asf/kylin/blob/9ef51f59/examples/test_case_data/localmeta/cube_desc/test_kylin_snowflake_sales_cube.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_snowflake_sales_cube.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_snowflake_sales_cube.json deleted file mode 100644 index ee0d68c..0000000 --- a/examples/test_case_data/localmeta/cube_desc/test_kylin_snowflake_sales_cube.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "uuid" : "0ef9b7a8-3929-4dff-b59d-2100aadc8dbf", - "last_modified" : 1451468470824, - "name" : "test_kylin_snowflake_sales_cube", - "model_name" : "test_kylin_snowflake_sales_model", - "description" : null, - "null_string" : null, - "dimensions" : [ { - "name" : "TRANS_ID", - "table" : "SNOWTEST.KYLIN_SALES", - "column" : "TRANS_ID", - "derived" : null - }, { - "name" : "CAL_DT", - "table" : "SNOWTEST.KYLIN_CAL_DT", - "column" : "{FK}", - "derived" : [ "WEEK_BEG_DT", "MONTH_BEG_DT", "YEAR_BEG_DT" ] - }, { - "name" : "CATEGORY", - "table" : "SNOWTEST.KYLIN_CATEGORY_GROUPINGS", - "column" : "{FK}", - "derived" : [ "USER_DEFINED_FIELD1", "USER_DEFINED_FIELD3" ] - }, { - "name" : "META_CATEG_NAME", - "table" : "SNOWTEST.KYLIN_CATEGORY_GROUPINGS", - "column" : "META_CATEG_NAME", - "derived" : null - }, { - "name" : "CATEG_LVL2_NAME", - "table" : "SNOWTEST.KYLIN_CATEGORY_GROUPINGS", - "column" : "CATEG_LVL2_NAME", - "derived" : null - }, { - "name" : "CATEG_LVL3_NAME", - "table" : "SNOWTEST.KYLIN_CATEGORY_GROUPINGS", - "column" : "CATEG_LVL3_NAME", - "derived" : null - }, { - "name" : "LSTG_FORMAT_NAME", - "table" : "SNOWTEST.KYLIN_SALES", - "column" : "LSTG_FORMAT_NAME", - "derived" : null - }, { - "name" : "SELLER_ID", - "table" : "SNOWTEST.KYLIN_SALES", - "column" : "SELLER_ID", - "derived" : null - }, { - "name" : "BUYER_ID", - "table" : "SNOWTEST.KYLIN_SALES", - "column" : "BUYER_ID", - "derived" : null - }, { - "name" : "ACCOUNT_BUYER_LEVEL", - "table" : "BUYER_ACCOUNT", - "column" : "ACCOUNT_BUYER_LEVEL", - "derived" : null - }, { - "name" : "ACCOUNT_SELLER_LEVEL", - "table" : "SELLER_ACCOUNT", - "column" : "ACCOUNT_SELLER_LEVEL", - "derived" : null - }, { - "name" : "BUYER_COUNTRY", - "table" : "BUYER_ACCOUNT", - "column" : "ACCOUNT_COUNTRY", - "derived" : null - }, { - "name" : "SELLER_COUNTRY", - "table" : "SELLER_ACCOUNT", - "column" : "ACCOUNT_COUNTRY", - "derived" : null - }, { - "name" : "BUYER_COUNTRY_NAME", - "table" : "BUYER_COUNTRY", - "column" : "NAME", - "derived" : null - }, { - "name" : "SELLER_COUNTRY_NAME", - "table" : "SELLER_COUNTRY", - "column" : "NAME", - "derived" : null - }, { - "name" : "OPS_USER_ID", - "table" : "SNOWTEST.KYLIN_SALES", - "column" : "OPS_USER_ID", - "derived" : null - }, { - "name" : "OPS_REGION", - "table" : "SNOWTEST.KYLIN_SALES", - "column" : "OPS_REGION", - "derived" : null - } ], - "measures" : [ { - "name" : "GMV_SUM", - "function" : { - "expression" : "SUM", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : null - }, - "returntype" : "decimal(19,4)" - } - }, { - "name" : "GMV_MIN", - "function" : { - "expression" : "MIN", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : null - }, - "returntype" : "decimal(19,4)" - } - }, { - "name" : "GMV_MAX", - "function" : { - "expression" : "MAX", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : null - }, - "returntype" : "decimal(19,4)" - } - }, { - "name" : "TRANS_CNT", - "function" : { - "expression" : "COUNT", - "parameter" : { - "type" : "constant", - "value" : "1", - "next_parameter" : null - }, - "returntype" : "bigint" - } - }, { - "name" : "SELLER_CNT_HLL", - "function" : { - "expression" : "COUNT_DISTINCT", - "parameter" : { - "type" : "column", - "value" : "SELLER_ID", - "next_parameter" : null - }, - "returntype" : "hllc(10)" - } - }, { - "name" : "TOP_SELLER", - "function" : { - "expression" : "TOP_N", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : { - "type" : "column", - "value" : "SELLER_ID", - "next_parameter" : null - } - }, - "returntype" : "topn(100)" - } - } ], - "rowkey" : { - "rowkey_columns" : [ { - "column" : "BUYER_ID", - "encoding" : "integer:4" - }, { - "column" : "SELLER_ID", - "encoding" : "integer:4" - }, { - "column" : "TRANS_ID", - "encoding" : "integer:4" - }, { - "column" : "PART_DT", - "encoding" : "date" - }, { - "column" : "LEAF_CATEG_ID", - "encoding" : "dict" - }, { - "column" : "META_CATEG_NAME", - "encoding" : "dict" - }, { - "column" : "CATEG_LVL2_NAME", - "encoding" : "dict" - }, { - "column" : "CATEG_LVL3_NAME", - "encoding" : "dict" - }, { - "column" : "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", - "encoding" : "dict" - }, { - "column" : "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", - "encoding" : "dict" - }, { - "column" : "BUYER_ACCOUNT.ACCOUNT_COUNTRY", - "encoding" : "dict" - }, { - "column" : "SELLER_ACCOUNT.ACCOUNT_COUNTRY", - "encoding" : "dict" - }, { - "column" : "BUYER_COUNTRY.NAME", - "encoding" : "dict" - }, { - "column" : "SELLER_COUNTRY.NAME", - "encoding" : "dict" - }, { - "column" : "LSTG_FORMAT_NAME", - "encoding" : "dict" - }, { - "column" : "LSTG_SITE_ID", - "encoding" : "dict" - }, { - "column" : "OPS_USER_ID", - "encoding" : "dict" - }, { - "column" : "OPS_REGION", - "encoding" : "dict" - } ] - }, - "hbase_mapping" : { - "column_family" : [ { - "name" : "F1", - "columns" : [ { - "qualifier" : "M", - "measure_refs" : [ "GMV_SUM", "GMV_MIN", "GMV_MAX", "TRANS_CNT" ] - } ] - }, { - "name" : "F2", - "columns" : [ { - "qualifier" : "M", - "measure_refs" : [ "SELLER_CNT_HLL", "TOP_SELLER" ] - } ] - } ] - }, - "aggregation_groups" : [ { - "includes" : [ "PART_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "OPS_USER_ID", "OPS_REGION", - "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME", "SELLER_COUNTRY.NAME" ], - "select_rule" : { - "hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID" ] ], - "mandatory_dims" : [ "PART_DT" ], - "joint_dims" : [ [ "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME" ], [ "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_COUNTRY.NAME" ], - [ "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL" ], [ "LSTG_FORMAT_NAME", "LSTG_SITE_ID" ], [ "OPS_USER_ID", "OPS_REGION" ] ] - } - }, { - "includes" : [ "TRANS_ID", "BUYER_ID", "SELLER_ID", - "PART_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "OPS_USER_ID", "OPS_REGION", - "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME", "SELLER_COUNTRY.NAME" ], - "select_rule" : { - "hierarchy_dims" : [ ], - "mandatory_dims" : [ "TRANS_ID", "BUYER_ID", "SELLER_ID", - "PART_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "OPS_USER_ID", "OPS_REGION", - "BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL", "SELLER_ACCOUNT.ACCOUNT_SELLER_LEVEL", "BUYER_ACCOUNT.ACCOUNT_COUNTRY", "SELLER_ACCOUNT.ACCOUNT_COUNTRY", "BUYER_COUNTRY.NAME", "SELLER_COUNTRY.NAME" ], - "joint_dims" : [ ] - } - } ], - "notify_list" : null, - "status_need_notify" : [ ], - "partition_date_start" : 1325376000000, - "auto_merge_time_ranges" : null, - "retention_range" : 0, - "engine_type" : 2, - "storage_type" : 2, - "override_kylin_properties" : { - "kylin.cube.aggrgroup.is-mandatory-only-valid" : "true" - } -}
