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 2016/04/29 07:49:25 UTC
kylin git commit: KYLIN-1077 fix a merge error
Repository: kylin
Updated Branches:
refs/heads/master 44c6fc9b8 -> dc2e1c23a
KYLIN-1077 fix a merge error
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/dc2e1c23
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/dc2e1c23
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/dc2e1c23
Branch: refs/heads/master
Commit: dc2e1c23affd4b609d2a8699965d025be5ddeb4c
Parents: 44c6fc9
Author: shaofengshi <sh...@apache.org>
Authored: Fri Apr 29 13:49:05 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Fri Apr 29 13:49:14 2016 +0800
----------------------------------------------------------------------
...test_kylin_cube_with_slr_left_join_desc.json | 61 --------------------
1 file changed, 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/dc2e1c23/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 e04cad0..608b9de 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
@@ -1,5 +1,4 @@
{
-<<<<<<< c80ccd010a9717b88c8d0e604e13e1e72e7783ba
"uuid": "bbbba905-1fc6-4f67-985c-38fa5aeafd92",
"name": "test_kylin_cube_with_slr_left_join_desc",
"description": null,
@@ -82,66 +81,6 @@
"next_parameter": null
},
"returntype": "decimal(19,4)"
-=======
- "uuid" : "bbbba905-1fc6-4f67-985c-38fa5aeafd92",
-
- "name" : "test_kylin_cube_with_slr_left_join_desc",
- "description" : null,
- "dimensions" : [ {
- "name" : "CAL_DT",
- "table" : "EDW.V_TEST_CAL_DT",
- "column" : "{FK}",
- "derived" : [ "WEEK_BEG_DT" ]
- }, {
- "name" : "CATEGORY",
- "table" : "DEFAULT.TEST_CATEGORY_GROUPINGS",
- "column" : "META_CATEG_NAME",
- "derived" : null
- }, {
- "name" : "CATEGORY",
- "table" : "DEFAULT.TEST_CATEGORY_GROUPINGS",
- "column" : "CATEG_LVL2_NAME",
- "derived" : null
- }, {
- "name" : "CATEGORY",
- "table" : "DEFAULT.TEST_CATEGORY_GROUPINGS",
- "column" : "CATEG_LVL3_NAME",
- "derived" : null
- }, {
- "name" : "CATEGORY_DERIVED",
- "table" : "DEFAULT.TEST_CATEGORY_GROUPINGS",
- "column" : "{FK}",
- "derived" : [ "USER_DEFINED_FIELD1", "USER_DEFINED_FIELD3", "UPD_DATE", "UPD_USER" ]
- }, {
- "name" : "LSTG_FORMAT_NAME",
- "table" : "DEFAULT.TEST_KYLIN_FACT",
- "column" : "LSTG_FORMAT_NAME",
- "derived" : null
- }, {
- "name" : "SITE_ID",
- "table" : "EDW.TEST_SITES",
- "column" : "{FK}",
- "derived" : [ "SITE_NAME", "CRE_USER" ]
- }, {
- "name" : "SELLER_TYPE_CD",
- "table" : "EDW.TEST_SELLER_TYPE_DIM",
- "column" : "{FK}",
- "derived" : [ "SELLER_TYPE_DESC" ]
- }, {
- "name" : "SELLER_ID",
- "table" : "DEFAULT.TEST_KYLIN_FACT",
- "column" : "SELLER_ID",
- "derived" : null
- } ],
- "measures" : [ {
- "name" : "GMV_SUM",
- "function" : {
- "expression" : "SUM",
- "parameter" : {
- "type" : "column",
- "value" : "PRICE",
- "next_parameter" : null
->>>>>>> KYLIN-1077 small change and cover it in integration test
},
"dependent_measure_ref": null
},