From c31226b144b7c1bac6eacd4792e8b59e4dc8049a Mon Sep 17 00:00:00 2001 From: Mingyu Chen Date: Mon, 7 Aug 2023 11:12:30 +0800 Subject: [PATCH] [refractor](regression-test) sort out test cases of external tables (#22640) sort out the test cases of external table. After modify, there are 2 directories: 1. `external_table_p0`: all p0 cases of external tables: hive, es, jdbc and tvf 2. `external_table_p2`: all p2 cases of external tables: hive, es, mysql, pg, iceberg and tvf So that we can run it with one line command like: ``` sh run-regression-test.sh --run -d external_table_p0,external_table_p2 ``` --- .../es}/test_es_query.out | 0 .../es}/test_es_query_nereids.out | 0 .../es}/test_es_query_no_http_url.out | 0 .../hive/hive_tpch_sf1_orc.out} | 0 .../hive/hive_tpch_sf1_parquet.out} | 0 .../hive/test_different_column_orders.out | 0 .../hive/test_hive_orc.out | 0 .../hive/test_hive_other.out | 0 .../hive/test_hive_parquet.out | 0 .../hive/test_hive_partitions.out | 0 .../hive/test_transactional_hive.out | 0 .../jdbc}/test_clickhouse_jdbc_catalog.out | Bin .../jdbc}/test_doris_jdbc_catalog.out | 0 .../jdbc}/test_jdbc_query_mysql.out | 0 .../jdbc}/test_jdbc_query_pg.out | 0 .../jdbc}/test_mysql_jdbc_catalog.out | 0 .../jdbc}/test_mysql_jdbc_catalog_nereids.out | 0 .../jdbc}/test_oracle_jdbc_catalog.out | 0 .../jdbc}/test_pg_jdbc_catalog.out | 0 .../jdbc}/test_sqlserver_jdbc_catalog.out | 0 .../tvf}/test_catalogs_tvf.out | 0 .../tvf}/test_create_view_from_tvf.out | 0 .../tvf}/test_hdfs_tvf.out | 0 .../tvf}/test_numbers.out | 0 .../hive/test_complex_types.out | 0 .../hive/test_external_brown.out | 0 .../hive/test_external_catalog_glue_table.out | 0 .../hive/test_external_catalog_hive.out | 0 .../hive/test_external_catalog_hive_partition.out | 0 .../hive/test_external_credit_data.out | 0 .../hive/test_external_github.out | 0 .../hive/test_external_yandex.out | 0 .../hive/test_external_yandex_nereids.out | 0 .../hive/test_hive_default_partition.out | 0 .../hive/test_hive_partition_location.out | 0 .../hive/test_hive_remove_partition.out | 0 .../hive/test_hive_same_db_table_name.out | 0 .../hive/test_hive_schema_evolution.out | 0 .../hive/test_hive_special_char_partition.out | 0 .../hive/test_hive_to_array.out | 0 .../hive/test_hive_to_date.out | 0 .../hive/test_mixed_par_locations.out | 0 .../hive/test_multi_langs.out | 0 .../hive/test_select_count_optimize.out | 0 .../hive/test_upper_case_column_name.out | 0 .../hive/test_wide_table.out | 0 .../iceberg/iceberg_partition_upper_case.out | 0 .../iceberg_partition_upper_case_nereids.out | 0 .../iceberg/iceberg_schema_evolution.out | 0 .../iceberg_schema_evolution_iceberg_catalog.out | 0 .../test_external_catalog_iceberg_partition.out | 0 .../iceberg/test_external_catalog_icebergv2.out | 0 .../test_external_catalog_icebergv2_nereids.out | 0 .../hive => external_table_p2/tvf}/test_tvf_p2.out | 0 .../es}/test_es_query.groovy | 0 .../es}/test_es_query_nereids.groovy | 0 .../es}/test_es_query_no_http_url.groovy | 0 .../hive/hive_tpch_sf1_orc.groovy} | 0 .../hive/hive_tpch_sf1_parquet.groovy} | 0 .../hive/test_different_column_orders.groovy | 0 .../hive/test_different_parquet_types.groovy | 0 .../hive/test_hive_orc.groovy | 0 .../hive/test_hive_other.groovy | 0 .../hive/test_hive_parquet.groovy | 0 .../hive/test_hive_partitions.groovy | 0 .../hive/test_transactional_hive.groovy | 0 .../jdbc}/test_clickhouse_jdbc_catalog.groovy | 0 .../jdbc}/test_doris_jdbc_catalog.groovy | 0 .../jdbc}/test_jdbc_query_mysql.groovy | 0 .../jdbc}/test_jdbc_query_pg.groovy | 0 .../jdbc}/test_mysql_jdbc_catalog.groovy | 0 .../jdbc}/test_mysql_jdbc_catalog_nereids.groovy | 0 .../jdbc}/test_oracle_jdbc_catalog.groovy | 0 .../jdbc}/test_pg_jdbc_catalog.groovy | 0 .../jdbc}/test_sqlserver_jdbc_catalog.groovy | 0 .../tvf}/test_backends_tvf.groovy | 0 .../tvf}/test_catalogs_tvf.groovy | 0 .../tvf}/test_create_view_from_tvf.groovy | 0 .../tvf}/test_frontends_tvf.groovy | 0 .../tvf}/test_hdfs_tvf.groovy | 0 .../tvf}/test_numbers.groovy | 0 .../es/test_external_catalog_es.groovy | 0 .../es/test_external_es.groovy | 0 .../hive/test_complex_types.groovy | 0 .../hive/test_external_brown.groovy | 0 .../hive/test_external_catalog_glue_table.groovy | 0 .../hive/test_external_catalog_hive.groovy | 0 .../test_external_catalog_hive_partition.groovy | 0 .../hive/test_external_credit_data.groovy | 0 .../hive/test_external_github.groovy | 0 .../hive/test_external_yandex.groovy | 0 .../hive/test_external_yandex_nereids.groovy | 0 .../hive/test_hive_analyze_db.groovy | 0 .../hive/test_hive_default_partition.groovy | 0 .../hive/test_hive_partition_location.groovy | 0 .../hive/test_hive_remove_partition.groovy | 0 .../hive/test_hive_same_db_table_name.groovy | 0 .../hive/test_hive_schema_evolution.groovy | 0 .../hive/test_hive_special_char_partition.groovy | 0 .../hive/test_hive_statistic.groovy | 0 .../hive/test_hive_statistic_cache.groovy | 0 .../hive/test_hive_to_array.groovy | 0 .../hive/test_hive_to_date.groovy | 0 .../hive/test_mixed_par_locations.groovy | 0 .../hive/test_multi_langs.groovy | 0 .../hive/test_select_count_optimize.groovy | 0 .../hive/test_upper_case_column_name.groovy | 0 .../hive/test_wide_table.groovy | 0 .../iceberg/iceberg_partition_upper_case.groovy | 0 .../iceberg_partition_upper_case_nereids.groovy | 0 .../iceberg/iceberg_schema_evolution.groovy | 0 .../iceberg_schema_evolution_iceberg_catalog.groovy | 0 .../test_external_catalog_iceberg_partition.groovy | 0 .../iceberg/test_external_catalog_icebergv2.groovy | 0 .../test_external_catalog_icebergv2_nereids.groovy | 0 .../mysql/test_external_catalog_mysql.groovy | 0 .../mysql/test_external_resource_mysql.groovy | 0 .../test_external_resource_mysql_nereids.groovy | 0 .../pg/test_external_pg.groovy | 0 .../pg/test_external_pg_nereids.groovy | 0 .../tvf}/test_tvf_p2.groovy | 0 121 files changed, 0 insertions(+), 0 deletions(-) rename regression-test/data/{es_p0 => external_table_p0/es}/test_es_query.out (100%) rename regression-test/data/{es_p0 => external_table_p0/es}/test_es_query_nereids.out (100%) rename regression-test/data/{es_p0 => external_table_p0/es}/test_es_query_no_http_url.out (100%) rename regression-test/data/{tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.out => external_table_p0/hive/hive_tpch_sf1_orc.out} (100%) rename regression-test/data/{tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.out => external_table_p0/hive/hive_tpch_sf1_parquet.out} (100%) rename regression-test/data/{external_catalog_p0 => external_table_p0}/hive/test_different_column_orders.out (100%) rename regression-test/data/{external_catalog_p0 => external_table_p0}/hive/test_hive_orc.out (100%) rename regression-test/data/{external_catalog_p0 => external_table_p0}/hive/test_hive_other.out (100%) rename regression-test/data/{external_catalog_p0 => external_table_p0}/hive/test_hive_parquet.out (100%) rename regression-test/data/{external_catalog_p0 => external_table_p0}/hive/test_hive_partitions.out (100%) rename regression-test/data/{external_catalog_p0 => external_table_p0}/hive/test_transactional_hive.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_clickhouse_jdbc_catalog.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_doris_jdbc_catalog.out (100%) rename regression-test/data/{jdbc_p0 => external_table_p0/jdbc}/test_jdbc_query_mysql.out (100%) rename regression-test/data/{jdbc_p0 => external_table_p0/jdbc}/test_jdbc_query_pg.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_mysql_jdbc_catalog.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_mysql_jdbc_catalog_nereids.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_oracle_jdbc_catalog.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_pg_jdbc_catalog.out (100%) rename regression-test/data/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_sqlserver_jdbc_catalog.out (100%) rename regression-test/data/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_catalogs_tvf.out (100%) rename regression-test/data/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_create_view_from_tvf.out (100%) rename regression-test/data/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_hdfs_tvf.out (100%) rename regression-test/data/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_numbers.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_complex_types.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_brown.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_catalog_glue_table.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_catalog_hive.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_catalog_hive_partition.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_credit_data.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_github.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_yandex.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_external_yandex_nereids.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_default_partition.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_partition_location.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_remove_partition.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_same_db_table_name.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_schema_evolution.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_special_char_partition.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_to_array.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_hive_to_date.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_mixed_par_locations.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_multi_langs.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_select_count_optimize.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_upper_case_column_name.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/hive/test_wide_table.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_partition_upper_case.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_partition_upper_case_nereids.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_schema_evolution.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_schema_evolution_iceberg_catalog.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/test_external_catalog_iceberg_partition.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/test_external_catalog_icebergv2.out (100%) rename regression-test/data/{external_table_emr_p2 => external_table_p2}/iceberg/test_external_catalog_icebergv2_nereids.out (100%) rename regression-test/data/{external_table_emr_p2/hive => external_table_p2/tvf}/test_tvf_p2.out (100%) rename regression-test/suites/{es_p0 => external_table_p0/es}/test_es_query.groovy (100%) rename regression-test/suites/{es_p0 => external_table_p0/es}/test_es_query_nereids.groovy (100%) rename regression-test/suites/{es_p0 => external_table_p0/es}/test_es_query_no_http_url.groovy (100%) rename regression-test/suites/{tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy => external_table_p0/hive/hive_tpch_sf1_orc.groovy} (100%) rename regression-test/suites/{tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy => external_table_p0/hive/hive_tpch_sf1_parquet.groovy} (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_different_column_orders.groovy (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_different_parquet_types.groovy (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_hive_orc.groovy (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_hive_other.groovy (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_hive_parquet.groovy (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_hive_partitions.groovy (100%) rename regression-test/suites/{external_catalog_p0 => external_table_p0}/hive/test_transactional_hive.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_clickhouse_jdbc_catalog.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_doris_jdbc_catalog.groovy (100%) rename regression-test/suites/{jdbc_p0 => external_table_p0/jdbc}/test_jdbc_query_mysql.groovy (100%) rename regression-test/suites/{jdbc_p0 => external_table_p0/jdbc}/test_jdbc_query_pg.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_mysql_jdbc_catalog.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_mysql_jdbc_catalog_nereids.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_oracle_jdbc_catalog.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_pg_jdbc_catalog.groovy (100%) rename regression-test/suites/{jdbc_catalog_p0 => external_table_p0/jdbc}/test_sqlserver_jdbc_catalog.groovy (100%) rename regression-test/suites/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_backends_tvf.groovy (100%) rename regression-test/suites/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_catalogs_tvf.groovy (100%) rename regression-test/suites/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_create_view_from_tvf.groovy (100%) rename regression-test/suites/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_frontends_tvf.groovy (100%) rename regression-test/suites/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_hdfs_tvf.groovy (100%) rename regression-test/suites/{correctness_p0/table_valued_function => external_table_p0/tvf}/test_numbers.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/es/test_external_catalog_es.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/es/test_external_es.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_complex_types.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_brown.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_catalog_glue_table.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_catalog_hive.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_catalog_hive_partition.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_credit_data.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_github.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_yandex.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_external_yandex_nereids.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_analyze_db.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_default_partition.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_partition_location.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_remove_partition.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_same_db_table_name.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_schema_evolution.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_special_char_partition.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_statistic.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_statistic_cache.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_to_array.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_hive_to_date.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_mixed_par_locations.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_multi_langs.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_select_count_optimize.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_upper_case_column_name.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/hive/test_wide_table.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_partition_upper_case.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_partition_upper_case_nereids.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_schema_evolution.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/iceberg_schema_evolution_iceberg_catalog.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/test_external_catalog_iceberg_partition.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/test_external_catalog_icebergv2.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/iceberg/test_external_catalog_icebergv2_nereids.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/mysql/test_external_catalog_mysql.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/mysql/test_external_resource_mysql.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/mysql/test_external_resource_mysql_nereids.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/pg/test_external_pg.groovy (100%) rename regression-test/suites/{external_table_emr_p2 => external_table_p2}/pg/test_external_pg_nereids.groovy (100%) rename regression-test/suites/{external_table_emr_p2/hive => external_table_p2/tvf}/test_tvf_p2.groovy (100%) diff --git a/regression-test/data/es_p0/test_es_query.out b/regression-test/data/external_table_p0/es/test_es_query.out similarity index 100% rename from regression-test/data/es_p0/test_es_query.out rename to regression-test/data/external_table_p0/es/test_es_query.out diff --git a/regression-test/data/es_p0/test_es_query_nereids.out b/regression-test/data/external_table_p0/es/test_es_query_nereids.out similarity index 100% rename from regression-test/data/es_p0/test_es_query_nereids.out rename to regression-test/data/external_table_p0/es/test_es_query_nereids.out diff --git a/regression-test/data/es_p0/test_es_query_no_http_url.out b/regression-test/data/external_table_p0/es/test_es_query_no_http_url.out similarity index 100% rename from regression-test/data/es_p0/test_es_query_no_http_url.out rename to regression-test/data/external_table_p0/es/test_es_query_no_http_url.out diff --git a/regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.out b/regression-test/data/external_table_p0/hive/hive_tpch_sf1_orc.out similarity index 100% rename from regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.out rename to regression-test/data/external_table_p0/hive/hive_tpch_sf1_orc.out diff --git a/regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.out b/regression-test/data/external_table_p0/hive/hive_tpch_sf1_parquet.out similarity index 100% rename from regression-test/data/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.out rename to regression-test/data/external_table_p0/hive/hive_tpch_sf1_parquet.out diff --git a/regression-test/data/external_catalog_p0/hive/test_different_column_orders.out b/regression-test/data/external_table_p0/hive/test_different_column_orders.out similarity index 100% rename from regression-test/data/external_catalog_p0/hive/test_different_column_orders.out rename to regression-test/data/external_table_p0/hive/test_different_column_orders.out diff --git a/regression-test/data/external_catalog_p0/hive/test_hive_orc.out b/regression-test/data/external_table_p0/hive/test_hive_orc.out similarity index 100% rename from regression-test/data/external_catalog_p0/hive/test_hive_orc.out rename to regression-test/data/external_table_p0/hive/test_hive_orc.out diff --git a/regression-test/data/external_catalog_p0/hive/test_hive_other.out b/regression-test/data/external_table_p0/hive/test_hive_other.out similarity index 100% rename from regression-test/data/external_catalog_p0/hive/test_hive_other.out rename to regression-test/data/external_table_p0/hive/test_hive_other.out diff --git a/regression-test/data/external_catalog_p0/hive/test_hive_parquet.out b/regression-test/data/external_table_p0/hive/test_hive_parquet.out similarity index 100% rename from regression-test/data/external_catalog_p0/hive/test_hive_parquet.out rename to regression-test/data/external_table_p0/hive/test_hive_parquet.out diff --git a/regression-test/data/external_catalog_p0/hive/test_hive_partitions.out b/regression-test/data/external_table_p0/hive/test_hive_partitions.out similarity index 100% rename from regression-test/data/external_catalog_p0/hive/test_hive_partitions.out rename to regression-test/data/external_table_p0/hive/test_hive_partitions.out diff --git a/regression-test/data/external_catalog_p0/hive/test_transactional_hive.out b/regression-test/data/external_table_p0/hive/test_transactional_hive.out similarity index 100% rename from regression-test/data/external_catalog_p0/hive/test_transactional_hive.out rename to regression-test/data/external_table_p0/hive/test_transactional_hive.out diff --git a/regression-test/data/jdbc_catalog_p0/test_clickhouse_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_clickhouse_jdbc_catalog.out rename to regression-test/data/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.out diff --git a/regression-test/data/jdbc_catalog_p0/test_doris_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_doris_jdbc_catalog.out rename to regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out diff --git a/regression-test/data/jdbc_p0/test_jdbc_query_mysql.out b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out similarity index 100% rename from regression-test/data/jdbc_p0/test_jdbc_query_mysql.out rename to regression-test/data/external_table_p0/jdbc/test_jdbc_query_mysql.out diff --git a/regression-test/data/jdbc_p0/test_jdbc_query_pg.out b/regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out similarity index 100% rename from regression-test/data/jdbc_p0/test_jdbc_query_pg.out rename to regression-test/data/external_table_p0/jdbc/test_jdbc_query_pg.out diff --git a/regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog.out rename to regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out diff --git a/regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog_nereids.out b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_mysql_jdbc_catalog_nereids.out rename to regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.out diff --git a/regression-test/data/jdbc_catalog_p0/test_oracle_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_oracle_jdbc_catalog.out rename to regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out diff --git a/regression-test/data/jdbc_catalog_p0/test_pg_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_pg_jdbc_catalog.out rename to regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out diff --git a/regression-test/data/jdbc_catalog_p0/test_sqlserver_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out similarity index 100% rename from regression-test/data/jdbc_catalog_p0/test_sqlserver_jdbc_catalog.out rename to regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out diff --git a/regression-test/data/correctness_p0/table_valued_function/test_catalogs_tvf.out b/regression-test/data/external_table_p0/tvf/test_catalogs_tvf.out similarity index 100% rename from regression-test/data/correctness_p0/table_valued_function/test_catalogs_tvf.out rename to regression-test/data/external_table_p0/tvf/test_catalogs_tvf.out diff --git a/regression-test/data/correctness_p0/table_valued_function/test_create_view_from_tvf.out b/regression-test/data/external_table_p0/tvf/test_create_view_from_tvf.out similarity index 100% rename from regression-test/data/correctness_p0/table_valued_function/test_create_view_from_tvf.out rename to regression-test/data/external_table_p0/tvf/test_create_view_from_tvf.out diff --git a/regression-test/data/correctness_p0/table_valued_function/test_hdfs_tvf.out b/regression-test/data/external_table_p0/tvf/test_hdfs_tvf.out similarity index 100% rename from regression-test/data/correctness_p0/table_valued_function/test_hdfs_tvf.out rename to regression-test/data/external_table_p0/tvf/test_hdfs_tvf.out diff --git a/regression-test/data/correctness_p0/table_valued_function/test_numbers.out b/regression-test/data/external_table_p0/tvf/test_numbers.out similarity index 100% rename from regression-test/data/correctness_p0/table_valued_function/test_numbers.out rename to regression-test/data/external_table_p0/tvf/test_numbers.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_complex_types.out b/regression-test/data/external_table_p2/hive/test_complex_types.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_complex_types.out rename to regression-test/data/external_table_p2/hive/test_complex_types.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_brown.out b/regression-test/data/external_table_p2/hive/test_external_brown.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_brown.out rename to regression-test/data/external_table_p2/hive/test_external_brown.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_catalog_glue_table.out b/regression-test/data/external_table_p2/hive/test_external_catalog_glue_table.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_catalog_glue_table.out rename to regression-test/data/external_table_p2/hive/test_external_catalog_glue_table.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_catalog_hive.out b/regression-test/data/external_table_p2/hive/test_external_catalog_hive.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_catalog_hive.out rename to regression-test/data/external_table_p2/hive/test_external_catalog_hive.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_catalog_hive_partition.out b/regression-test/data/external_table_p2/hive/test_external_catalog_hive_partition.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_catalog_hive_partition.out rename to regression-test/data/external_table_p2/hive/test_external_catalog_hive_partition.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_credit_data.out b/regression-test/data/external_table_p2/hive/test_external_credit_data.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_credit_data.out rename to regression-test/data/external_table_p2/hive/test_external_credit_data.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_github.out b/regression-test/data/external_table_p2/hive/test_external_github.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_github.out rename to regression-test/data/external_table_p2/hive/test_external_github.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_yandex.out b/regression-test/data/external_table_p2/hive/test_external_yandex.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_yandex.out rename to regression-test/data/external_table_p2/hive/test_external_yandex.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_external_yandex_nereids.out b/regression-test/data/external_table_p2/hive/test_external_yandex_nereids.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_external_yandex_nereids.out rename to regression-test/data/external_table_p2/hive/test_external_yandex_nereids.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_default_partition.out b/regression-test/data/external_table_p2/hive/test_hive_default_partition.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_default_partition.out rename to regression-test/data/external_table_p2/hive/test_hive_default_partition.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_partition_location.out b/regression-test/data/external_table_p2/hive/test_hive_partition_location.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_partition_location.out rename to regression-test/data/external_table_p2/hive/test_hive_partition_location.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_remove_partition.out b/regression-test/data/external_table_p2/hive/test_hive_remove_partition.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_remove_partition.out rename to regression-test/data/external_table_p2/hive/test_hive_remove_partition.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_same_db_table_name.out b/regression-test/data/external_table_p2/hive/test_hive_same_db_table_name.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_same_db_table_name.out rename to regression-test/data/external_table_p2/hive/test_hive_same_db_table_name.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_schema_evolution.out b/regression-test/data/external_table_p2/hive/test_hive_schema_evolution.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_schema_evolution.out rename to regression-test/data/external_table_p2/hive/test_hive_schema_evolution.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_special_char_partition.out b/regression-test/data/external_table_p2/hive/test_hive_special_char_partition.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_special_char_partition.out rename to regression-test/data/external_table_p2/hive/test_hive_special_char_partition.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_to_array.out b/regression-test/data/external_table_p2/hive/test_hive_to_array.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_to_array.out rename to regression-test/data/external_table_p2/hive/test_hive_to_array.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_hive_to_date.out b/regression-test/data/external_table_p2/hive/test_hive_to_date.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_hive_to_date.out rename to regression-test/data/external_table_p2/hive/test_hive_to_date.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_mixed_par_locations.out b/regression-test/data/external_table_p2/hive/test_mixed_par_locations.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_mixed_par_locations.out rename to regression-test/data/external_table_p2/hive/test_mixed_par_locations.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_multi_langs.out b/regression-test/data/external_table_p2/hive/test_multi_langs.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_multi_langs.out rename to regression-test/data/external_table_p2/hive/test_multi_langs.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_select_count_optimize.out b/regression-test/data/external_table_p2/hive/test_select_count_optimize.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_select_count_optimize.out rename to regression-test/data/external_table_p2/hive/test_select_count_optimize.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_upper_case_column_name.out b/regression-test/data/external_table_p2/hive/test_upper_case_column_name.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_upper_case_column_name.out rename to regression-test/data/external_table_p2/hive/test_upper_case_column_name.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_wide_table.out b/regression-test/data/external_table_p2/hive/test_wide_table.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_wide_table.out rename to regression-test/data/external_table_p2/hive/test_wide_table.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/iceberg_partition_upper_case.out b/regression-test/data/external_table_p2/iceberg/iceberg_partition_upper_case.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/iceberg_partition_upper_case.out rename to regression-test/data/external_table_p2/iceberg/iceberg_partition_upper_case.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/iceberg_partition_upper_case_nereids.out b/regression-test/data/external_table_p2/iceberg/iceberg_partition_upper_case_nereids.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/iceberg_partition_upper_case_nereids.out rename to regression-test/data/external_table_p2/iceberg/iceberg_partition_upper_case_nereids.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/iceberg_schema_evolution.out b/regression-test/data/external_table_p2/iceberg/iceberg_schema_evolution.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/iceberg_schema_evolution.out rename to regression-test/data/external_table_p2/iceberg/iceberg_schema_evolution.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.out b/regression-test/data/external_table_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.out rename to regression-test/data/external_table_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_iceberg_partition.out b/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_partition.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_iceberg_partition.out rename to regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_partition.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out b/regression-test/data/external_table_p2/iceberg/test_external_catalog_icebergv2.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.out rename to regression-test/data/external_table_p2/iceberg/test_external_catalog_icebergv2.out diff --git a/regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2_nereids.out b/regression-test/data/external_table_p2/iceberg/test_external_catalog_icebergv2_nereids.out similarity index 100% rename from regression-test/data/external_table_emr_p2/iceberg/test_external_catalog_icebergv2_nereids.out rename to regression-test/data/external_table_p2/iceberg/test_external_catalog_icebergv2_nereids.out diff --git a/regression-test/data/external_table_emr_p2/hive/test_tvf_p2.out b/regression-test/data/external_table_p2/tvf/test_tvf_p2.out similarity index 100% rename from regression-test/data/external_table_emr_p2/hive/test_tvf_p2.out rename to regression-test/data/external_table_p2/tvf/test_tvf_p2.out diff --git a/regression-test/suites/es_p0/test_es_query.groovy b/regression-test/suites/external_table_p0/es/test_es_query.groovy similarity index 100% rename from regression-test/suites/es_p0/test_es_query.groovy rename to regression-test/suites/external_table_p0/es/test_es_query.groovy diff --git a/regression-test/suites/es_p0/test_es_query_nereids.groovy b/regression-test/suites/external_table_p0/es/test_es_query_nereids.groovy similarity index 100% rename from regression-test/suites/es_p0/test_es_query_nereids.groovy rename to regression-test/suites/external_table_p0/es/test_es_query_nereids.groovy diff --git a/regression-test/suites/es_p0/test_es_query_no_http_url.groovy b/regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy similarity index 100% rename from regression-test/suites/es_p0/test_es_query_no_http_url.groovy rename to regression-test/suites/external_table_p0/es/test_es_query_no_http_url.groovy diff --git a/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy b/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_orc.groovy similarity index 100% rename from regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_orc.groovy rename to regression-test/suites/external_table_p0/hive/hive_tpch_sf1_orc.groovy diff --git a/regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy b/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy similarity index 100% rename from regression-test/suites/tpch_sf1_p0/multi_catalog_query/hive_catalog_parquet.groovy rename to regression-test/suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_different_column_orders.groovy b/regression-test/suites/external_table_p0/hive/test_different_column_orders.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_different_column_orders.groovy rename to regression-test/suites/external_table_p0/hive/test_different_column_orders.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_different_parquet_types.groovy b/regression-test/suites/external_table_p0/hive/test_different_parquet_types.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_different_parquet_types.groovy rename to regression-test/suites/external_table_p0/hive/test_different_parquet_types.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_hive_orc.groovy b/regression-test/suites/external_table_p0/hive/test_hive_orc.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_hive_orc.groovy rename to regression-test/suites/external_table_p0/hive/test_hive_orc.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_hive_other.groovy rename to regression-test/suites/external_table_p0/hive/test_hive_other.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_hive_parquet.groovy b/regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_hive_parquet.groovy rename to regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_hive_partitions.groovy b/regression-test/suites/external_table_p0/hive/test_hive_partitions.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_hive_partitions.groovy rename to regression-test/suites/external_table_p0/hive/test_hive_partitions.groovy diff --git a/regression-test/suites/external_catalog_p0/hive/test_transactional_hive.groovy b/regression-test/suites/external_table_p0/hive/test_transactional_hive.groovy similarity index 100% rename from regression-test/suites/external_catalog_p0/hive/test_transactional_hive.groovy rename to regression-test/suites/external_table_p0/hive/test_transactional_hive.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_clickhouse_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_clickhouse_jdbc_catalog.groovy rename to regression-test/suites/external_table_p0/jdbc/test_clickhouse_jdbc_catalog.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_doris_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_doris_jdbc_catalog.groovy rename to regression-test/suites/external_table_p0/jdbc/test_doris_jdbc_catalog.groovy diff --git a/regression-test/suites/jdbc_p0/test_jdbc_query_mysql.groovy b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy similarity index 100% rename from regression-test/suites/jdbc_p0/test_jdbc_query_mysql.groovy rename to regression-test/suites/external_table_p0/jdbc/test_jdbc_query_mysql.groovy diff --git a/regression-test/suites/jdbc_p0/test_jdbc_query_pg.groovy b/regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy similarity index 100% rename from regression-test/suites/jdbc_p0/test_jdbc_query_pg.groovy rename to regression-test/suites/external_table_p0/jdbc/test_jdbc_query_pg.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog.groovy rename to regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog_nereids.groovy b/regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_mysql_jdbc_catalog_nereids.groovy rename to regression-test/suites/external_table_p0/jdbc/test_mysql_jdbc_catalog_nereids.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_oracle_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_oracle_jdbc_catalog.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_oracle_jdbc_catalog.groovy rename to regression-test/suites/external_table_p0/jdbc/test_oracle_jdbc_catalog.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_pg_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_pg_jdbc_catalog.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_pg_jdbc_catalog.groovy rename to regression-test/suites/external_table_p0/jdbc/test_pg_jdbc_catalog.groovy diff --git a/regression-test/suites/jdbc_catalog_p0/test_sqlserver_jdbc_catalog.groovy b/regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy similarity index 100% rename from regression-test/suites/jdbc_catalog_p0/test_sqlserver_jdbc_catalog.groovy rename to regression-test/suites/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.groovy diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_backends_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_backends_tvf.groovy similarity index 100% rename from regression-test/suites/correctness_p0/table_valued_function/test_backends_tvf.groovy rename to regression-test/suites/external_table_p0/tvf/test_backends_tvf.groovy diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_catalogs_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy similarity index 100% rename from regression-test/suites/correctness_p0/table_valued_function/test_catalogs_tvf.groovy rename to regression-test/suites/external_table_p0/tvf/test_catalogs_tvf.groovy diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_create_view_from_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_create_view_from_tvf.groovy similarity index 100% rename from regression-test/suites/correctness_p0/table_valued_function/test_create_view_from_tvf.groovy rename to regression-test/suites/external_table_p0/tvf/test_create_view_from_tvf.groovy diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_frontends_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_frontends_tvf.groovy similarity index 100% rename from regression-test/suites/correctness_p0/table_valued_function/test_frontends_tvf.groovy rename to regression-test/suites/external_table_p0/tvf/test_frontends_tvf.groovy diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_hdfs_tvf.groovy b/regression-test/suites/external_table_p0/tvf/test_hdfs_tvf.groovy similarity index 100% rename from regression-test/suites/correctness_p0/table_valued_function/test_hdfs_tvf.groovy rename to regression-test/suites/external_table_p0/tvf/test_hdfs_tvf.groovy diff --git a/regression-test/suites/correctness_p0/table_valued_function/test_numbers.groovy b/regression-test/suites/external_table_p0/tvf/test_numbers.groovy similarity index 100% rename from regression-test/suites/correctness_p0/table_valued_function/test_numbers.groovy rename to regression-test/suites/external_table_p0/tvf/test_numbers.groovy diff --git a/regression-test/suites/external_table_emr_p2/es/test_external_catalog_es.groovy b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/es/test_external_catalog_es.groovy rename to regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy diff --git a/regression-test/suites/external_table_emr_p2/es/test_external_es.groovy b/regression-test/suites/external_table_p2/es/test_external_es.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/es/test_external_es.groovy rename to regression-test/suites/external_table_p2/es/test_external_es.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_complex_types.groovy b/regression-test/suites/external_table_p2/hive/test_complex_types.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_complex_types.groovy rename to regression-test/suites/external_table_p2/hive/test_complex_types.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_brown.groovy b/regression-test/suites/external_table_p2/hive/test_external_brown.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_brown.groovy rename to regression-test/suites/external_table_p2/hive/test_external_brown.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_catalog_glue_table.groovy b/regression-test/suites/external_table_p2/hive/test_external_catalog_glue_table.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_catalog_glue_table.groovy rename to regression-test/suites/external_table_p2/hive/test_external_catalog_glue_table.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_catalog_hive.groovy b/regression-test/suites/external_table_p2/hive/test_external_catalog_hive.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_catalog_hive.groovy rename to regression-test/suites/external_table_p2/hive/test_external_catalog_hive.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_catalog_hive_partition.groovy b/regression-test/suites/external_table_p2/hive/test_external_catalog_hive_partition.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_catalog_hive_partition.groovy rename to regression-test/suites/external_table_p2/hive/test_external_catalog_hive_partition.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_credit_data.groovy b/regression-test/suites/external_table_p2/hive/test_external_credit_data.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_credit_data.groovy rename to regression-test/suites/external_table_p2/hive/test_external_credit_data.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_github.groovy b/regression-test/suites/external_table_p2/hive/test_external_github.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_github.groovy rename to regression-test/suites/external_table_p2/hive/test_external_github.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_yandex.groovy b/regression-test/suites/external_table_p2/hive/test_external_yandex.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_yandex.groovy rename to regression-test/suites/external_table_p2/hive/test_external_yandex.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_external_yandex_nereids.groovy b/regression-test/suites/external_table_p2/hive/test_external_yandex_nereids.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_external_yandex_nereids.groovy rename to regression-test/suites/external_table_p2/hive/test_external_yandex_nereids.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_analyze_db.groovy b/regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_analyze_db.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_analyze_db.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_default_partition.groovy b/regression-test/suites/external_table_p2/hive/test_hive_default_partition.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_default_partition.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_default_partition.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_partition_location.groovy b/regression-test/suites/external_table_p2/hive/test_hive_partition_location.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_partition_location.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_partition_location.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_remove_partition.groovy b/regression-test/suites/external_table_p2/hive/test_hive_remove_partition.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_remove_partition.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_remove_partition.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_same_db_table_name.groovy b/regression-test/suites/external_table_p2/hive/test_hive_same_db_table_name.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_same_db_table_name.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_same_db_table_name.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_schema_evolution.groovy b/regression-test/suites/external_table_p2/hive/test_hive_schema_evolution.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_schema_evolution.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_schema_evolution.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_special_char_partition.groovy b/regression-test/suites/external_table_p2/hive/test_hive_special_char_partition.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_special_char_partition.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_special_char_partition.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_statistic.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_statistic.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_statistic.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_statistic_cache.groovy b/regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_statistic_cache.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_statistic_cache.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_to_array.groovy b/regression-test/suites/external_table_p2/hive/test_hive_to_array.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_to_array.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_to_array.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_hive_to_date.groovy b/regression-test/suites/external_table_p2/hive/test_hive_to_date.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_hive_to_date.groovy rename to regression-test/suites/external_table_p2/hive/test_hive_to_date.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_mixed_par_locations.groovy b/regression-test/suites/external_table_p2/hive/test_mixed_par_locations.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_mixed_par_locations.groovy rename to regression-test/suites/external_table_p2/hive/test_mixed_par_locations.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_multi_langs.groovy b/regression-test/suites/external_table_p2/hive/test_multi_langs.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_multi_langs.groovy rename to regression-test/suites/external_table_p2/hive/test_multi_langs.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_select_count_optimize.groovy b/regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_select_count_optimize.groovy rename to regression-test/suites/external_table_p2/hive/test_select_count_optimize.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_upper_case_column_name.groovy b/regression-test/suites/external_table_p2/hive/test_upper_case_column_name.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_upper_case_column_name.groovy rename to regression-test/suites/external_table_p2/hive/test_upper_case_column_name.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_wide_table.groovy b/regression-test/suites/external_table_p2/hive/test_wide_table.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_wide_table.groovy rename to regression-test/suites/external_table_p2/hive/test_wide_table.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/iceberg_partition_upper_case.groovy b/regression-test/suites/external_table_p2/iceberg/iceberg_partition_upper_case.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/iceberg_partition_upper_case.groovy rename to regression-test/suites/external_table_p2/iceberg/iceberg_partition_upper_case.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/iceberg_partition_upper_case_nereids.groovy b/regression-test/suites/external_table_p2/iceberg/iceberg_partition_upper_case_nereids.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/iceberg_partition_upper_case_nereids.groovy rename to regression-test/suites/external_table_p2/iceberg/iceberg_partition_upper_case_nereids.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/iceberg_schema_evolution.groovy b/regression-test/suites/external_table_p2/iceberg/iceberg_schema_evolution.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/iceberg_schema_evolution.groovy rename to regression-test/suites/external_table_p2/iceberg/iceberg_schema_evolution.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.groovy b/regression-test/suites/external_table_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.groovy rename to regression-test/suites/external_table_p2/iceberg/iceberg_schema_evolution_iceberg_catalog.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_iceberg_partition.groovy b/regression-test/suites/external_table_p2/iceberg/test_external_catalog_iceberg_partition.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_iceberg_partition.groovy rename to regression-test/suites/external_table_p2/iceberg/test_external_catalog_iceberg_partition.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy b/regression-test/suites/external_table_p2/iceberg/test_external_catalog_icebergv2.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2.groovy rename to regression-test/suites/external_table_p2/iceberg/test_external_catalog_icebergv2.groovy diff --git a/regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2_nereids.groovy b/regression-test/suites/external_table_p2/iceberg/test_external_catalog_icebergv2_nereids.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/iceberg/test_external_catalog_icebergv2_nereids.groovy rename to regression-test/suites/external_table_p2/iceberg/test_external_catalog_icebergv2_nereids.groovy diff --git a/regression-test/suites/external_table_emr_p2/mysql/test_external_catalog_mysql.groovy b/regression-test/suites/external_table_p2/mysql/test_external_catalog_mysql.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/mysql/test_external_catalog_mysql.groovy rename to regression-test/suites/external_table_p2/mysql/test_external_catalog_mysql.groovy diff --git a/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql.groovy b/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql.groovy rename to regression-test/suites/external_table_p2/mysql/test_external_resource_mysql.groovy diff --git a/regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql_nereids.groovy b/regression-test/suites/external_table_p2/mysql/test_external_resource_mysql_nereids.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/mysql/test_external_resource_mysql_nereids.groovy rename to regression-test/suites/external_table_p2/mysql/test_external_resource_mysql_nereids.groovy diff --git a/regression-test/suites/external_table_emr_p2/pg/test_external_pg.groovy b/regression-test/suites/external_table_p2/pg/test_external_pg.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/pg/test_external_pg.groovy rename to regression-test/suites/external_table_p2/pg/test_external_pg.groovy diff --git a/regression-test/suites/external_table_emr_p2/pg/test_external_pg_nereids.groovy b/regression-test/suites/external_table_p2/pg/test_external_pg_nereids.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/pg/test_external_pg_nereids.groovy rename to regression-test/suites/external_table_p2/pg/test_external_pg_nereids.groovy diff --git a/regression-test/suites/external_table_emr_p2/hive/test_tvf_p2.groovy b/regression-test/suites/external_table_p2/tvf/test_tvf_p2.groovy similarity index 100% rename from regression-test/suites/external_table_emr_p2/hive/test_tvf_p2.groovy rename to regression-test/suites/external_table_p2/tvf/test_tvf_p2.groovy