Repository: kylin Updated Branches: refs/heads/KYLIN-2310 [created] 320baf929
KYLIN-2310 Alter CI cube, add test for date/time encoding and extended column Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/320baf92 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/320baf92 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/320baf92 Branch: refs/heads/KYLIN-2310 Commit: 320baf929bd6fe517887c0960ab6e2df5aaa2394 Parents: c3bb878 Author: Li Yang <liy...@apache.org> Authored: Thu Dec 22 13:37:57 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Dec 22 13:37:57 2016 +0800 ---------------------------------------------------------------------- .../kylin/source/datagen/DataGenTest.java | 2 +- .../localmeta/cube_desc/ci_inner_join_cube.json | 31 +++++++++++++++----- .../localmeta/cube_desc/ci_left_join_cube.json | 31 +++++++++++++++----- .../model_desc/ci_inner_join_model.json | 8 +++-- .../model_desc/ci_left_join_model.json | 6 ++-- .../table/DEFAULT.TEST_KYLIN_FACT.json | 5 ---- .../localmeta/table/DEFAULT.TEST_ORDER.json | 15 ++++++++++ .../apache/kylin/query/ITKylinQueryTest.java | 10 +++++++ .../resources/query/sql_all_types/query00.sql | 19 ------------ .../resources/query/sql_all_types/query01.sql | 19 ------------ .../resources/query/sql_all_types/query02.sql | 19 ------------ .../resources/query/sql_all_types/query03.sql | 19 ------------ .../resources/query/sql_all_types/query04.sql | 19 ------------ .../resources/query/sql_all_types/query05.sql | 19 ------------ .../resources/query/sql_all_types/query06.sql | 19 ------------ .../resources/query/sql_all_types/query07.sql | 19 ------------ .../resources/query/sql_all_types/query08.sql | 19 ------------ .../resources/query/sql_all_types/query09.sql | 19 ------------ .../resources/query/sql_datetime/query00.sql | 14 +++++++++ .../query/sql_extended_column/query00.sql | 12 ++++++++ .../resources/query/sql_fast_common/query00.sql | 23 --------------- .../src/test/resources/query/sql_ii/query01.sql | 19 ------------ .../src/test/resources/query/sql_ii/query02.sql | 19 ------------ .../src/test/resources/query/sql_ii/query03.sql | 19 ------------ .../src/test/resources/query/sql_ii/query04.sql | 19 ------------ .../src/test/resources/query/sql_ii/query05.sql | 19 ------------ .../resources/query/sql_ii/query06.sql.disabled | 19 ------------ .../resources/query/sql_ii/query07.sql.disabled | 19 ------------ .../src/test/resources/query/sql_ii/query08.sql | 19 ------------ .../src/test/resources/query/sql_ii/query09.sql | 19 ------------ 30 files changed, 110 insertions(+), 408 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/core-metadata/src/test/java/org/apache/kylin/source/datagen/DataGenTest.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/test/java/org/apache/kylin/source/datagen/DataGenTest.java b/core-metadata/src/test/java/org/apache/kylin/source/datagen/DataGenTest.java index 82455ab..5e3ca9f 100644 --- a/core-metadata/src/test/java/org/apache/kylin/source/datagen/DataGenTest.java +++ b/core-metadata/src/test/java/org/apache/kylin/source/datagen/DataGenTest.java @@ -42,7 +42,7 @@ public class DataGenTest extends LocalFileMetadataTestCase { @Test public void testCIConfigured() throws IOException { - DataModelDesc model = getModel("test_kylin_inner_join_model_desc"); + DataModelDesc model = getModel("ci_inner_join_model"); ModelDataGenerator gen = new ModelDataGenerator(model, 100); gen.outprint = true; http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/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 48a051d..58e938a 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 @@ -4,15 +4,23 @@ "model_name" : "ci_inner_join_model", "description" : null, "dimensions" : [ { - "name" : "ORDER_ID", - "table" : "DEFAULT.TEST_KYLIN_FACT", - "column" : "ORDER_ID" - }, { "name" : "CAL_DT", "table" : "EDW.TEST_CAL_DT", "column" : "{FK}", "derived" : [ "WEEK_BEG_DT" ] }, { + "name" : "ORDER_ID", + "table" : "DEFAULT.TEST_KYLIN_FACT", + "column" : "ORDER_ID" + }, { + "name" : "TEST_DATE_ENC", + "table" : "DEFAULT.TEST_ORDER", + "column" : "TEST_DATE_ENC" + }, { + "name" : "TEST_TIME_ENC", + "table" : "DEFAULT.TEST_ORDER", + "column" : "TEST_TIME_ENC" + }, { "name" : "CATEGORY", "table" : "DEFAULT.TEST_CATEGORY_GROUPINGS", "column" : "{FK}", @@ -212,6 +220,12 @@ "column" : "CAL_DT", "encoding" : "dict" }, { + "column" : "TEST_TIME_ENC", + "encoding" : "time" + }, { + "column" : "TEST_DATE_ENC", + "encoding" : "date" + }, { "column" : "LEAF_CATEG_ID", "encoding" : "dict" }, { @@ -259,17 +273,20 @@ } ] }, "aggregation_groups" : [ { - "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ], + "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", + "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ], "select_rule" : { "hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID" ] ], "mandatory_dims" : [ ], "joint_dims" : [ [ "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ] ] } }, { - "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD", "SELLER_ID", "ORDER_ID" ], + "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", + "LSTG_SITE_ID", "SLR_SEGMENT_CD", "SELLER_ID", + "ORDER_ID", "TEST_DATE_ENC", "TEST_TIME_ENC" ], "select_rule" : { "hierarchy_dims" : [ ], - "mandatory_dims" : [ "CAL_DT", "SELLER_ID", "ORDER_ID" ], + "mandatory_dims" : [ "CAL_DT", "SELLER_ID", "ORDER_ID", "TEST_DATE_ENC", "TEST_TIME_ENC" ], "joint_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID" ], [ "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ] ] } } ], http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/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 df370f7..93c558e 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 @@ -4,15 +4,23 @@ "model_name" : "ci_left_join_model", "description" : null, "dimensions" : [ { - "name" : "ORDER_ID", - "table" : "DEFAULT.TEST_KYLIN_FACT", - "column" : "ORDER_ID" - }, { "name" : "CAL_DT", "table" : "EDW.TEST_CAL_DT", "column" : "{FK}", "derived" : [ "WEEK_BEG_DT" ] }, { + "name" : "ORDER_ID", + "table" : "DEFAULT.TEST_KYLIN_FACT", + "column" : "ORDER_ID" + }, { + "name" : "TEST_DATE_ENC", + "table" : "DEFAULT.TEST_ORDER", + "column" : "TEST_DATE_ENC" + }, { + "name" : "TEST_TIME_ENC", + "table" : "DEFAULT.TEST_ORDER", + "column" : "TEST_TIME_ENC" + }, { "name" : "CATEGORY", "table" : "DEFAULT.TEST_CATEGORY_GROUPINGS", "column" : "{FK}", @@ -212,6 +220,12 @@ "column" : "CAL_DT", "encoding" : "dict" }, { + "column" : "TEST_TIME_ENC", + "encoding" : "time" + }, { + "column" : "TEST_DATE_ENC", + "encoding" : "date" + }, { "column" : "LEAF_CATEG_ID", "encoding" : "dict" }, { @@ -259,17 +273,20 @@ } ] }, "aggregation_groups" : [ { - "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ], + "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", + "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ], "select_rule" : { "hierarchy_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID" ] ], "mandatory_dims" : [ ], "joint_dims" : [ [ "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ] ] } }, { - "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD", "SELLER_ID", "ORDER_ID" ], + "includes" : [ "CAL_DT", "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID", "LSTG_FORMAT_NAME", + "LSTG_SITE_ID", "SLR_SEGMENT_CD", "SELLER_ID", + "ORDER_ID", "TEST_DATE_ENC", "TEST_TIME_ENC" ], "select_rule" : { "hierarchy_dims" : [ ], - "mandatory_dims" : [ "CAL_DT", "SELLER_ID", "ORDER_ID" ], + "mandatory_dims" : [ "CAL_DT", "SELLER_ID", "ORDER_ID", "TEST_DATE_ENC", "TEST_TIME_ENC" ], "joint_dims" : [ [ "META_CATEG_NAME", "CATEG_LVL2_NAME", "CATEG_LVL3_NAME", "LEAF_CATEG_ID" ], [ "LSTG_FORMAT_NAME", "LSTG_SITE_ID", "SLR_SEGMENT_CD" ] ] } } ], http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json b/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json index cf6b56b..d37bb5f 100644 --- a/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json +++ b/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json @@ -78,14 +78,18 @@ "LSTG_SITE_ID", "LEAF_CATEG_ID", "SLR_SEGMENT_CD", - "SELLER_ID" + "SELLER_ID", + "TEST_COUNT_DISTINCT_BITMAP" ] }, { "table": "DEFAULT.TEST_ORDER", "columns": [ "ORDER_ID", - "BUYER_ID" + "BUYER_ID", + "TEST_DATE_ENC", + "TEST_TIME_ENC", + "TEST_EXTENDED_COLUMN" ] }, { http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/examples/test_case_data/localmeta/model_desc/ci_left_join_model.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/model_desc/ci_left_join_model.json b/examples/test_case_data/localmeta/model_desc/ci_left_join_model.json index a3088ec..e0f88a7 100644 --- a/examples/test_case_data/localmeta/model_desc/ci_left_join_model.json +++ b/examples/test_case_data/localmeta/model_desc/ci_left_join_model.json @@ -79,7 +79,6 @@ "LEAF_CATEG_ID", "SLR_SEGMENT_CD", "SELLER_ID", - "TEST_EXTENDED_COLUMN", "TEST_COUNT_DISTINCT_BITMAP" ] }, @@ -87,7 +86,10 @@ "table": "DEFAULT.TEST_ORDER", "columns": [ "ORDER_ID", - "BUYER_ID" + "BUYER_ID", + "TEST_DATE_ENC", + "TEST_TIME_ENC", + "TEST_EXTENDED_COLUMN" ] }, { http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/examples/test_case_data/localmeta/table/DEFAULT.TEST_KYLIN_FACT.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.TEST_KYLIN_FACT.json b/examples/test_case_data/localmeta/table/DEFAULT.TEST_KYLIN_FACT.json index 1aafaca..2b33e66 100644 --- a/examples/test_case_data/localmeta/table/DEFAULT.TEST_KYLIN_FACT.json +++ b/examples/test_case_data/localmeta/table/DEFAULT.TEST_KYLIN_FACT.json @@ -52,11 +52,6 @@ "data_gen" : "RAND" }, { "id" : "11", - "name" : "TEST_EXTENDED_COLUMN", - "datatype" : "string", - "data_gen" : "RAND" - }, { - "id" : "12", "name" : "TEST_COUNT_DISTINCT_BITMAP", "datatype" : "string", "data_gen" : "RAND" http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/examples/test_case_data/localmeta/table/DEFAULT.TEST_ORDER.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/table/DEFAULT.TEST_ORDER.json b/examples/test_case_data/localmeta/table/DEFAULT.TEST_ORDER.json index 05647e6..f157846 100644 --- a/examples/test_case_data/localmeta/table/DEFAULT.TEST_ORDER.json +++ b/examples/test_case_data/localmeta/table/DEFAULT.TEST_ORDER.json @@ -12,6 +12,21 @@ "name" : "BUYER_ID", "datatype" : "bigint", "data_gen" : "RAND||10000500|10001500" + }, { + "id" : "3", + "name" : "TEST_DATE_ENC", + "datatype" : "date", + "data_gen" : "RAND" + }, { + "id" : "4", + "name" : "TEST_TIME_ENC", + "datatype" : "timestamp", + "data_gen" : "RAND" + }, { + "id" : "5", + "name" : "TEST_EXTENDED_COLUMN", + "datatype" : "string", + "data_gen" : "RAND" } ], "database" : "DEFAULT", "last_modified" : 0 http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java index 227fa0a..868ec79 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java @@ -189,6 +189,16 @@ public class ITKylinQueryTest extends KylinTestBase { } @Test + public void testDateTimeQuery() throws Exception { + execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/sql_datetime", null, true); + } + + @Test + public void testExtendedColumnQuery() throws Exception { + execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/sql_extended_column", null, true); + } + + @Test public void testLikeQuery() throws Exception { execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/sql_like", null, true); } http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query00.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query00.sql b/kylin-it/src/test/resources/query/sql_all_types/query00.sql deleted file mode 100644 index 4680ae0..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query00.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_tinyint, sum(price) as GMV from test_kylin_fact group by ML_tinyint order by ML_tinyint http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query01.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query01.sql b/kylin-it/src/test/resources/query/sql_all_types/query01.sql deleted file mode 100644 index eb76210..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query01.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_smallint, sum(price) as GMV from test_kylin_fact group by ML_smallint order by ML_smallint http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query02.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query02.sql b/kylin-it/src/test/resources/query/sql_all_types/query02.sql deleted file mode 100644 index 40dcacf..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query02.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_int, sum(price) as GMV from test_kylin_fact group by ML_int order by ML_int http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query03.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query03.sql b/kylin-it/src/test/resources/query/sql_all_types/query03.sql deleted file mode 100644 index 325d250..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query03.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_bigint, sum(price) as GMV from test_kylin_fact group by ML_bigint order by ML_bigint http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query04.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query04.sql b/kylin-it/src/test/resources/query/sql_all_types/query04.sql deleted file mode 100644 index ea09698..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query04.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_float, sum(price) as GMV from test_kylin_fact group by ML_float order by ML_float http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query05.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query05.sql b/kylin-it/src/test/resources/query/sql_all_types/query05.sql deleted file mode 100644 index 84bca1b..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query05.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_double, sum(price) as GMV from test_kylin_fact group by ML_double order by ML_double http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query06.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query06.sql b/kylin-it/src/test/resources/query/sql_all_types/query06.sql deleted file mode 100644 index e8105ac..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query06.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_decimal, sum(price) as GMV from test_kylin_fact group by ML_decimal order by ML_decimal http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query07.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query07.sql b/kylin-it/src/test/resources/query/sql_all_types/query07.sql deleted file mode 100644 index 00083dd..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query07.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_boolean, sum(price) as GMV from test_kylin_fact group by ML_boolean order by ML_boolean http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query08.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query08.sql b/kylin-it/src/test/resources/query/sql_all_types/query08.sql deleted file mode 100644 index a10ef8a..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query08.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_varchar, sum(price) as GMV from test_kylin_fact group by ML_varchar order by ML_varchar http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_all_types/query09.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_all_types/query09.sql b/kylin-it/src/test/resources/query/sql_all_types/query09.sql deleted file mode 100644 index bd44d00..0000000 --- a/kylin-it/src/test/resources/query/sql_all_types/query09.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select ML_char, sum(price) as GMV from test_kylin_fact group by ML_char order by ML_char http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_datetime/query00.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_datetime/query00.sql b/kylin-it/src/test/resources/query/sql_datetime/query00.sql new file mode 100644 index 0000000..6577fe6 --- /dev/null +++ b/kylin-it/src/test/resources/query/sql_datetime/query00.sql @@ -0,0 +1,14 @@ +SELECT + +TEST_ORDER.ORDER_ID +,max(TEST_ORDER.TEST_TIME_ENC) +,max(TEST_ORDER.TEST_DATE_ENC) + +FROM TEST_KYLIN_FACT as TEST_KYLIN_FACT +INNER JOIN TEST_ORDER as TEST_ORDER +ON TEST_KYLIN_FACT.ORDER_ID = TEST_ORDER.ORDER_ID +INNER JOIN TEST_CATEGORY_GROUPINGS as TEST_CATEGORY_GROUPINGS +ON TEST_KYLIN_FACT.LEAF_CATEG_ID = TEST_CATEGORY_GROUPINGS.LEAF_CATEG_ID AND TEST_KYLIN_FACT.LSTG_SITE_ID = TEST_CATEGORY_GROUPINGS.SITE_ID + +group by TEST_ORDER.ORDER_ID +order by TEST_ORDER.ORDER_ID \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_extended_column/query00.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_extended_column/query00.sql b/kylin-it/src/test/resources/query/sql_extended_column/query00.sql new file mode 100644 index 0000000..03d96c9 --- /dev/null +++ b/kylin-it/src/test/resources/query/sql_extended_column/query00.sql @@ -0,0 +1,12 @@ +SELECT + +TEST_ORDER.ORDER_ID +,TEST_EXTENDED_COLUMN + +FROM TEST_KYLIN_FACT as TEST_KYLIN_FACT +INNER JOIN TEST_ORDER as TEST_ORDER +ON TEST_KYLIN_FACT.ORDER_ID = TEST_ORDER.ORDER_ID +INNER JOIN TEST_CATEGORY_GROUPINGS as TEST_CATEGORY_GROUPINGS +ON TEST_KYLIN_FACT.LEAF_CATEG_ID = TEST_CATEGORY_GROUPINGS.LEAF_CATEG_ID AND TEST_KYLIN_FACT.LSTG_SITE_ID = TEST_CATEGORY_GROUPINGS.SITE_ID + +group by TEST_ORDER.ORDER_ID,TEST_EXTENDED_COLUMN http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_fast_common/query00.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_fast_common/query00.sql b/kylin-it/src/test/resources/query/sql_fast_common/query00.sql deleted file mode 100644 index 36249a8..0000000 --- a/kylin-it/src/test/resources/query/sql_fast_common/query00.sql +++ /dev/null @@ -1,23 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select lstg_format_name, cal_dt, - sum(price) as GMV, - count(1) as TRANS_CNT - from test_kylin_fact - group by lstg_format_name, cal_dt http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query01.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query01.sql b/kylin-it/src/test/resources/query/sql_ii/query01.sql deleted file mode 100644 index be187f5..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query01.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select count(*) as all_count from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query02.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query02.sql b/kylin-it/src/test/resources/query/sql_ii/query02.sql deleted file mode 100644 index eb52d11..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query02.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select sum(price) as price_sum, min(price) as price_min, max(price) as price_max from test_kylin_fact http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query03.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query03.sql b/kylin-it/src/test/resources/query/sql_ii/query03.sql deleted file mode 100644 index d20efec..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query03.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select sum(price) as price_sum, min(price) as price_min , max(price) as price_max , LSTG_FORMAT_NAME from test_kylin_fact group by LSTG_FORMAT_NAME http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query04.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query04.sql b/kylin-it/src/test/resources/query/sql_ii/query04.sql deleted file mode 100644 index 4a75fba..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query04.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select TRANS_ID,CAL_DT,LSTG_FORMAT_NAME,LEAF_CATEG_ID,LSTG_SITE_ID,SLR_SEGMENT_CD,PRICE,SELLER_ID from test_kylin_fact where LSTG_FORMAT_NAME = 'ABIN' http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query05.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query05.sql b/kylin-it/src/test/resources/query/sql_ii/query05.sql deleted file mode 100644 index 4043a2c..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query05.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select sum(price) as price_sum, min(price) as price_min , max(price) as price_max , SELLER_ID from test_kylin_fact where SELLER_ID > 10000149 group by SELLER_ID http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query06.sql.disabled ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query06.sql.disabled b/kylin-it/src/test/resources/query/sql_ii/query06.sql.disabled deleted file mode 100644 index f97f440..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query06.sql.disabled +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select price from test_kylin_fact where price > 50 http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query07.sql.disabled ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query07.sql.disabled b/kylin-it/src/test/resources/query/sql_ii/query07.sql.disabled deleted file mode 100644 index 0471a47..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query07.sql.disabled +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select sum(price) as price_sum, min(price) as price_min , max(price) as price_max , LSTG_FORMAT_NAME from test_kylin_fact where price > 50 group by LSTG_FORMAT_NAME http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query08.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query08.sql b/kylin-it/src/test/resources/query/sql_ii/query08.sql deleted file mode 100644 index 51a676d..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query08.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select TRANS_ID,CAL_DT,LSTG_FORMAT_NAME,LEAF_CATEG_ID,LSTG_SITE_ID,SLR_SEGMENT_CD,PRICE,SELLER_ID from test_kylin_fact where LSTG_FORMAT_NAME > 'ABIN' http://git-wip-us.apache.org/repos/asf/kylin/blob/320baf92/kylin-it/src/test/resources/query/sql_ii/query09.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_ii/query09.sql b/kylin-it/src/test/resources/query/sql_ii/query09.sql deleted file mode 100644 index 1562288..0000000 --- a/kylin-it/src/test/resources/query/sql_ii/query09.sql +++ /dev/null @@ -1,19 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -select price, SELLER_ID from test_kylin_fact where SELLER_ID > 10000149
