Repository: kylin Updated Branches: refs/heads/master b7600f87c -> f1042bf01
minor, refine sample cube metadata Signed-off-by: Yang Li <liy...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f1042bf0 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f1042bf0 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f1042bf0 Branch: refs/heads/master Commit: f1042bf012d292c98e0d0506c10dfa0f1b2f6b7d Parents: b7600f8 Author: Roger Shi <rogershijich...@hotmail.com> Authored: Sun Nov 13 17:31:21 2016 +0800 Committer: Yang Li <liy...@apache.org> Committed: Sun Nov 13 19:14:03 2016 +0800 ---------------------------------------------------------------------- .../engine/mr/common/AbstractHadoopJob.java | 2 +- .../template/cube/kylin_sales_cube.json | 2 +- .../template/cube_desc/kylin_sales_cube.json | 199 +++++++++++++++++++ .../cube_desc/kylin_sales_cube_desc.json | 199 ------------------- 4 files changed, 201 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/f1042bf0/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java index 1fd1631..69387f8 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java @@ -237,7 +237,7 @@ public abstract class AbstractHadoopJob extends Configured implements Tool { logger.info("kafka jar file: " + kafkaClientJarPath); } catch (ClassNotFoundException e) { - logger.warn("Not found kafka client jar from classpath, it is optional for normal build: " + e); + logger.debug("Not found kafka client jar from classpath, it is optional for normal build: " + e); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/f1042bf0/examples/sample_cube/template/cube/kylin_sales_cube.json ---------------------------------------------------------------------- diff --git a/examples/sample_cube/template/cube/kylin_sales_cube.json b/examples/sample_cube/template/cube/kylin_sales_cube.json index 86042ba..3d6d299 100644 --- a/examples/sample_cube/template/cube/kylin_sales_cube.json +++ b/examples/sample_cube/template/cube/kylin_sales_cube.json @@ -4,7 +4,7 @@ "last_modified" : 0, "name" : "kylin_sales_cube", "owner" : null, - "descriptor" : "kylin_sales_cube_desc", + "descriptor" : "kylin_sales_cube", "status" : "DISABLED", "segments" : [ ], "create_time" : null, http://git-wip-us.apache.org/repos/asf/kylin/blob/f1042bf0/examples/sample_cube/template/cube_desc/kylin_sales_cube.json ---------------------------------------------------------------------- diff --git a/examples/sample_cube/template/cube_desc/kylin_sales_cube.json b/examples/sample_cube/template/cube_desc/kylin_sales_cube.json new file mode 100644 index 0000000..eb17922 --- /dev/null +++ b/examples/sample_cube/template/cube_desc/kylin_sales_cube.json @@ -0,0 +1,199 @@ +{ + "uuid" : "0ef9b7a8-3929-4dff-b59d-2100aadc8dbf", + "last_modified" : 1451468470824, + "name" : "kylin_sales_cube", + "model_name" : "kylin_sales_model", + "description" : null, + "null_string" : null, + "dimensions" : [ { + "name" : "CAL_DT", + "table" : "DEFAULT.KYLIN_CAL_DT", + "column" : "{FK}", + "derived" : [ "WEEK_BEG_DT" ] + }, { + "name" : "CATEGORY", + "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", + "column" : "{FK}", + "derived" : [ "USER_DEFINED_FIELD1", "USER_DEFINED_FIELD3" ] + }, { + "name" : "CATEGORY_HIERARCHY", + "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", + "column" : "META_CATEG_NAME", + "derived" : null + }, { + "name" : "CATEGORY_HIERARCHY", + "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", + "column" : "CATEG_LVL2_NAME", + "derived" : null + }, { + "name" : "CATEGORY_HIERARCHY", + "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", + "column" : "CATEG_LVL3_NAME", + "derived" : null + }, { + "name" : "LSTG_FORMAT_NAME", + "table" : "DEFAULT.KYLIN_SALES", + "column" : "LSTG_FORMAT_NAME", + "derived" : null + }, { + "name" : "USER_ID", + "table" : "DEFAULT.KYLIN_SALES", + "column" : "USER_ID", + "derived" : null + }, { + "name" : "REGION", + "table" : "DEFAULT.KYLIN_SALES", + "column" : "REGION", + "derived" : null + } ], + "measures" : [ { + "name" : "GMV_SUM", + "function" : { + "expression" : "SUM", + "parameter" : { + "type" : "column", + "value" : "PRICE", + "next_parameter" : null + }, + "returntype" : "decimal(19,4)" + }, + "dependent_measure_ref" : null + }, { + "name" : "GMV_MIN", + "function" : { + "expression" : "MIN", + "parameter" : { + "type" : "column", + "value" : "PRICE", + "next_parameter" : null + }, + "returntype" : "decimal(19,4)" + }, + "dependent_measure_ref" : null + }, { + "name" : "GMV_MAX", + "function" : { + "expression" : "MAX", + "parameter" : { + "type" : "column", + "value" : "PRICE", + "next_parameter" : null + }, + "returntype" : "decimal(19,4)" + }, + "dependent_measure_ref" : null + }, { + "name" : "TRANS_CNT", + "function" : { + "expression" : "COUNT", + "parameter" : { + "type" : "constant", + "value" : "1", + "next_parameter" : null + }, + "returntype" : "bigint" + }, + "dependent_measure_ref" : null + }, { + "name" : "SELLER_CNT_HLL", + "function" : { + "expression" : "COUNT_DISTINCT", + "parameter" : { + "type" : "column", + "value" : "SELLER_ID", + "next_parameter" : null + }, + "returntype" : "hllc(10)" + }, + "dependent_measure_ref" : null + }, { + "name" : "SELLER_FORMAT_CNT", + "function" : { + "expression" : "COUNT_DISTINCT", + "parameter" : { + "type" : "column", + "value" : "LSTG_FORMAT_NAME", + "next_parameter" : null + }, + "returntype" : "hllc(10)" + }, + "dependent_measure_ref" : null + }, { + "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)" + }, + "dependent_measure_ref" : null + } ], + "rowkey" : { + "rowkey_columns" : [ { + "column" : "PART_DT", + "encoding" : "dict" + }, { + "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" : "LSTG_FORMAT_NAME", + "encoding" : "fixed_length:12" + }, { + "column" : "USER_ID", + "encoding" : "dict" + }, { + "column" : "REGION", + "encoding" : "dict" + }, { + "column" : "LSTG_SITE_ID", + "encoding" : "dict" + } ] + }, + "hbase_mapping" : { + "column_family" : [ { + "name" : "F1", + "columns" : [ { + "qualifier" : "M", + "measure_refs" : [ "GMV_SUM", "GMV_MIN", "GMV_MAX", "TRANS_CNT", "TOP_SELLER" ] + } ] + }, { + "name" : "F2", + "columns" : [ { + "qualifier" : "M", + "measure_refs" : [ "SELLER_CNT_HLL", "SELLER_FORMAT_CNT" ] + } ] + } ] + }, + "aggregation_groups" : [ { + "includes" : [ "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "META_CATEG_NAME", "PART_DT" ], + "select_rule" : { + "hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME" ] ], + "mandatory_dims" : [ ], + "joint_dims" : [ ] + } + } ], + "notify_list" : null, + "status_need_notify" : [ ], + "partition_date_start" : 1325376000000, + "auto_merge_time_ranges" : null, + "retention_range" : 0, + "engine_type" : %default_engine_type%, + "storage_type" : %default_storage_type%, + "override_kylin_properties" : { } +} http://git-wip-us.apache.org/repos/asf/kylin/blob/f1042bf0/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json ---------------------------------------------------------------------- diff --git a/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json b/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json deleted file mode 100644 index 3e9bff4..0000000 --- a/examples/sample_cube/template/cube_desc/kylin_sales_cube_desc.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "uuid" : "0ef9b7a8-3929-4dff-b59d-2100aadc8dbf", - "last_modified" : 1451468470824, - "name" : "kylin_sales_cube_desc", - "model_name" : "kylin_sales_model", - "description" : null, - "null_string" : null, - "dimensions" : [ { - "name" : "CAL_DT", - "table" : "DEFAULT.KYLIN_CAL_DT", - "column" : "{FK}", - "derived" : [ "WEEK_BEG_DT" ] - }, { - "name" : "CATEGORY", - "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", - "column" : "{FK}", - "derived" : [ "USER_DEFINED_FIELD1", "USER_DEFINED_FIELD3" ] - }, { - "name" : "CATEGORY_HIERARCHY", - "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", - "column" : "META_CATEG_NAME", - "derived" : null - }, { - "name" : "CATEGORY_HIERARCHY", - "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", - "column" : "CATEG_LVL2_NAME", - "derived" : null - }, { - "name" : "CATEGORY_HIERARCHY", - "table" : "DEFAULT.KYLIN_CATEGORY_GROUPINGS", - "column" : "CATEG_LVL3_NAME", - "derived" : null - }, { - "name" : "LSTG_FORMAT_NAME", - "table" : "DEFAULT.KYLIN_SALES", - "column" : "LSTG_FORMAT_NAME", - "derived" : null - }, { - "name" : "USER_ID", - "table" : "DEFAULT.KYLIN_SALES", - "column" : "USER_ID", - "derived" : null - }, { - "name" : "REGION", - "table" : "DEFAULT.KYLIN_SALES", - "column" : "REGION", - "derived" : null - } ], - "measures" : [ { - "name" : "GMV_SUM", - "function" : { - "expression" : "SUM", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : null - }, - "returntype" : "decimal(19,4)" - }, - "dependent_measure_ref" : null - }, { - "name" : "GMV_MIN", - "function" : { - "expression" : "MIN", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : null - }, - "returntype" : "decimal(19,4)" - }, - "dependent_measure_ref" : null - }, { - "name" : "GMV_MAX", - "function" : { - "expression" : "MAX", - "parameter" : { - "type" : "column", - "value" : "PRICE", - "next_parameter" : null - }, - "returntype" : "decimal(19,4)" - }, - "dependent_measure_ref" : null - }, { - "name" : "TRANS_CNT", - "function" : { - "expression" : "COUNT", - "parameter" : { - "type" : "constant", - "value" : "1", - "next_parameter" : null - }, - "returntype" : "bigint" - }, - "dependent_measure_ref" : null - }, { - "name" : "SELLER_CNT_HLL", - "function" : { - "expression" : "COUNT_DISTINCT", - "parameter" : { - "type" : "column", - "value" : "SELLER_ID", - "next_parameter" : null - }, - "returntype" : "hllc(10)" - }, - "dependent_measure_ref" : null - }, { - "name" : "SELLER_FORMAT_CNT", - "function" : { - "expression" : "COUNT_DISTINCT", - "parameter" : { - "type" : "column", - "value" : "LSTG_FORMAT_NAME", - "next_parameter" : null - }, - "returntype" : "hllc(10)" - }, - "dependent_measure_ref" : null - }, { - "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)" - }, - "dependent_measure_ref" : null - } ], - "rowkey" : { - "rowkey_columns" : [ { - "column" : "PART_DT", - "encoding" : "dict" - }, { - "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" : "LSTG_FORMAT_NAME", - "encoding" : "fixed_length:12" - }, { - "column" : "USER_ID", - "encoding" : "dict" - }, { - "column" : "REGION", - "encoding" : "dict" - }, { - "column" : "LSTG_SITE_ID", - "encoding" : "dict" - } ] - }, - "hbase_mapping" : { - "column_family" : [ { - "name" : "F1", - "columns" : [ { - "qualifier" : "M", - "measure_refs" : [ "GMV_SUM", "GMV_MIN", "GMV_MAX", "TRANS_CNT", "TOP_SELLER" ] - } ] - }, { - "name" : "F2", - "columns" : [ { - "qualifier" : "M", - "measure_refs" : [ "SELLER_CNT_HLL", "SELLER_FORMAT_CNT" ] - } ] - } ] - }, - "aggregation_groups" : [ { - "includes" : [ "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "META_CATEG_NAME", "PART_DT" ], - "select_rule" : { - "hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME" ] ], - "mandatory_dims" : [ ], - "joint_dims" : [ ] - } - } ], - "notify_list" : null, - "status_need_notify" : [ ], - "partition_date_start" : 1325376000000, - "auto_merge_time_ranges" : null, - "retention_range" : 0, - "engine_type" : %default_engine_type%, - "storage_type" : %default_storage_type%, - "override_kylin_properties" : { } -}
