Repository: kylin Updated Branches: refs/heads/KYLIN-2197 83a99ac99 -> 44334b467
KYLIN-2197 enhance test case Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/44334b46 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/44334b46 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/44334b46 Branch: refs/heads/KYLIN-2197 Commit: 44334b4676bb9ca9f48627c9a0c7643d7a864fb2 Parents: 83a99ac Author: Li Yang <[email protected]> Authored: Wed Nov 16 13:46:50 2016 +0800 Committer: Li Yang <[email protected]> Committed: Wed Nov 16 13:46:50 2016 +0800 ---------------------------------------------------------------------- .../kylin/cube/cuboid/CuboidSchedulerTest.java | 9 ++- .../localmeta/model_desc/ALL_LABEL.json | 76 ++++++++++++++++++++ .../localmeta/table/DEFAULT.DIM_KFPT_AREA.json | 18 +++++ .../table/DEFAULT.DIM_KFPT_IS_OR_NO.json | 18 +++++ .../table/DEFAULT.DIM_KFPT_PAY_MODE_CLASS.json | 18 +++++ .../table/DEFAULT.DIM_KFPT_PROVINCE.json | 18 +++++ .../table/DEFAULT.DIM_KFPT_SERVICE_TYPE.json | 18 +++++ 7 files changed, 174 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/core-cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java ---------------------------------------------------------------------- diff --git a/core-cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java b/core-cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java index 8dcbfcf..cb1d22f 100644 --- a/core-cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java +++ b/core-cube/src/test/java/org/apache/kylin/cube/cuboid/CuboidSchedulerTest.java @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import java.util.Arrays; import java.util.Collection; +import java.util.List; import org.apache.kylin.common.util.LocalFileMetadataTestCase; import org.apache.kylin.cube.CubeDescManager; @@ -286,7 +287,13 @@ public class CuboidSchedulerTest extends LocalFileMetadataTestCase { @Test public void testCuboid_onlyBaseCuboid() { CubeDesc cube = getCubeDescManager().getCubeDesc("ALL_LABEL_CU"); - CuboidCLI.simulateCuboidGeneration(cube, true); + CuboidScheduler scheduler = new CuboidScheduler(cube); + + Cuboid baseCuboid = Cuboid.getBaseCuboid(cube); + assertTrue(Cuboid.isValid(cube, baseCuboid.getId())); + + List<Long> spanningChild = scheduler.getSpanningCuboid(baseCuboid.getId()); + assertTrue(spanningChild.size() > 0); } public CubeDescManager getCubeDescManager() { http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/examples/test_case_data/localmeta/model_desc/ALL_LABEL.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/model_desc/ALL_LABEL.json b/examples/test_case_data/localmeta/model_desc/ALL_LABEL.json new file mode 100644 index 0000000..be937cd --- /dev/null +++ b/examples/test_case_data/localmeta/model_desc/ALL_LABEL.json @@ -0,0 +1,76 @@ +{ + "uuid" : "dd250ea4-27f7-4450-b604-fcfdf3578f5a", + "last_modified" : 1479206338080, + "version" : "1.6.0", + "name" : "ALL_LABEL", + "owner" : "ADMIN", + "description" : "", + "fact_table" : "DEFAULT.DM_CLJY_M_ALL_LABEL", + "lookups" : [ { + "table" : "DEFAULT.DIM_KFPT_IS_OR_NO", + "join" : { + "type" : "inner", + "primary_key" : [ "IS_ID" ], + "foreign_key" : [ "IS_DEV" ] + } + }, { + "table" : "DEFAULT.DIM_KFPT_SERVICE_TYPE", + "join" : { + "type" : "inner", + "primary_key" : [ "SERVICE_TYPE" ], + "foreign_key" : [ "SERVICE_TYPE" ] + } + }, { + "table" : "DEFAULT.DIM_KFPT_PAY_MODE_CLASS", + "join" : { + "type" : "inner", + "primary_key" : [ "PAY_MODE" ], + "foreign_key" : [ "PAY_MODE" ] + } + }, { + "table" : "DEFAULT.DIM_KFPT_AREA", + "join" : { + "type" : "inner", + "primary_key" : [ "AREA_ID" ], + "foreign_key" : [ "AREA_ID" ] + } + }, { + "table" : "DEFAULT.DIM_KFPT_PROVINCE", + "join" : { + "type" : "inner", + "primary_key" : [ "PROV_ID" ], + "foreign_key" : [ "PROV_ID" ] + } + } ], + "dimensions" : [ { + "table" : "DEFAULT.DM_CLJY_M_ALL_LABEL", + "columns" : [ "MONTH_ID", "PROV_ID", "AREA_ID", "SERVICE_TYPE", "PAY_MODE", "IS_INNET", "IS_DEV", "IS_BREAK", "IS_ACTIVE", "IS_LOWER_VALUE_USER", "PRODUCT_CLASS", "PRODUCT_CLASS_DESC", "PRODUCT_BASE_CLASS", "PRODUCT_BASE_CLASS_DESC", "USER_STATUS", "AGREE_EFF_DATE", "ACTIVITY_TYPE", "IS_CARD", "IS_THIS_ACCT", "IS_USE_4G", "IS_SNAPSHOT_USER", "IS_SNAPSHOT_USER_4GSJJS", "IS_SK", "SK_TYPE", "IS_HONOR", "IS_LOYAL", "IS_GROUP", "IS_YZDYH", "IS_SIM", "IS_SANWU", "IS_VIP_VALID", "IS_USIM", "IS_NEW_4G_SERV", "CUST_SEX", "CERT_AGE", "IS_YK", "IS_CRW", "SERVICE_TYPE_NEW", "CITY_DESC", "IS_ZHWJ", "IS_GXZH", "IS_ZF", "IS_WJT", "CHANNEL_ID", "CARD_TYPE", "CHANNEL_TYPE", "CHANNEL_NAME" ] + }, { + "table" : "DEFAULT.DIM_KFPT_SERVICE_TYPE", + "columns" : [ "SERVICE_TYPE", "SERVICE_TYPE_NAME" ] + }, { + "table" : "DEFAULT.DIM_KFPT_PAY_MODE_CLASS", + "columns" : [ "PAY_MODE", "PAY_MODE_DESC" ] + }, { + "table" : "DEFAULT.DIM_KFPT_AREA", + "columns" : [ "AREA_ID", "AREA_NAME" ] + }, { + "table" : "DEFAULT.DIM_KFPT_PROVINCE", + "columns" : [ "PROV_ID", "PROV_NAME" ] + }, { + "table" : "DEFAULT.DIM_KFPT_IS_OR_NO", + "columns" : [ "IS_ID", "IS_NAME" ] + } ], + "metrics" : [ "ACCT_FEE", "RENT_FEE", "FUNC_FEE", "OT_FIX_FEE", "LOCAL_VOICE_FEE", "LONG_VOICE_FEE", "ROAM_VOICE_FEE", "OT_VOICE_FEE" ], + "filter_condition" : "", + "partition_desc" : { + "partition_date_column" : "DEFAULT.DM_CLJY_M_ALL_LABEL.YEAR_MONTH", + "partition_time_column" : null, + "partition_date_start" : 0, + "partition_date_format" : "yyyyMMdd", + "partition_time_format" : "HH:mm:ss", + "partition_type" : "APPEND", + "partition_condition_builder" : "org.apache.kylin.metadata.model.PartitionDesc$DefaultPartitionConditionBuilder" + }, + "capacity" : "MEDIUM" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_AREA.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_AREA.json b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_AREA.json new file mode 100644 index 0000000..99e5a82 --- /dev/null +++ b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_AREA.json @@ -0,0 +1,18 @@ +{ + "uuid" : "d26050ed-0eef-4936-82d2-ec1f62e3b192", + "last_modified" : 1479110202081, + "version" : "1.6.0", + "name" : "DIM_KFPT_AREA", + "columns" : [ { + "id" : "1", + "name" : "AREA_ID", + "datatype" : "varchar(256)" + }, { + "id" : "2", + "name" : "AREA_NAME", + "datatype" : "varchar(256)" + } ], + "source_type" : 0, + "table_type" : "MANAGED_TABLE", + "database" : "DEFAULT" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_IS_OR_NO.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_IS_OR_NO.json b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_IS_OR_NO.json new file mode 100644 index 0000000..e5a9a80 --- /dev/null +++ b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_IS_OR_NO.json @@ -0,0 +1,18 @@ +{ + "uuid" : "78360d4d-3a18-4ad1-a53d-f2088120af69", + "last_modified" : 1479202716006, + "version" : "1.6.0", + "name" : "DIM_KFPT_IS_OR_NO", + "columns" : [ { + "id" : "1", + "name" : "IS_ID", + "datatype" : "varchar(256)" + }, { + "id" : "2", + "name" : "IS_NAME", + "datatype" : "varchar(256)" + } ], + "source_type" : 0, + "table_type" : "MANAGED_TABLE", + "database" : "DEFAULT" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PAY_MODE_CLASS.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PAY_MODE_CLASS.json b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PAY_MODE_CLASS.json new file mode 100644 index 0000000..e17f072 --- /dev/null +++ b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PAY_MODE_CLASS.json @@ -0,0 +1,18 @@ +{ + "uuid" : "57c648fc-b61f-4eb9-a500-915d9623ba7f", + "last_modified" : 1479204510227, + "version" : "1.6.0", + "name" : "DIM_KFPT_PAY_MODE_CLASS", + "columns" : [ { + "id" : "1", + "name" : "PAY_MODE", + "datatype" : "varchar(256)" + }, { + "id" : "2", + "name" : "PAY_MODE_DESC", + "datatype" : "varchar(256)" + } ], + "source_type" : 0, + "table_type" : "MANAGED_TABLE", + "database" : "DEFAULT" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PROVINCE.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PROVINCE.json b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PROVINCE.json new file mode 100644 index 0000000..160899c --- /dev/null +++ b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_PROVINCE.json @@ -0,0 +1,18 @@ +{ + "uuid" : "1eb877f3-0b05-44b4-b42d-3a8d68bf9739", + "last_modified" : 1479110992359, + "version" : "1.6.0", + "name" : "DIM_KFPT_PROVINCE", + "columns" : [ { + "id" : "1", + "name" : "PROV_ID", + "datatype" : "varchar(256)" + }, { + "id" : "2", + "name" : "PROV_NAME", + "datatype" : "varchar(256)" + } ], + "source_type" : 0, + "table_type" : "MANAGED_TABLE", + "database" : "DEFAULT" +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/44334b46/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_SERVICE_TYPE.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_SERVICE_TYPE.json b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_SERVICE_TYPE.json new file mode 100644 index 0000000..1fee37f --- /dev/null +++ b/examples/test_case_data/localmeta/table/DEFAULT.DIM_KFPT_SERVICE_TYPE.json @@ -0,0 +1,18 @@ +{ + "uuid" : "1a4f6222-578b-4182-b55d-8c0d1df6925d", + "last_modified" : 1479202708971, + "version" : "1.6.0", + "name" : "DIM_KFPT_SERVICE_TYPE", + "columns" : [ { + "id" : "1", + "name" : "SERVICE_TYPE", + "datatype" : "varchar(256)" + }, { + "id" : "2", + "name" : "SERVICE_TYPE_NAME", + "datatype" : "varchar(256)" + } ], + "source_type" : 0, + "table_type" : "MANAGED_TABLE", + "database" : "DEFAULT" +} \ No newline at end of file
