From 029ed60ab86980d0364c2010c55197cda4688244 Mon Sep 17 00:00:00 2001 From: shaofengshi Date: Tue, 2 Dec 2014 18:08:44 +0800 Subject: [PATCH] Move test json file from metadata module to cube module. --- cube/src/test/resources/data/TEST1_desc.json | 23 +++++------------ cube/src/test/resources/data/TEST2_desc.json | 38 +++++----------------------- cube/src/test/resources/data/TEST3_desc.json | 24 +++++------------- 3 files changed, 21 insertions(+), 64 deletions(-) diff --git a/cube/src/test/resources/data/TEST1_desc.json b/cube/src/test/resources/data/TEST1_desc.json index 175b105..082a3cf 100644 --- a/cube/src/test/resources/data/TEST1_desc.json +++ b/cube/src/test/resources/data/TEST1_desc.json @@ -2,6 +2,7 @@ "uuid" : "9c53506d-d7b9-4ad4-b3b1-53ea42673c4b", "last_modified" : 1401429176099, "name" : "TEST1_desc", + "model_name": "TEST1_model_desc", "fact_table" : "TEST_KYLIN_FACT", "dimensions" : [ { "id" : 1, @@ -13,8 +14,7 @@ }, "hierarchy" : null, "table" : "TEST_CAL_DT", - "column" : "CAL_DT", - "datatype" : "date", + "column" : ["TEST_CAL_DT.CAL_DT"], "derived" : [ "WEEK_BEG_DT" ] }, { "id" : 2, @@ -24,18 +24,9 @@ "primary_key" : [ "LEAF_CATEG_ID", "SITE_ID" ], "foreign_key" : [ "LEAF_CATEG_ID", "LSTG_SITE_ID" ] }, - "hierarchy" : [ { - "level" : "1", - "column" : "META_CATEG_NAME" - }, { - "level" : "2", - "column" : "CATEG_LVL2_NAME" - }, { - "level" : "3", - "column" : "CATEG_LVL3_NAME" - } ], + "hierarchy" : true, "table" : "TEST_CATEGORY_GROUPINGS", - "column" : null, + "column" : ["TEST_CATEGORY_GROUPINGS.META_CATEG_NAME", "TEST_CATEGORY_GROUPINGS.CATEG_LVL2_NAME", "TEST_CATEGORY_GROUPINGS.CATEG_LVL3_NAME"], "datatype" : null, "derived" : null }, { @@ -44,7 +35,7 @@ "join" : null, "hierarchy" : null, "table" : "TEST_KYLIN_FACT", - "column" : "LSTG_FORMAT_NAME", + "column" : ["TEST_KYLIN_FACT.LSTG_FORMAT_NAME"], "datatype" : "string", "derived" : null }, { @@ -57,7 +48,7 @@ }, "hierarchy" : null, "table" : "TEST_SITES", - "column" : "SITE_ID", + "column" : ["TEST_SITES.SITE_ID"], "datatype" : "string", "derived" : [ "SITE_NAME", "CRE_USER" ] }, { @@ -70,7 +61,7 @@ }, "hierarchy" : null, "table" : "TEST_SELLER_TYPE_DIM", - "column" : "SELLER_TYPE_CD", + "column" : ["TEST_SELLER_TYPE_DIM.SELLER_TYPE_CD"], "datatype" : "string", "derived" : [ "SELLER_TYPE_DESC" ] } ], diff --git a/cube/src/test/resources/data/TEST2_desc.json b/cube/src/test/resources/data/TEST2_desc.json index 81bde27..90bd806 100644 --- a/cube/src/test/resources/data/TEST2_desc.json +++ b/cube/src/test/resources/data/TEST2_desc.json @@ -1,20 +1,12 @@ { "uuid" : "9c53506d-d7b9-4ad4-b3b1-53ea42673c4b", "last_modified" : 1401429176099, + "model_name": "TEST2_model_desc", "name" : "TEST2_desc", - "fact_table" : "TEST_KYLIN_FACT", "dimensions" : [ { - "id" : 1, "name" : "CAL_DT", - "join" : { - "type" : "inner", - "primary_key" : [ "CAL_DT" ], - "foreign_key" : [ "CAL_DT" ] - }, "hierarchy" : null, - "table" : "TEST_CAL_DT", - "column" : "CAL_DT", - "datatype" : "date", + "column" : ["TEST_CAL_DT.CAL_DT"], "derived" : [ "WEEK_BEG_DT" ] }, { "id" : 2, @@ -24,28 +16,15 @@ "primary_key" : [ "LEAF_CATEG_ID", "SITE_ID" ], "foreign_key" : [ "LEAF_CATEG_ID", "LSTG_SITE_ID" ] }, - "hierarchy" : [ { - "level" : "1", - "column" : "META_CATEG_NAME" - }, { - "level" : "2", - "column" : "CATEG_LVL2_NAME" - }, { - "level" : "3", - "column" : "CATEG_LVL3_NAME" - } ], - "table" : "TEST_CATEGORY_GROUPINGS", - "column" : null, - "datatype" : null, + "hierarchy" : true, + "column" : ["TEST_CATEGORY_GROUPINGS.META_CATEG_NAME", "TEST_CATEGORY_GROUPINGS.CATEG_LVL2_NAME", "TEST_CATEGORY_GROUPINGS.CATEG_LVL3_NAME"], "derived" : null }, { "id" : 3, "name" : "LSTG_FORMAT_NAME", - "join" : null, "hierarchy" : null, "table" : "TEST_KYLIN_FACT", - "column" : "LSTG_FORMAT_NAME", - "datatype" : "string", + "column" : ["TEST_KYLIN_FACT.LSTG_FORMAT_NAME"], "derived" : null }, { "id" : 4, @@ -56,9 +35,7 @@ "foreign_key" : [ "LSTG_SITE_ID" ] }, "hierarchy" : null, - "table" : "TEST_SITES", - "column" : "SITE_ID", - "datatype" : "string", + "column" : ["TEST_SITES.SITE_ID"], "derived" : [ "SITE_NAME", "CRE_USER" ] }, { "id" : 5, @@ -70,8 +47,7 @@ }, "hierarchy" : null, "table" : "TEST_SELLER_TYPE_DIM", - "column" : "SELLER_TYPE_CD", - "datatype" : "string", + "column" : ["TEST_SELLER_TYPE_DIM.SELLER_TYPE_CD"], "derived" : [ "SELLER_TYPE_DESC" ] } ], "measures" : [ { diff --git a/cube/src/test/resources/data/TEST3_desc.json b/cube/src/test/resources/data/TEST3_desc.json index df4d60b..4b0836b 100644 --- a/cube/src/test/resources/data/TEST3_desc.json +++ b/cube/src/test/resources/data/TEST3_desc.json @@ -2,7 +2,7 @@ "uuid" : "9c53506d-d7b9-4ad4-b3b1-53ea42673c4b", "last_modified" : 1401429176099, "name" : "TEST1_desc", - "fact_table" : "TEST_KYLIN_FACT", + "model_name": "TEST1_model_desc", "dimensions" : [ { "id" : 1, "name" : "CAL_DT", @@ -13,7 +13,7 @@ }, "hierarchy" : null, "table" : "TEST_CAL_DT", - "column" : "CAL_DT", + "column" : ["TEST_CAL_DT.CAL_DT"], "datatype" : "date", "derived" : [ "WEEK_BEG_DT" ] }, { @@ -24,19 +24,9 @@ "primary_key" : [ "LEAF_CATEG_ID", "SITE_ID" ], "foreign_key" : [ "LEAF_CATEG_ID", "LSTG_SITE_ID" ] }, - "hierarchy" : [ { - "level" : "1", - "column" : "META_CATEG_NAME" - }, { - "level" : "2", - "column" : "CATEG_LVL2_NAME" - }, { - "level" : "3", - "column" : "CATEG_LVL3_NAME" - } ], + "hierarchy" : true, "table" : "TEST_CATEGORY_GROUPINGS", - "column" : null, - "datatype" : null, + "column" : ["TEST_CATEGORY_GROUPINGS.META_CATEG_NAME", "TEST_CATEGORY_GROUPINGS.CATEG_LVL2_NAME", "TEST_CATEGORY_GROUPINGS.CATEG_LVL3_NAME"], "derived" : null }, { "id" : 3, @@ -44,7 +34,7 @@ "join" : null, "hierarchy" : null, "table" : "TEST_KYLIN_FACT", - "column" : "LSTG_FORMAT_NAME", + "column" : ["TEST_KYLIN_FACT.LSTG_FORMAT_NAME"], "datatype" : "string", "derived" : null }, { @@ -57,7 +47,7 @@ }, "hierarchy" : null, "table" : "TEST_SITES", - "column" : "SITE_ID", + "column" : ["TEST_SITES.SITE_ID"], "datatype" : "string", "derived" : [ "SITE_NAME", "CRE_USER" ] }, { @@ -70,7 +60,7 @@ }, "hierarchy" : null, "table" : "TEST_SELLER_TYPE_DIM", - "column" : "SELLER_TYPE_CD", + "column" : ["TEST_SELLER_TYPE_DIM.SELLER_TYPE_CD"], "datatype" : "string", "derived" : [ "SELLER_TYPE_DESC" ] } ],