Repository: kylin Updated Branches: refs/heads/master 9dbc24bf3 -> f0fbffd58
http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_raw/query26.sql.disabled ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_raw/query26.sql.disabled b/kylin-it/src/test/resources/query/sql_raw/query26.sql.disabled deleted file mode 100644 index cab92d0..0000000 --- a/kylin-it/src/test/resources/query/sql_raw/query26.sql.disabled +++ /dev/null @@ -1,24 +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,LSTG_SITE_ID,SLR_SEGMENT_CD,test_kylin_fact.CAL_DT,test_category_groupings.LEAF_CATEG_ID,PRICE from test_kylin_fact inner JOIN edw.test_cal_dt as test_cal_dt - ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt - inner JOIN 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 - inner JOIN edw.test_sites as test_sites - ON test_kylin_fact.lstg_site_id = test_sites.site_id \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query00.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query00.sql b/kylin-it/src/test/resources/query/sql_tableau/query00.sql index 1092b97..218d9a1 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query00.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query00.sql @@ -18,6 +18,8 @@ select test_cal_dt.week_beg_dt, sum(test_kylin_fact.price) from test_kylin_fact - inner join edw.test_cal_dt as test_cal_dt ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt + inner join edw.test_cal_dt as test_cal_dt on test_kylin_fact.cal_dt = test_cal_dt.cal_dt + 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_cal_dt.week_beg_dt http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query10.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query10.sql b/kylin-it/src/test/resources/query/sql_tableau/query10.sql index cf43fa7..cc5ec14 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query10.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query10.sql @@ -20,4 +20,6 @@ SELECT "TEST_CAL_DT"."WEEK_BEG_DT" AS "none_WEEK_BEG_DT_nk", SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok" FROM "TEST_KYLIN_FACT" inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") + 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_CAL_DT"."WEEK_BEG_DT" http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query11.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query11.sql b/kylin-it/src/test/resources/query/sql_tableau/query11.sql index 7d908fd..6cfeed4 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query11.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query11.sql @@ -20,5 +20,7 @@ SELECT COUNT(1) AS cnt_ITEM_COUNT_ok, TEST_CAL_DT.WEEK_BEG_DT AS none_WEEK_BEG_DT_nk FROM "TEST_KYLIN_FACT" inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") + 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_CAL_DT"."WEEK_BEG_DT" http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query12.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query12.sql b/kylin-it/src/test/resources/query/sql_tableau/query12.sql index cf43fa7..cc5ec14 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query12.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query12.sql @@ -20,4 +20,6 @@ SELECT "TEST_CAL_DT"."WEEK_BEG_DT" AS "none_WEEK_BEG_DT_nk", SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_ok" FROM "TEST_KYLIN_FACT" inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") + 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_CAL_DT"."WEEK_BEG_DT" http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query13.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query13.sql b/kylin-it/src/test/resources/query/sql_tableau/query13.sql index e1b00d9..4e1faaf 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query13.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query13.sql @@ -19,4 +19,6 @@ SELECT EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT) AS yr_WEEK_BEG_DT_ok FROM TEST_KYLIN_FACT inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON (TEST_KYLIN_FACT.CAL_DT = TEST_CAL_DT.CAL_DT) + 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 EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT) http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query14.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query14.sql b/kylin-it/src/test/resources/query/sql_tableau/query14.sql index 50d8952..23c790c 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query14.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query14.sql @@ -16,4 +16,9 @@ -- limitations under the License. -- -SELECT QUARTER("TEST_CAL_DT"."WEEK_BEG_DT") AS "qr_WEEK_BEG_DT_ok", EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") AS "yr_WEEK_BEG_DT_ok" FROM "TEST_KYLIN_FACT" inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") GROUP BY QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") +SELECT QUARTER("TEST_CAL_DT"."WEEK_BEG_DT") AS "qr_WEEK_BEG_DT_ok", EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") AS "yr_WEEK_BEG_DT_ok" +FROM "TEST_KYLIN_FACT" +inner JOIN "EDW"."TEST_CAL_DT" AS "TEST_CAL_DT" ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") + 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 QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query15.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query15.sql b/kylin-it/src/test/resources/query/sql_tableau/query15.sql index 8f30460..198413c 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query15.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query15.sql @@ -19,4 +19,6 @@ SELECT QUARTER(TEST_CAL_DT.WEEK_BEG_DT) AS qr_WEEK_BEG_DT_ok FROM TEST_KYLIN_FACT inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON (TEST_KYLIN_FACT.CAL_DT = TEST_CAL_DT.CAL_DT) + 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 QUARTER(TEST_CAL_DT.WEEK_BEG_DT) http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query16.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query16.sql b/kylin-it/src/test/resources/query/sql_tableau/query16.sql index ad82c09..7140d8e 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query16.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query16.sql @@ -19,5 +19,7 @@ SELECT EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT) AS yr_WEEK_BEG_DT_ok, QUARTER(TEST_CAL_DT.WEEK_BEG_DT) AS qr_WEEK_BEG_DT_ok FROM TEST_KYLIN_FACT inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON (TEST_KYLIN_FACT.CAL_DT = TEST_CAL_DT.CAL_DT) + 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 EXTRACT(YEAR FROM TEST_CAL_DT.WEEK_BEG_DT), QUARTER(TEST_CAL_DT.WEEK_BEG_DT) http://git-wip-us.apache.org/repos/asf/kylin/blob/f0fbffd5/kylin-it/src/test/resources/query/sql_tableau/query17.sql ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/resources/query/sql_tableau/query17.sql b/kylin-it/src/test/resources/query/sql_tableau/query17.sql index 11f6df1..5944ff9 100644 --- a/kylin-it/src/test/resources/query/sql_tableau/query17.sql +++ b/kylin-it/src/test/resources/query/sql_tableau/query17.sql @@ -16,4 +16,9 @@ -- limitations under the License. -- -SELECT EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT") AS "mn_WEEK_BEG_DT_ok", (( EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")) AS "my_WEEK_BEG_DT_ok", QUARTER("TEST_CAL_DT"."WEEK_BEG_DT") AS "qr_WEEK_BEG_DT_ok", EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") AS "yr_WEEK_BEG_DT_ok" FROM "TEST_KYLIN_FACT" inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") GROUP BY EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT"), QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), (( EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")), EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT") +SELECT EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT") AS "mn_WEEK_BEG_DT_ok", (( EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")) AS "my_WEEK_BEG_DT_ok", QUARTER("TEST_CAL_DT"."WEEK_BEG_DT") AS "qr_WEEK_BEG_DT_ok", EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") AS "yr_WEEK_BEG_DT_ok" +FROM "TEST_KYLIN_FACT" +inner JOIN EDW.TEST_CAL_DT AS TEST_CAL_DT ON ("TEST_KYLIN_FACT"."CAL_DT" = "TEST_CAL_DT"."CAL_DT") + 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 EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT"), QUARTER("TEST_CAL_DT"."WEEK_BEG_DT"), (( EXTRACT(YEAR FROM "TEST_CAL_DT"."WEEK_BEG_DT") * 100) + EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")), EXTRACT(MONTH FROM "TEST_CAL_DT"."WEEK_BEG_DT")
