This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this
push:
new 6279025 KYLIN-4828 Fix kylin4 disabled sql in IT
6279025 is described below
commit 6279025a017a26b76100106a789a694a112fca62
Author: yaqian.zhang <[email protected]>
AuthorDate: Fri Dec 18 10:49:12 2020 +0800
KYLIN-4828 Fix kylin4 disabled sql in IT
---
.../{query02.sql.disabled => query02.sql} | 8 ++-
.../{query06.sql.disabled => query06.sql} | 5 +-
.../{query08.sql.disabled => query08.sql} | 3 +-
.../{query08.sql.disabled => query09.sql} | 18 ++++---
.../query/sql_tableau/query09.sql.disabled | 57 ----------------------
.../{query22.sql.disabled => query22.sql} | 10 ++--
6 files changed, 25 insertions(+), 76 deletions(-)
diff --git a/kylin-it/src/test/resources/query/sql_ordinal/query02.sql.disabled
b/kylin-it/src/test/resources/query/sql_ordinal/query02.sql
similarity index 87%
rename from kylin-it/src/test/resources/query/sql_ordinal/query02.sql.disabled
rename to kylin-it/src/test/resources/query/sql_ordinal/query02.sql
index ea068f1..9ff34d4 100644
--- a/kylin-it/src/test/resources/query/sql_ordinal/query02.sql.disabled
+++ b/kylin-it/src/test/resources/query/sql_ordinal/query02.sql
@@ -20,8 +20,6 @@ SELECT "TEST_KYLIN_FACT"."CAL_DT",
SUM("TEST_KYLIN_FACT"."PRICE") AS "sum_PRICE_
SELECT COUNT(1) AS "XTableau_join_flag",
SUM("TEST_KYLIN_FACT"."PRICE") AS "X__alias__A", "TEST_KYLIN_FACT"."CAL_DT"
AS "none_CAL_DT_ok" FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
GROUP BY 3 ORDER BY 2 DESC LIMIT 7 )
"t0" ON
- CASE WHEN 1 = 1
- THEN ("TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok")
- ELSE "TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok"
- END
- GROUP BY 1 ;
+ "TEST_KYLIN_FACT"."CAL_DT" = "t0"."none_CAL_DT_ok"
+ GROUP BY 1
+;{"scanRowCount":1462,"scanBytes":0,"scanFiles":2,"cuboidId":[262144, 262144]}
diff --git
a/kylin-it/src/test/resources/query/sql_snowflake/query06.sql.disabled
b/kylin-it/src/test/resources/query/sql_snowflake/query06.sql
similarity index 89%
rename from kylin-it/src/test/resources/query/sql_snowflake/query06.sql.disabled
rename to kylin-it/src/test/resources/query/sql_snowflake/query06.sql
index eade6df..1a81f75 100644
--- a/kylin-it/src/test/resources/query/sql_snowflake/query06.sql.disabled
+++ b/kylin-it/src/test/resources/query/sql_snowflake/query06.sql
@@ -18,7 +18,7 @@
SELECT
-BUYER_ACCOUNT.ACCOUNT_ID, BUYER_ACCOUNT.ACCOUNT_CONTACT, count(*) as cnt,
sum(price) as sum_price
+BUYER_ACCOUNT.ACCOUNT_ID, BUYER_ACCOUNT.ACCOUNT_COUNTRY, count(*) as cnt,
sum(price) as sum_price
FROM TEST_KYLIN_FACT as TEST_KYLIN_FACT
INNER JOIN TEST_ORDER as TEST_ORDER
@@ -36,4 +36,5 @@ ON SELLER_ACCOUNT.ACCOUNT_COUNTRY = SELLER_COUNTRY.COUNTRY
where BUYER_ACCOUNT.ACCOUNT_BUYER_LEVEL > 2 and SELLER_COUNTRY.NAME = 'France'
and CAL_DT > '2013-01-01'
-group by BUYER_ACCOUNT.ACCOUNT_ID, BUYER_ACCOUNT.ACCOUNT_CONTACT ;
\ No newline at end of file
+group by BUYER_ACCOUNT.ACCOUNT_ID, BUYER_ACCOUNT.ACCOUNT_COUNTRY
+;{"scanRowCount":10000,"scanBytes":0,"scanFiles":1,"cuboidId":[2097151]}
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query08.sql.disabled
b/kylin-it/src/test/resources/query/sql_tableau/query08.sql
similarity index 90%
copy from kylin-it/src/test/resources/query/sql_tableau/query08.sql.disabled
copy to kylin-it/src/test/resources/query/sql_tableau/query08.sql
index c2fc675..73d7447 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query08.sql.disabled
+++ b/kylin-it/src/test/resources/query/sql_tableau/query08.sql
@@ -19,6 +19,7 @@
-- LEAF_CATEG_ID is a join field on fact table, but no on cuboid. We really
support this?
SELECT "TEST_KYLIN_FACT"."LEAF_CATEG_ID" AS "NONE_LEAF_CATEG_ID_OK"
-FROM "olap"."TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
+FROM "TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
GROUP BY "TEST_KYLIN_FACT"."LEAF_CATEG_ID"
+;{"scanRowCount":144,"scanBytes":0,"scanFiles":1,"cuboidId":[245760]}
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query08.sql.disabled
b/kylin-it/src/test/resources/query/sql_tableau/query09.sql
similarity index 56%
rename from kylin-it/src/test/resources/query/sql_tableau/query08.sql.disabled
rename to kylin-it/src/test/resources/query/sql_tableau/query09.sql
index c2fc675..03ab833 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query08.sql.disabled
+++ b/kylin-it/src/test/resources/query/sql_tableau/query09.sql
@@ -16,9 +16,15 @@
-- limitations under the License.
--
--- LEAF_CATEG_ID is a join field on fact table, but no on cuboid. We really
support this?
-
-SELECT "TEST_KYLIN_FACT"."LEAF_CATEG_ID" AS "NONE_LEAF_CATEG_ID_OK"
-FROM "olap"."TEST_KYLIN_FACT" "TEST_KYLIN_FACT"
-GROUP BY "TEST_KYLIN_FACT"."LEAF_CATEG_ID"
-
+SELECT
+ "TEST_CATEGORY_GROUPINGS"."CATEG_LVL2_NAME" AS "CATEG_LVLC_NAME",
+ "TEST_CATEGORY_GROUPINGS"."CATEG_LVL3_NAME" AS "CATEG_LVLD_NAME",
+ "TEST_CATEGORY_GROUPINGS"."META_CATEG_NAME" AS "META_CATEG_NAME",
+ 1 AS "Number_of_Records",
+ "TEST_CATEGORY_GROUPINGS"."UPD_DATE" AS "UPD_DATE",
+ "TEST_CATEGORY_GROUPINGS"."UPD_USER" AS "UPD_USER",
+ "TEST_CATEGORY_GROUPINGS"."USER_DEFINED_FIELD1" AS "USER_DEFINED_FIELDB",
+ "TEST_CATEGORY_GROUPINGS"."USER_DEFINED_FIELD3" AS "USER_DEFINED_FIELDD"
+FROM "TEST_CATEGORY_GROUPINGS" "TEST_CATEGORY_GROUPINGS"
+LIMIT 10000
+;{"scanRowCount":144,"scanBytes":0,"scanFiles":1,"cuboidId":[-1]}
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query09.sql.disabled
b/kylin-it/src/test/resources/query/sql_tableau/query09.sql.disabled
deleted file mode 100644
index 6b6ad41..0000000
--- a/kylin-it/src/test/resources/query/sql_tableau/query09.sql.disabled
+++ /dev/null
@@ -1,57 +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 "TEST_CATEGORY_GROUPINGS"."ADULT_CATEG_YN" AS "ADULT_CATEG_YN",
- "TEST_CATEGORY_GROUPINGS"."BSNS_VRTCL_NAME" AS "BSNS_VRTCL_NAME",
- "TEST_CATEGORY_GROUPINGS"."CATEG_BUSN_MGR" AS "CATEG_BUSN_MGR",
- "TEST_CATEGORY_GROUPINGS"."CATEG_BUSN_UNIT" AS "CATEG_BUSN_UNIT",
- "TEST_CATEGORY_GROUPINGS"."CATEG_FLAGS" AS "CATEG_FLAGS",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL2_ID" AS "CATEG_LVLC_ID",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL2_NAME" AS "CATEG_LVLC_NAME",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL3_ID" AS "CATEG_LVLD_ID",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL3_NAME" AS "CATEG_LVLD_NAME",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL4_ID" AS "CATEG_LVLE_ID",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL4_NAME" AS "CATEG_LVLE_NAME",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL5_ID" AS "CATEG_LVLF_ID",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL5_NAME" AS "CATEG_LVLF_NAME",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL6_ID" AS "CATEG_LVLG_ID",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL6_NAME" AS "CATEG_LVLG_NAME",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL7_ID" AS "CATEG_LVLH_ID",
- "TEST_CATEGORY_GROUPINGS"."CATEG_LVL7_NAME" AS "CATEG_LVLH_NAME",
- "TEST_CATEGORY_GROUPINGS"."CRE_DATE" AS "CRE_DATE",
- "TEST_CATEGORY_GROUPINGS"."CRE_USER" AS "CRE_USER",
- "TEST_CATEGORY_GROUPINGS"."DOMAIN_ID" AS "DOMAIN_ID",
- "TEST_CATEGORY_GROUPINGS"."GCS_ID" AS "GCS_ID",
- "TEST_CATEGORY_GROUPINGS"."LEAF_CATEG_ID" AS "LEAF_CATEG_ID",
- "TEST_CATEGORY_GROUPINGS"."LEAF_CATEG_NAME" AS "LEAF_CATEG_NAME",
- "TEST_CATEGORY_GROUPINGS"."META_CATEG_ID" AS "META_CATEG_ID",
- "TEST_CATEGORY_GROUPINGS"."META_CATEG_NAME" AS "META_CATEG_NAME",
- "TEST_CATEGORY_GROUPINGS"."MOVE_TO" AS "MOVE_TO",
- 1 AS "Number_of_Records",
- "TEST_CATEGORY_GROUPINGS"."REGN_CATEG" AS "REGN_CATEG",
- "TEST_CATEGORY_GROUPINGS"."SAP_CATEGORY_ID" AS "SAP_CATEGORY_ID",
- "TEST_CATEGORY_GROUPINGS"."SITE_ID" AS "SITE_ID",
- "TEST_CATEGORY_GROUPINGS"."SRC_ID" AS "SRC_ID",
- "TEST_CATEGORY_GROUPINGS"."UPD_DATE" AS "UPD_DATE",
- "TEST_CATEGORY_GROUPINGS"."UPD_USER" AS "UPD_USER",
- "TEST_CATEGORY_GROUPINGS"."USER_DEFINED_FIELD1" AS "USER_DEFINED_FIELDB",
- "TEST_CATEGORY_GROUPINGS"."USER_DEFINED_FIELD3" AS "USER_DEFINED_FIELDD",
- "TEST_CATEGORY_GROUPINGS"."USER_DEFINED_FIELD5" AS "USER_DEFINED_FIELDF",
- "TEST_CATEGORY_GROUPINGS"."VCS_ID" AS "VCS_ID"
-FROM "olap"."TEST_CATEGORY_GROUPINGS" "TEST_CATEGORY_GROUPINGS"
-LIMIT 10000
diff --git a/kylin-it/src/test/resources/query/sql_tableau/query22.sql.disabled
b/kylin-it/src/test/resources/query/sql_tableau/query22.sql
similarity index 75%
rename from kylin-it/src/test/resources/query/sql_tableau/query22.sql.disabled
rename to kylin-it/src/test/resources/query/sql_tableau/query22.sql
index 17ec731..7c1315c 100644
--- a/kylin-it/src/test/resources/query/sql_tableau/query22.sql.disabled
+++ b/kylin-it/src/test/resources/query/sql_tableau/query22.sql
@@ -15,14 +15,14 @@
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
-
-select fact.cal_dt, sum(fact.price) from test_kylin_fact fact
-left join test_cal_dt cal
+select fact.cal_dt, sum(fact.price) from test_kylin_fact fact
+left join "EDW"."TEST_CAL_DT" cal
on fact.cal_dt=cal.cal_dt
inner join
(
- select test_kylin_fact.cal_dt, count(1) from test_kylin_fact left join
test_cal_dt
- on test_kylin_fact.cal_dt=test_cal_dt.cal_dt group by
test_kylin_fact.cal_dt order by 2 desc limit 2
+ select test_kylin_fact.cal_dt, count(1) from test_kylin_fact left join
"EDW"."TEST_CAL_DT"
+ on test_kylin_fact.cal_dt="EDW"."TEST_CAL_DT"."CAL_DT" group by
test_kylin_fact.cal_dt order by 2 desc limit 2
) cal_2
on fact.cal_dt = cal_2.cal_dt
group by fact.cal_dt
+;{"scanRowCount":2924,"scanBytes":0,"scanFiles":4,"cuboidId":[262144, 262144]}
