From eeabf7c50854e09796ca8e854a97df702e763952 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:47:12 +0800 Subject: [PATCH] branch-2.1: [chore](regression) Normalize external case labels #46622 (#46705) Cherry-picked from #46622 Co-authored-by: zgxme --- .../suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy | 2 +- .../jdbc/test_switch_catalog_and_delete_internal.groovy | 2 +- .../external_table_p0/tvf/test_frontends_disks_tvf.groovy | 2 +- .../tvf/test_insert_from_tvf_with_common_user.groovy | 2 +- .../external_table_p0/tvf/test_local_tvf_compression.groovy | 2 +- .../suites/external_table_p0/tvf/test_local_tvf_enclose.groovy | 2 +- .../tvf/test_local_tvf_parquet_unsigned_integers.groovy | 2 +- .../tvf/test_local_tvf_with_complex_type.groovy | 2 +- .../tvf/test_local_tvf_with_complex_type_element_at.groovy | 2 +- .../test_local_tvf_with_complex_type_insertinto_doris.groovy | 2 +- .../tvf/test_read_csv_empty_line_as_null.groovy | 2 +- regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy | 2 +- .../suites/external_table_p0/tvf/test_s3_tvf_compression.groovy | 2 +- .../external_table_p0/tvf/test_s3_tvf_parquet_compress.groovy | 2 +- .../external_table_p0/tvf/test_s3_tvf_with_resource.groovy | 2 +- .../suites/external_table_p0/tvf/test_tvf_csv_line_end.groovy | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy index 0c1e04afda..bee77ab73f 100644 --- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy +++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_tvf.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_jdbc_query_tvf") { +suite("test_jdbc_query_tvf", "p0,external") { String enabled = context.config.otherConfigs.get("enableJdbcTest") String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") diff --git a/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy b/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy index 1e9e2ffdf4..adfb20e355 100644 --- a/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy +++ b/regression-test/suites/external_table_p0/jdbc/test_switch_catalog_and_delete_internal.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_switch_catalog_and_delete_internal") { +suite("test_switch_catalog_and_delete_internal", "p0,external") { String enabled = context.config.otherConfigs.get("enableJdbcTest") String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") String mysql_port = context.config.otherConfigs.get("mysql_57_port"); diff --git a/regression-test/suites/external_table_p0/tvf/test_frontends_disks_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_frontends_disks_tvf.groovy index 0cb2825390..b79c3e0469 100644 --- a/regression-test/suites/external_table_p0/tvf/test_frontends_disks_tvf.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_frontends_disks_tvf.groovy @@ -16,7 +16,7 @@ // under the License. // This suit test the `frontends_disks` tvf -suite("test_frontends_disks_tvf") { +suite("test_frontends_disks_tvf", "p0,external") { List> table = sql """ select * from `frontends_disks`(); """ assertTrue(table.size() > 0) assertTrue(table[0].size == 10) diff --git a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy index 5c2471314b..8defaa0a13 100644 --- a/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_insert_from_tvf_with_common_user.groovy @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Paths -suite("test_insert_from_tvf_with_common_user", "p0") { +suite("test_insert_from_tvf_with_common_user", "p0,external") { String ak = getS3AK() String sk = getS3SK() String s3_endpoint = getS3Endpoint() diff --git a/regression-test/suites/external_table_p0/tvf/test_local_tvf_compression.groovy b/regression-test/suites/external_table_p0/tvf/test_local_tvf_compression.groovy index 420887fb41..3b08001f96 100644 --- a/regression-test/suites/external_table_p0/tvf/test_local_tvf_compression.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_local_tvf_compression.groovy @@ -17,7 +17,7 @@ import org.junit.Assert // specific language governing permissions and limitations // under the License. -suite("test_local_tvf_compression", "p0,tvf") { +suite("test_local_tvf_compression", "p0,tvf,external") { List> backends = sql """ show backends """ assertTrue(backends.size() > 0) def be_id = backends[0][0] diff --git a/regression-test/suites/external_table_p0/tvf/test_local_tvf_enclose.groovy b/regression-test/suites/external_table_p0/tvf/test_local_tvf_enclose.groovy index e7437cd20e..28e000d68d 100644 --- a/regression-test/suites/external_table_p0/tvf/test_local_tvf_enclose.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_local_tvf_enclose.groovy @@ -17,7 +17,7 @@ import org.junit.Assert // specific language governing permissions and limitations // under the License. -suite("test_local_tvf_enclose", "p0,tvf") { +suite("test_local_tvf_enclose", "p0,tvf,external") { List> backends = sql """ show backends """ assertTrue(backends.size() > 0) def be_id = backends[0][0] diff --git a/regression-test/suites/external_table_p0/tvf/test_local_tvf_parquet_unsigned_integers.groovy b/regression-test/suites/external_table_p0/tvf/test_local_tvf_parquet_unsigned_integers.groovy index 24cfb5f2ac..aeb032e941 100644 --- a/regression-test/suites/external_table_p0/tvf/test_local_tvf_parquet_unsigned_integers.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_local_tvf_parquet_unsigned_integers.groovy @@ -18,7 +18,7 @@ import org.junit.Assert // under the License. // This suit test the `backends` tvf -suite("test_local_tvf_parquet_unsigned_integers", "p0") { +suite("test_local_tvf_parquet_unsigned_integers", "p0,external") { List> backends = sql """ show backends """ def dataFilePath = context.config.dataPath + "/external_table_p0/tvf/" diff --git a/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type.groovy b/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type.groovy index cd5948b22c..a990a8873f 100644 --- a/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type.groovy @@ -18,7 +18,7 @@ import org.junit.Assert // under the License. // This suit test the `backends` tvf -suite("test_local_tvf_with_complex_type", "p0") { +suite("test_local_tvf_with_complex_type", "p0,external") { List> backends = sql """ show backends """ def dataFilePath = context.config.dataPath + "/external_table_p0/tvf/" diff --git a/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_element_at.groovy b/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_element_at.groovy index 91c00a9046..28ddf9c7a5 100644 --- a/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_element_at.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_element_at.groovy @@ -18,7 +18,7 @@ import org.junit.Assert // under the License. // This suit test the `backends` tvf -suite("test_local_tvf_with_complex_type_element_at", "p0") { +suite("test_local_tvf_with_complex_type_element_at", "p0,external") { List> backends = sql """ show backends """ assertTrue(backends.size() > 0) def be_id = backends[0][0] diff --git a/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_insertinto_doris.groovy b/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_insertinto_doris.groovy index 596ed79eec..188d7069ae 100644 --- a/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_insertinto_doris.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_local_tvf_with_complex_type_insertinto_doris.groovy @@ -18,7 +18,7 @@ import org.junit.Assert // under the License. // This suit test the `backends` tvf -suite("test_local_tvf_with_complex_type_insertinto_doris", "p0") { +suite("test_local_tvf_with_complex_type_insertinto_doris", "p0,external") { List> backends = sql """ select * from backends(); """ assertTrue(backends.size() > 0) def be_id = backends[0][0] diff --git a/regression-test/suites/external_table_p0/tvf/test_read_csv_empty_line_as_null.groovy b/regression-test/suites/external_table_p0/tvf/test_read_csv_empty_line_as_null.groovy index 0a64109eb2..b2de1e5270 100644 --- a/regression-test/suites/external_table_p0/tvf/test_read_csv_empty_line_as_null.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_read_csv_empty_line_as_null.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_read_csv_empty_line_as_null", "p0") { +suite("test_read_csv_empty_line_as_null", "p0,external") { // open nereids sql """ set enable_nereids_planner=true """ sql """ set enable_fallback_to_original_planner=false """ diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy index 67dc94d32d..8ab9793c5d 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_s3_tvf", "p0") { +suite("test_s3_tvf", "p0,external") { // open nereids sql """ set enable_nereids_planner=true """ sql """ set enable_fallback_to_original_planner=false """ diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy index 2975f4f0cc..6e44cd82db 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_compression.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_s3_tvf_compression", "p0") { +suite("test_s3_tvf_compression", "p0,external") { String ak = getS3AK() String sk = getS3SK() diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_parquet_compress.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_parquet_compress.groovy index e8ca08811f..76c773e0a4 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_parquet_compress.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_parquet_compress.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_s3_tvf_parquet_compress", "p0") { +suite("test_s3_tvf_parquet_compress", "p0,external") { //parquet data page v2 test diff --git a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy index 9c97c701be..ebb059aaa6 100644 --- a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -suite("test_s3_tvf_with_resource", "p0") { +suite("test_s3_tvf_with_resource", "p0,external") { // open nereids sql """ set enable_nereids_planner=true """ sql """ set enable_fallback_to_original_planner=false """ diff --git a/regression-test/suites/external_table_p0/tvf/test_tvf_csv_line_end.groovy b/regression-test/suites/external_table_p0/tvf/test_tvf_csv_line_end.groovy index cb2beb6f94..3b08cede40 100644 --- a/regression-test/suites/external_table_p0/tvf/test_tvf_csv_line_end.groovy +++ b/regression-test/suites/external_table_p0/tvf/test_tvf_csv_line_end.groovy @@ -17,7 +17,7 @@ import org.junit.Assert // specific language governing permissions and limitations // under the License. -suite("test_tvf_csv_line_end", "p0,tvf") { +suite("test_tvf_csv_line_end", "p0,tvf,external") { List> backends = sql """ show backends """ assertTrue(backends.size() > 0) def be_id = backends[0][0]