From 8794f7b1950b6763f216d09afb446aeaa7630fa5 Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 23 Sep 2024 17:39:37 +0800 Subject: [PATCH] [fix](external-p2) ignore external p2 cases --- .../es/test_external_catalog_es.groovy | 5 + .../hive/test_cloud_accessible_obs.groovy | 6 + .../hive/test_cloud_accessible_oss.groovy | 7 + .../hive/test_external_brown.groovy | 5 + .../test_external_catalog_glue_table.groovy | 7 + .../hive/test_external_github.groovy | 5 + .../hive/test_external_yandex.groovy | 87 ---------- .../hive/test_external_yandex_nereids.groovy | 5 + .../hive/test_hive_hudi.groovy | 6 + .../hive/test_hive_hudi_statistics.groovy | 6 + .../hive/test_hive_partition_statistic.groovy | 5 + .../hive/test_hive_statistic_cache.groovy | 6 + .../hive/test_hive_statistic_sample.groovy | 5 + .../hive/test_hive_write_insert_s3.groovy | 6 + .../hive/test_select_count_optimize.groovy | 7 + .../hive/test_upper_case_column_name.groovy | 6 + .../hive/test_viewfs_hive.groovy | 5 + .../hudi/test_hudi_timetravel.groovy | 6 + .../mysql/test_external_catalog_mysql.groovy | 6 + .../mysql/test_external_resource_mysql.groovy | 6 + ...est_external_resource_mysql_nereids.groovy | 156 ------------------ .../pg/test_external_pg.groovy | 133 --------------- .../pg/test_external_pg_nereids.groovy | 6 + .../tvf/test_iceberg_meta.groovy | 9 +- 24 files changed, 124 insertions(+), 377 deletions(-) delete mode 100644 regression-test/suites/external_table_p2/hive/test_external_yandex.groovy delete mode 100644 regression-test/suites/external_table_p2/mysql/test_external_resource_mysql_nereids.groovy delete mode 100644 regression-test/suites/external_table_p2/pg/test_external_pg.groovy diff --git a/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy index 19ea7d675db75d..5412bc736c7956 100644 --- a/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy +++ b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy @@ -16,6 +16,11 @@ // under the License. //import org.postgresql.Driver suite("test_external_catalog_es", "p2,external,es,external_remote,external_remote_es") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableExternalEsTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { diff --git a/regression-test/suites/external_table_p2/hive/test_cloud_accessible_obs.groovy b/regression-test/suites/external_table_p2/hive/test_cloud_accessible_obs.groovy index b475088bd5615b..c70bb08c02e8ff 100644 --- a/regression-test/suites/external_table_p2/hive/test_cloud_accessible_obs.groovy +++ b/regression-test/suites/external_table_p2/hive/test_cloud_accessible_obs.groovy @@ -16,6 +16,12 @@ // under the License. suite("test_cloud_accessible_obs", "p2,external,hive,external_remote,external_remote_hive") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableObjStorageTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_cloud_accessible_oss.groovy b/regression-test/suites/external_table_p2/hive/test_cloud_accessible_oss.groovy index d7319a7ed087b0..d43ecaebaf96fa 100644 --- a/regression-test/suites/external_table_p2/hive/test_cloud_accessible_oss.groovy +++ b/regression-test/suites/external_table_p2/hive/test_cloud_accessible_oss.groovy @@ -16,6 +16,13 @@ // under the License. suite("test_cloud_accessible_oss", "p2,external,hive,external_remote,external_remote_hive") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableObjStorageTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_external_brown.groovy b/regression-test/suites/external_table_p2/hive/test_external_brown.groovy index 5ac400be648245..02cc1c1ff10549 100644 --- a/regression-test/suites/external_table_p2/hive/test_external_brown.groovy +++ b/regression-test/suites/external_table_p2/hive/test_external_brown.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_external_brown", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } def formats = ["_parquet", "_orc", ""] def CPUNetworkUtilization_order = """ diff --git a/regression-test/suites/external_table_p2/hive/test_external_catalog_glue_table.groovy b/regression-test/suites/external_table_p2/hive/test_external_catalog_glue_table.groovy index 5b3edd44c78905..ecb37208cf256e 100644 --- a/regression-test/suites/external_table_p2/hive/test_external_catalog_glue_table.groovy +++ b/regression-test/suites/external_table_p2/hive/test_external_catalog_glue_table.groovy @@ -16,6 +16,13 @@ // under the License. suite("test_external_catalog_glue_table", "p2,external,hive,external_remote,external_remote_hive") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_external_github.groovy b/regression-test/suites/external_table_p2/hive/test_external_github.groovy index edd8e9436c2aa5..2d456b9845543f 100644 --- a/regression-test/suites/external_table_p2/hive/test_external_github.groovy +++ b/regression-test/suites/external_table_p2/hive/test_external_github.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_external_github", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } def formats = ["_parquet", "_orc"] diff --git a/regression-test/suites/external_table_p2/hive/test_external_yandex.groovy b/regression-test/suites/external_table_p2/hive/test_external_yandex.groovy deleted file mode 100644 index 05f635945f1342..00000000000000 --- a/regression-test/suites/external_table_p2/hive/test_external_yandex.groovy +++ /dev/null @@ -1,87 +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. - -suite("test_external_yandex", "p2,external,hive,external_remote,external_remote_hive") { - - def formats = ["_parquet", "_orc", ""] - def duplicateAggregationKeys = "SELECT URL, EventDate, max(URL) FROM hitsSUFFIX WHERE CounterID = 1704509 AND UserID = 4322253409885123546 GROUP BY URL, EventDate, EventDate ORDER BY URL, EventDate;" - def like1 = """SELECT count() FROM hitsSUFFIX WHERE URL LIKE '%/avtomobili_s_probegom/_%__%__%__%';""" - def like2 = """SELECT count() FROM hitsSUFFIX WHERE URL LIKE '/avtomobili_s_probegom/_%__%__%__%';""" - def like3 = """SELECT count() FROM hitsSUFFIX WHERE URL LIKE '%_/avtomobili_s_probegom/_%__%__%__%';""" - def like4 = """SELECT count() FROM hitsSUFFIX WHERE URL LIKE '%avtomobili%';""" - def loyalty = """SELECT loyalty, count() AS c - FROM - ( - SELECT UserID, CAST(((if(yandex > google, yandex / (yandex + google), 0 - google / (yandex + google))) * 10) AS TINYINT) AS loyalty - FROM - ( - SELECT UserID, sum(if(SearchEngineID = 2, 1, 0)) AS yandex, sum(if(SearchEngineID = 3, 1, 0)) AS google - FROM hitsSUFFIX - WHERE SearchEngineID = 2 OR SearchEngineID = 3 GROUP BY UserID HAVING yandex + google > 10 - ) t1 - ) t2 - GROUP BY loyalty - ORDER BY loyalty;""" - def maxStringIf = """SELECT CounterID, count(), max(if(SearchPhrase != "", SearchPhrase, "")) FROM hitsSUFFIX GROUP BY CounterID ORDER BY count() DESC LIMIT 20;""" - def minMax = """SELECT CounterID, min(WatchID), max(WatchID) FROM hitsSUFFIX GROUP BY CounterID ORDER BY count() DESC LIMIT 20;""" - def monotonicEvaluationSegfault = """SELECT max(0) FROM visitsSUFFIX WHERE (CAST(CAST(StartDate AS DATETIME) AS INT)) > 1000000000;""" - def subqueryInWhere = """SELECT count() FROM hitsSUFFIX WHERE UserID IN (SELECT UserID FROM hitsSUFFIX WHERE CounterID = 800784);""" - def where01 = """SELECT CounterID, count(distinct UserID) FROM hitsSUFFIX WHERE 0 != 0 GROUP BY CounterID;""" - def where02 = """SELECT CounterID, count(distinct UserID) FROM hitsSUFFIX WHERE CAST(0 AS BOOLEAN) AND CounterID = 1704509 GROUP BY CounterID;""" - - String enabled = context.config.otherConfigs.get("enableExternalHiveTest") - if (enabled != null && enabled.equalsIgnoreCase("true")) { - String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") - String extHiveHmsPort = context.config.otherConfigs.get("extHiveHmsPort") - String catalog_name = "external_yandex" - - sql """drop catalog if exists ${catalog_name};""" - - sql """ - create catalog if not exists ${catalog_name} properties ( - 'type'='hms', - 'hive.metastore.uris' = 'thrift://${extHiveHmsHost}:${extHiveHmsPort}' - ); - """ - logger.info("catalog " + catalog_name + " created") - - sql """switch ${catalog_name};""" - - logger.info("switched to catalog " + catalog_name) - - sql """use multi_catalog;""" - - logger.info("use multi_catalog") - - for (String format in formats) { - logger.info("Process format " + format) - qt_01 duplicateAggregationKeys.replace("SUFFIX", format) - qt_02 like1.replace("SUFFIX", format) - qt_03 like2.replace("SUFFIX", format) - qt_04 like3.replace("SUFFIX", format) - qt_05 like4.replace("SUFFIX", format) - qt_06 loyalty.replace("SUFFIX", format) - qt_07 maxStringIf.replace("SUFFIX", format) - qt_08 minMax.replace("SUFFIX", format) - qt_09 monotonicEvaluationSegfault.replace("SUFFIX", format) - qt_10 subqueryInWhere.replace("SUFFIX", format) - qt_11 where01.replace("SUFFIX", format) - qt_12 where02.replace("SUFFIX", format) - } - } -} - diff --git a/regression-test/suites/external_table_p2/hive/test_external_yandex_nereids.groovy b/regression-test/suites/external_table_p2/hive/test_external_yandex_nereids.groovy index 9874f2cad3eed4..9cd511bf98a1e5 100644 --- a/regression-test/suites/external_table_p2/hive/test_external_yandex_nereids.groovy +++ b/regression-test/suites/external_table_p2/hive/test_external_yandex_nereids.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_external_yandex_nereids", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } def formats = ["_parquet"] def duplicateAggregationKeys = "SELECT URL, EventDate, max(URL) FROM hitsSUFFIX WHERE CounterID = 1704509 AND UserID = 4322253409885123546 GROUP BY URL, EventDate, EventDate ORDER BY URL, EventDate;" diff --git a/regression-test/suites/external_table_p2/hive/test_hive_hudi.groovy b/regression-test/suites/external_table_p2/hive/test_hive_hudi.groovy index 1c69c5a738d826..d98f176e64b752 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_hudi.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_hudi.groovy @@ -16,6 +16,12 @@ // under the License. suite("test_hive_hudi", "p2,external,hive,hudi") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_hive_hudi_statistics.groovy b/regression-test/suites/external_table_p2/hive/test_hive_hudi_statistics.groovy index 55e5037de458c7..a7beff6022772f 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_hudi_statistics.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_hudi_statistics.groovy @@ -16,6 +16,12 @@ // under the License. suite("test_hive_hudi_statistics", "p2,external,hive,hudi") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy b/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy index 6f398a62e3cd83..c3cde4d7962775 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_partition_statistic.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_hive_partition_statistic", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { logger.info("This feature has not been supported yet, skip it.") diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy index de39d408a53052..f937c97d1e5d25 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy @@ -17,6 +17,12 @@ suite("test_hive_statistic_cache", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + def wait_row_count_reported = { table, expected -> for (int i = 0; i < 10; i++) { result = sql """show table stats ${table}""" diff --git a/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy index 1c1a72173875ed..0c17f40fe53822 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_statistic_sample.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_hive_statistic_sample", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_hive_write_insert_s3.groovy b/regression-test/suites/external_table_p2/hive/test_hive_write_insert_s3.groovy index cf9fea67cbd685..2c76622201dc8f 100644 --- a/regression-test/suites/external_table_p2/hive/test_hive_write_insert_s3.groovy +++ b/regression-test/suites/external_table_p2/hive/test_hive_write_insert_s3.groovy @@ -16,6 +16,12 @@ // under the License. suite("test_hive_write_insert_s3", "p2,external,hive,external_remote,external_remote_hive") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } def format_compressions = ["parquet_snappy"] def s3BucketName = getS3BucketName() diff --git a/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy b/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy index ea7f5701df8b4f..83b00a4fd98880 100644 --- a/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy +++ b/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy @@ -16,6 +16,13 @@ // under the License. suite("test_select_count_optimize", "p2,external,hive,external_remote,external_remote_hive") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extHiveHmsHost = context.config.otherConfigs.get("extHiveHmsHost") diff --git a/regression-test/suites/external_table_p2/hive/test_upper_case_column_name.groovy b/regression-test/suites/external_table_p2/hive/test_upper_case_column_name.groovy index 0033e0dca2406d..95edbc8bac2d47 100644 --- a/regression-test/suites/external_table_p2/hive/test_upper_case_column_name.groovy +++ b/regression-test/suites/external_table_p2/hive/test_upper_case_column_name.groovy @@ -16,6 +16,12 @@ // under the License. suite("upper_case_column_name", "p2,external,hive,external_remote,external_remote_hive") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } def hiveParquet1 = """select * from hive_upper_case_parquet;""" def hiveParquet2 = """select * from hive_upper_case_parquet where id=1;""" def hiveParquet3 = """select * from hive_upper_case_parquet where id>1;""" diff --git a/regression-test/suites/external_table_p2/hive/test_viewfs_hive.groovy b/regression-test/suites/external_table_p2/hive/test_viewfs_hive.groovy index 9ccea773ed4093..020bcb9ab08352 100644 --- a/regression-test/suites/external_table_p2/hive/test_viewfs_hive.groovy +++ b/regression-test/suites/external_table_p2/hive/test_viewfs_hive.groovy @@ -16,6 +16,11 @@ // under the License. suite("test_viewfs_hive", "p2,external,hive,external_remote,external_remote_hive") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { diff --git a/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy b/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy index e8c859698326b3..db535e3517987e 100644 --- a/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy +++ b/regression-test/suites/external_table_p2/hudi/test_hudi_timetravel.groovy @@ -17,6 +17,12 @@ suite("test_hudi_timetravel", "p2,external,hudi,external_remote,external_remote_hudi") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalHudiTest") if (enabled == null || !enabled.equalsIgnoreCase("true")) { logger.info("disable hudi test") diff --git a/regression-test/suites/external_table_p2/mysql/test_external_catalog_mysql.groovy b/regression-test/suites/external_table_p2/mysql/test_external_catalog_mysql.groovy index 9d1ab73e5106b1..febd5c01758db9 100644 --- a/regression-test/suites/external_table_p2/mysql/test_external_catalog_mysql.groovy +++ b/regression-test/suites/external_table_p2/mysql/test_external_catalog_mysql.groovy @@ -17,6 +17,12 @@ //import com.mysql.cj.jdbc.Driver suite("test_external_catalog_mysql", "p2,external,mysql,external_remote,external_remote_mysql") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalMysqlTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extMysqlHost = context.config.otherConfigs.get("extMysqlHost") diff --git a/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql.groovy b/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql.groovy index 20b447a3bdd173..81374ae427e130 100644 --- a/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql.groovy +++ b/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql.groovy @@ -17,6 +17,12 @@ //import com.mysql.cj.jdbc.Driver suite("test_external_resource_mysql", "p2,external,mysql,external_remote,external_remote_mysql") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalMysqlTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extMysqlHost = context.config.otherConfigs.get("extMysqlHost") diff --git a/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql_nereids.groovy b/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql_nereids.groovy deleted file mode 100644 index 86b49bd251916b..00000000000000 --- a/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql_nereids.groovy +++ /dev/null @@ -1,156 +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. -//import com.mysql.cj.jdbc.Driver -suite("test_external_resource_mysql_nereids", "p2,external,mysql,external_remote,external_remote_mysql") { - - String enabled = context.config.otherConfigs.get("enableExternalMysqlTest") - if (enabled != null && enabled.equalsIgnoreCase("true")) { - String extMysqlHost = context.config.otherConfigs.get("extMysqlHost") - String extMysqlPort = context.config.otherConfigs.get("extMysqlPort") - String extMysqlUser = context.config.otherConfigs.get("extMysqlUser") - String extMysqlPassword = context.config.otherConfigs.get("extMysqlPassword") - String s3_endpoint = getS3Endpoint() - String bucket = getS3BucketName() - String driver_url = "https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar" - String mysqlResourceName = "jdbc_resource_mysql_57_n" - String mysqlDatabaseName01 = "external_mysql_database_ssb_n" - String mysqlTableNameLineOrder = "external_mysql_table_lineorder_n" - String mysqlTableNameCustomer = "external_mysql_table_customer_n" - String mysqlTableNameSupplier = "external_mysql_table_supplier_n" - - - - sql """set enable_nereids_planner=true;""" - sql """set enable_fallback_to_original_planner=false;""" - sql """drop database if exists ${mysqlDatabaseName01};""" - sql """create database ${mysqlDatabaseName01};""" - sql """use ${mysqlDatabaseName01};""" - - - sql """drop resource if exists ${mysqlResourceName};""" - sql """ - create external resource ${mysqlResourceName} - properties ( - "type"="jdbc", - "user"="${extMysqlUser}", - "password"="${extMysqlPassword}", - "jdbc_url"="jdbc:mysql://${extMysqlHost}:${extMysqlPort}/ssb?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false", - "driver_url"="${driver_url}", - "driver_class"="com.mysql.cj.jdbc.Driver" - ); - """ - - sql """drop table if exists ${mysqlTableNameLineOrder}""" - sql """ - CREATE EXTERNAL TABLE ${mysqlTableNameLineOrder} ( - `lo_orderkey` bigint(20) NOT NULL COMMENT "", - `lo_linenumber` bigint(20) NOT NULL COMMENT "", - `lo_custkey` int(11) NOT NULL COMMENT "", - `lo_partkey` int(11) NOT NULL COMMENT "", - `lo_suppkey` int(11) NOT NULL COMMENT "", - `lo_orderdate` int(11) NOT NULL COMMENT "", - `lo_orderpriority` varchar(16) NOT NULL COMMENT "", - `lo_shippriority` int(11) NOT NULL COMMENT "", - `lo_quantity` bigint(20) NOT NULL COMMENT "", - `lo_extendedprice` bigint(20) NOT NULL COMMENT "", - `lo_ordtotalprice` bigint(20) NOT NULL COMMENT "", - `lo_discount` bigint(20) NOT NULL COMMENT "", - `lo_revenue` bigint(20) NOT NULL COMMENT "", - `lo_supplycost` bigint(20) NOT NULL COMMENT "", - `lo_tax` bigint(20) NOT NULL COMMENT "", - `lo_commitdate` bigint(20) NOT NULL COMMENT "", - `lo_shipmode` varchar(11) NOT NULL COMMENT "" - ) ENGINE=JDBC - PROPERTIES ( - "resource" = "${mysqlResourceName}", - "table" = "lineorder", - "table_type"="mysql" - ); - """ - - def res = sql """select * from ${mysqlTableNameLineOrder} limit 10;""" - logger.info("recoding select: " + res.toString()) - - sql """drop table if exists ${mysqlTableNameCustomer}""" - sql """ - CREATE EXTERNAL TABLE ${mysqlTableNameCustomer} ( - `c_custkey` int(11) DEFAULT NULL, - `c_name` varchar(25) NOT NULL, - `c_address` varchar(40) NOT NULL, - `c_city` varchar(10) NOT NULL, - `c_nation` varchar(15) NOT NULL, - `c_region` varchar(12) NOT NULL, - `c_phone` varchar(15) NOT NULL - ) ENGINE=JDBC - PROPERTIES ( - "resource" = "${mysqlResourceName}", - "table" = "customer", - "table_type"="mysql" - ); - """ - - def res1 = sql """select * from ${mysqlTableNameCustomer} where c_custkey >100 limit 10;""" - logger.info("recoding select: " + res1.toString()) - - def res2 = sql """select * from ${mysqlTableNameCustomer} order by c_custkey desc limit 10;""" - logger.info("recoding select: " + res2.toString()) - -// def res3 = sql """select AVG(lo_discount) from ${mysqlTableNameCustomer} limit 10;""" -// logger.info("recoding select: " + res3.toString()) -// -// def res4 = sql """select MAX(lo_discount) from ${mysqlTableNameCustomer} limit 10;""" -// logger.info("recoding select: " + res4.toString()) - - def res5 = sql """select count(*) from ${mysqlTableNameCustomer};""" - logger.info("recoding select: " + res5.toString()) - - sql """drop table if exists ${mysqlTableNameSupplier}""" - sql """ - CREATE EXTERNAL TABLE ${mysqlTableNameSupplier} ( - `s_suppkey` int(11) DEFAULT NULL, - `s_name` varchar(25) NOT NULL, - `s_address` varchar(25) NOT NULL, - `s_city` varchar(10) NOT NULL, - `s_nation` varchar(15) NOT NULL, - `s_region` varchar(12) NOT NULL, - `s_phone` varchar(15) NOT NULL - ) ENGINE=JDBC - PROPERTIES ( - "resource" = "${mysqlResourceName}", - "table" = "supplier", - "table_type"="mysql" - ); - """ - def res6 = sql """select count(*) from ${mysqlTableNameSupplier};""" - logger.info("recoding select: " + res6.toString()) - - def res7 = sql """select * from ${mysqlTableNameCustomer} a join ${mysqlTableNameSupplier} b on a.c_nation =b.s_nation limit 5;""" - logger.info("recoding select: " + res7.toString()) - - - sql """drop table if exists ${mysqlTableNameLineOrder}""" - sql """drop database if exists ${mysqlDatabaseName01};""" - } -} - - - - - - - - diff --git a/regression-test/suites/external_table_p2/pg/test_external_pg.groovy b/regression-test/suites/external_table_p2/pg/test_external_pg.groovy deleted file mode 100644 index 099f2e243c2ecf..00000000000000 --- a/regression-test/suites/external_table_p2/pg/test_external_pg.groovy +++ /dev/null @@ -1,133 +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. -//import org.postgresql.Driver -suite("test_external_pg", "p2,external,pg,external_remote,external_remote_pg") { - - String enabled = context.config.otherConfigs.get("enableExternalPgTest") - if (enabled != null && enabled.equalsIgnoreCase("true")) { - String extPgHost = context.config.otherConfigs.get("extPgHost") - String extPgPort = context.config.otherConfigs.get("extPgPort") - String extPgUser = context.config.otherConfigs.get("extPgUser") - String extPgPassword = context.config.otherConfigs.get("extPgPassword") - String s3_endpoint = getS3Endpoint() - String bucket = getS3BucketName() - String driver_url = "https://${bucket}.${s3_endpoint}/regression/jdbc_driver/postgresql-42.5.0.jar" - String jdbcResourcePg14 = "jdbc_resource_pg_14" - String jdbcPg14Database1 = "jdbc_pg_14_database1" - String pgTableNameLineOrder = "jdbc_pg_14_table1" - String pgTableNameCustomer = "jdbc_pg_14_customer" - String pgTableNameSupplier = "jdbc_pg_14_supplier" - - sql """drop database if exists ${jdbcPg14Database1};""" - sql """drop resource if exists ${jdbcResourcePg14};""" - - sql """drop database if exists ${jdbcPg14Database1};""" - sql """create database ${jdbcPg14Database1};""" - sql """use ${jdbcPg14Database1};""" - sql """ - create external resource ${jdbcResourcePg14} - properties ( - "type"="jdbc", - "user"="${extPgUser}", - "password"="${extPgPassword}", - "jdbc_url"="jdbc:postgresql://${extPgHost}:${extPgPort}/ssb?currentSchema=ssb&useCursorFetch=true", - "driver_url"="${driver_url}", - "driver_class"="org.postgresql.Driver" - ); - """ - - sql """drop table if exists ${pgTableNameLineOrder}""" - sql """ - CREATE EXTERNAL TABLE ${pgTableNameLineOrder} ( - `lo_orderkey` bigint(20) NOT NULL COMMENT "", - `lo_linenumber` bigint(20) NOT NULL COMMENT "", - `lo_custkey` int(11) NOT NULL COMMENT "", - `lo_partkey` int(11) NOT NULL COMMENT "", - `lo_suppkey` int(11) NOT NULL COMMENT "", - `lo_orderdate` int(11) NOT NULL COMMENT "", - `lo_orderpriority` varchar(16) NOT NULL COMMENT "", - `lo_shippriority` int(11) NOT NULL COMMENT "", - `lo_quantity` bigint(20) NOT NULL COMMENT "", - `lo_extendedprice` bigint(20) NOT NULL COMMENT "", - `lo_ordtotalprice` bigint(20) NOT NULL COMMENT "", - `lo_discount` bigint(20) NOT NULL COMMENT "", - `lo_revenue` bigint(20) NOT NULL COMMENT "", - `lo_supplycost` bigint(20) NOT NULL COMMENT "", - `lo_tax` bigint(20) NOT NULL COMMENT "", - `lo_commitdate` bigint(20) NOT NULL COMMENT "", - `lo_shipmode` varchar(11) NOT NULL COMMENT "" - ) ENGINE=JDBC - PROPERTIES ( - "resource" = "${jdbcResourcePg14}", - "table" = "lineorder", - "table_type"="postgresql" - ); - """ - - sql """drop table if exists ${pgTableNameCustomer}""" - sql """ - CREATE EXTERNAL TABLE ${pgTableNameCustomer} ( - `c_custkey` int(11) DEFAULT NULL, - `c_name` varchar(25) NOT NULL, - `c_address` varchar(40) NOT NULL, - `c_city` varchar(10) NOT NULL, - `c_nation` varchar(15) NOT NULL, - `c_region` varchar(12) NOT NULL, - `c_phone` varchar(15) NOT NULL - ) ENGINE=JDBC - PROPERTIES ( - "resource" = "${jdbcResourcePg14}", - "table" = "customer", - "table_type"="postgresql" - ); - """ - - sql """drop table if exists ${pgTableNameSupplier}""" - sql """ - CREATE EXTERNAL TABLE ${pgTableNameSupplier} ( - `s_suppkey` int(11) DEFAULT NULL, - `s_name` varchar(25) NOT NULL, - `s_address` varchar(25) NOT NULL, - `s_city` varchar(10) NOT NULL, - `s_nation` varchar(15) NOT NULL, - `s_region` varchar(12) NOT NULL, - `s_phone` varchar(15) NOT NULL - ) ENGINE=JDBC - PROPERTIES ( - "resource" = "${jdbcResourcePg14}", - "table" = "supplier", - "table_type"="postgresql" - ); - """ - - def res = sql """select count(*) from ${pgTableNameCustomer};""" - logger.info("recoding select: " + res.toString()) - - def res1 = sql """select * from ${pgTableNameSupplier} limit 10""" - logger.info("recoding select: " + res1.toString()) - - def res2 = sql """select * from ${pgTableNameSupplier} order by s_suppkey desc limit 10;""" - logger.info("recoding select: " + res2.toString()) - - def res3 = sql """select * from ${pgTableNameSupplier} where s_suppkey>100 limit 10;""" - logger.info("recoding select: " + res3.toString()) - - def res4 = sql """select * from ${pgTableNameCustomer} a join ${pgTableNameSupplier} b on a.c_nation =b.s_nation limit 5;""" - logger.info("recoding select: " + res4.toString()) - - } -} diff --git a/regression-test/suites/external_table_p2/pg/test_external_pg_nereids.groovy b/regression-test/suites/external_table_p2/pg/test_external_pg_nereids.groovy index dc88bd4a22bcb8..d6a4dd70f7377f 100644 --- a/regression-test/suites/external_table_p2/pg/test_external_pg_nereids.groovy +++ b/regression-test/suites/external_table_p2/pg/test_external_pg_nereids.groovy @@ -17,6 +17,12 @@ //import org.postgresql.Driver suite("test_external_pg_nereids", "p2,external,pg,external_remote,external_remote_pg") { + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalPgTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String extPgHost = context.config.otherConfigs.get("extPgHost") diff --git a/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy b/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy index de13c48727af8b..047b4a36fe2622 100644 --- a/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy +++ b/regression-test/suites/external_table_p2/tvf/test_iceberg_meta.groovy @@ -16,6 +16,13 @@ // under the License. suite("test_iceberg_meta", "p2,external,iceberg,external_remote,external_remote_iceberg") { + + Boolean ignoreP2 = true; + if (ignoreP2) { + logger.info("disable p2 test"); + return; + } + String enabled = context.config.otherConfigs.get("enableExternalHiveTest") if (enabled != null && enabled.equalsIgnoreCase("true")) { String iceberg_catalog_name = "test_iceberg_meta_tvf" @@ -48,4 +55,4 @@ suite("test_iceberg_meta", "p2,external,iceberg,external_remote,external_remote_ where snapshot_id = 7235593032487457798; """ } -} \ No newline at end of file +}