This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push: new 45556686ea4 [fix](test) fix some external test cases (#34209) 45556686ea4 is described below commit 45556686ea45d024e3759a4dc933d7c6b6e2fed4 Author: Mingyu Chen <morning...@163.com> AuthorDate: Sat Apr 27 23:25:33 2024 +0800 [fix](test) fix some external test cases (#34209) Fix some test cases and enable `test_information_schema_external` suite --- .../hive/test_information_schema_external.out | 244 ++++++++++----------- ...est_external_catalog_iceberg_hadoop_catalog.out | 9 +- .../test_external_catalog_iceberg_partition.out | 46 ++-- .../pipeline/p0/conf/regression-conf.groovy | 1 - .../hive/test_information_schema_external.groovy | 42 ++-- .../hive/test_prepare_hive_data_in_case.groovy | 2 +- .../paimon/paimon_base_types.groovy | 4 +- 7 files changed, 174 insertions(+), 174 deletions(-) diff --git a/regression-test/data/external_table_p0/hive/test_information_schema_external.out b/regression-test/data/external_table_p0/hive/test_information_schema_external.out index 05a9f7b6093..199b9e0b123 100644 --- a/regression-test/data/external_table_p0/hive/test_information_schema_external.out +++ b/regression-test/data/external_table_p0/hive/test_information_schema_external.out @@ -1,17 +1,17 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !schemata_1 -- -test_information_schema_external default utf8 utf8_general_ci \N +test_information_schema_external_hive2 default utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_2 -- -internal info_schema_ext_db_1 utf8 utf8_general_ci \N +internal info_schema_ext_db_1 utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_3 -- -internal info_schema_ext_db_2 utf8 utf8_general_ci \N +internal info_schema_ext_db_2 utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_4 -- -- !schemata_5 -- -internal info_schema_ext_db_2 utf8 utf8_general_ci \N +internal info_schema_ext_db_2 utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_6 -- @@ -30,101 +30,101 @@ internal info_schema_ext_db abcd id 1 \N NO int \N \N 10 0 \N \N \N int(11) UNI internal info_schema_ext_db abcd name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -- !columns_3 -- -test_information_schema_external tpch1_parquet customer c_acctbal 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet customer c_address 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_comment 8 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_custkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet customer c_mktsegment 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_nationkey 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet customer c_phone 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_acctbal 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_address 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_comment 8 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_custkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_mktsegment 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_nationkey 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet customer c_phone 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -- !columns_4 -- -test_information_schema_external tpch1_parquet lineitem l_comment 16 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_commitdate 12 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet lineitem l_discount 7 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet lineitem l_extendedprice 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet lineitem l_linenumber 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_linestatus 10 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_partkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_quantity 5 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet lineitem l_receiptdate 13 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet lineitem l_returnflag 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_shipdate 11 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet lineitem l_shipinstruct 14 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_shipmode 15 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_suppkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_tax 8 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_comment 16 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_commitdate 12 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_discount 7 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_extendedprice 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_linenumber 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_linestatus 10 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_partkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_quantity 5 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_receiptdate 13 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_returnflag 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_shipdate 11 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_shipinstruct 14 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_shipmode 15 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_suppkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet lineitem l_tax 8 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -- !columns_5 -- -test_information_schema_external tpch1_parquet nation n_comment 4 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet nation n_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet nation n_nationkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet nation n_regionkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet nation n_comment 4 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet nation n_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet nation n_nationkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet nation n_regionkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -- !columns_6 -- -test_information_schema_external tpch1_parquet orders o_clerk 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_comment 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_custkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet orders o_orderdate 5 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet orders o_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet orders o_orderpriority 6 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_orderstatus 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_shippriority 8 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet orders o_totalprice 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_clerk 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_comment 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_custkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_orderdate 5 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_orderpriority 6 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_orderstatus 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_shippriority 8 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet orders o_totalprice 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -- !columns_7 -- -test_information_schema_external tpch1_parquet partsupp ps_availqty 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet partsupp ps_comment 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet partsupp ps_partkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet partsupp ps_suppkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet partsupp ps_supplycost 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive2 tpch1_parquet partsupp ps_availqty 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet partsupp ps_comment 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive2 tpch1_parquet partsupp ps_partkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet partsupp ps_suppkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive2 tpch1_parquet partsupp ps_supplycost 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -- !ids_1 -- -test_information_schema_external tpch1_parquet customer +test_information_schema_external_hive2 tpch1_parquet customer -- !ids_2 -- -test_information_schema_external tpch1_parquet lineitem +test_information_schema_external_hive2 tpch1_parquet lineitem -- !ids_3 -- -test_information_schema_external tpch1_parquet nation +test_information_schema_external_hive2 tpch1_parquet nation -- !ids_4 -- -test_information_schema_external tpch1_parquet orders +test_information_schema_external_hive2 tpch1_parquet orders -- !ids_5 -- -test_information_schema_external tpch1_parquet part +test_information_schema_external_hive2 tpch1_parquet part -- !ids_6 -- -test_information_schema_external tpch1_parquet partsupp +test_information_schema_external_hive2 tpch1_parquet partsupp -- !ids_7 -- -test_information_schema_external tpch1_parquet region +test_information_schema_external_hive2 tpch1_parquet region -- !ids_8 -- -test_information_schema_external tpch1_parquet supplier +test_information_schema_external_hive2 tpch1_parquet supplier -- !tables_1 -- -test_information_schema_external tpch1_parquet supplier HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet supplier BASE TABLE hms 0 \N -- !tables_2 -- -test_information_schema_external tpch1_parquet region HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet region BASE TABLE hms 0 \N -- !tables_3 -- -test_information_schema_external tpch1_parquet customer HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet customer BASE TABLE hms 0 \N -- !tables_4 -- -test_information_schema_external tpch1_parquet lineitem HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet lineitem BASE TABLE hms 0 \N -- !tables_5 -- -test_information_schema_external tpch1_parquet nation HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet nation BASE TABLE hms 0 \N -- !tables_6 -- -test_information_schema_external tpch1_parquet orders HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet orders BASE TABLE hms 0 \N -- !tables_7 -- -test_information_schema_external tpch1_parquet partsupp HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive2 tpch1_parquet partsupp BASE TABLE hms 0 \N -- !views_1 -- \N info_schema_ext_db test_view NONE NO root@% DEFINER utf8 \N @@ -132,18 +132,18 @@ test_information_schema_external tpch1_parquet partsupp HMS_EXTERNAL_TABLE \N 0 -- !views_2 -- -- !schemata_1 -- -test_information_schema_external default utf8 utf8_general_ci \N +test_information_schema_external_hive3 default utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_2 -- -internal info_schema_ext_db_1 utf8 utf8_general_ci \N +internal info_schema_ext_db_1 utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_3 -- -internal info_schema_ext_db_2 utf8 utf8_general_ci \N +internal info_schema_ext_db_2 utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_4 -- -- !schemata_5 -- -internal info_schema_ext_db_2 utf8 utf8_general_ci \N +internal info_schema_ext_db_2 utf8mb4 utf8mb4_0900_bin \N NO -- !schemata_6 -- @@ -162,101 +162,101 @@ internal info_schema_ext_db abcd id 1 \N NO int \N \N 10 0 \N \N \N int(11) UNI internal info_schema_ext_db abcd name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -- !columns_3 -- -test_information_schema_external tpch1_parquet customer c_acctbal 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet customer c_address 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_comment 8 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_custkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet customer c_mktsegment 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet customer c_nationkey 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet customer c_phone 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_acctbal 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_address 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_comment 8 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_custkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_mktsegment 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_nationkey 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet customer c_phone 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -- !columns_4 -- -test_information_schema_external tpch1_parquet lineitem l_comment 16 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_commitdate 12 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet lineitem l_discount 7 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet lineitem l_extendedprice 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet lineitem l_linenumber 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_linestatus 10 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_partkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_quantity 5 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -test_information_schema_external tpch1_parquet lineitem l_receiptdate 13 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet lineitem l_returnflag 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_shipdate 11 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet lineitem l_shipinstruct 14 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_shipmode 15 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet lineitem l_suppkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet lineitem l_tax 8 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_comment 16 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_commitdate 12 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_discount 7 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_extendedprice 6 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_linenumber 4 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_linestatus 10 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_partkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_quantity 5 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_receiptdate 13 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_returnflag 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_shipdate 11 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_shipinstruct 14 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_shipmode 15 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_suppkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet lineitem l_tax 8 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -- !columns_5 -- -test_information_schema_external tpch1_parquet nation n_comment 4 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet nation n_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet nation n_nationkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet nation n_regionkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet nation n_comment 4 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet nation n_name 2 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet nation n_nationkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet nation n_regionkey 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -- !columns_6 -- -test_information_schema_external tpch1_parquet orders o_clerk 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_comment 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_custkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet orders o_orderdate 5 \N YES date \N \N \N \N \N \N \N date \N \N \N \N -test_information_schema_external tpch1_parquet orders o_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet orders o_orderpriority 6 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_orderstatus 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet orders o_shippriority 8 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet orders o_totalprice 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_clerk 7 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_comment 9 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_custkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_orderdate 5 \N YES date \N \N \N \N \N \N \N date \N \N \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_orderkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_orderpriority 6 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_orderstatus 3 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_shippriority 8 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet orders o_totalprice 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -- !columns_7 -- -test_information_schema_external tpch1_parquet partsupp ps_availqty 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet partsupp ps_comment 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N -test_information_schema_external tpch1_parquet partsupp ps_partkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet partsupp ps_suppkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N -test_information_schema_external tpch1_parquet partsupp ps_supplycost 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N +test_information_schema_external_hive3 tpch1_parquet partsupp ps_availqty 3 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet partsupp ps_comment 5 \N YES varchar 2147483643 8589934572 \N \N \N \N \N string 2147483643 \N \N \N +test_information_schema_external_hive3 tpch1_parquet partsupp ps_partkey 1 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet partsupp ps_suppkey 2 \N YES int \N \N 10 0 \N \N \N int(11) 10 0 \N \N +test_information_schema_external_hive3 tpch1_parquet partsupp ps_supplycost 4 \N YES decimal \N \N 12 2 \N \N \N decimalv3(12, 2) 12 2 \N \N -- !ids_1 -- -test_information_schema_external tpch1_parquet customer +test_information_schema_external_hive3 tpch1_parquet customer -- !ids_2 -- -test_information_schema_external tpch1_parquet lineitem +test_information_schema_external_hive3 tpch1_parquet lineitem -- !ids_3 -- -test_information_schema_external tpch1_parquet nation +test_information_schema_external_hive3 tpch1_parquet nation -- !ids_4 -- -test_information_schema_external tpch1_parquet orders +test_information_schema_external_hive3 tpch1_parquet orders -- !ids_5 -- -test_information_schema_external tpch1_parquet part +test_information_schema_external_hive3 tpch1_parquet part -- !ids_6 -- -test_information_schema_external tpch1_parquet partsupp +test_information_schema_external_hive3 tpch1_parquet partsupp -- !ids_7 -- -test_information_schema_external tpch1_parquet region +test_information_schema_external_hive3 tpch1_parquet region -- !ids_8 -- -test_information_schema_external tpch1_parquet supplier +test_information_schema_external_hive3 tpch1_parquet supplier -- !tables_1 -- -test_information_schema_external tpch1_parquet supplier HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet supplier BASE TABLE hms 0 \N -- !tables_2 -- -test_information_schema_external tpch1_parquet region HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet region BASE TABLE hms 0 \N -- !tables_3 -- -test_information_schema_external tpch1_parquet customer HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet customer BASE TABLE hms 0 \N -- !tables_4 -- -test_information_schema_external tpch1_parquet lineitem HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet lineitem BASE TABLE hms 0 \N -- !tables_5 -- -test_information_schema_external tpch1_parquet nation HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet nation BASE TABLE hms 0 \N -- !tables_6 -- -test_information_schema_external tpch1_parquet orders HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet orders BASE TABLE hms 0 \N -- !tables_7 -- -test_information_schema_external tpch1_parquet partsupp HMS_EXTERNAL_TABLE \N 0 \N +test_information_schema_external_hive3 tpch1_parquet partsupp BASE TABLE hms 0 \N -- !views_1 -- \N info_schema_ext_db test_view NONE NO root@% DEFINER utf8 \N diff --git a/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_hadoop_catalog.out b/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_hadoop_catalog.out index c9373c2df17..aaa9037977d 100644 --- a/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_hadoop_catalog.out +++ b/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_hadoop_catalog.out @@ -17,11 +17,10 @@ 5 Customer#000000005 hwBtxkoBF qSW4KrI CANADA 5 CANADA AMERICA 13-750-942-6364 HOUSEHOLD -- !q04 -- -1 1970-01-03T01:02:03.000001 a -1 1970-01-03T01:02:03.000001 b -2 1970-01-03T01:02:04.000001 c -2 1970-01-03T01:02:04.000001 d +1 1970-01-03 09:02:03.000001 a +1 1970-01-03 09:02:03.000001 b +2 1970-01-03 09:02:04.000001 c +2 1970-01-03 09:02:04.000001 d -- !q05 -- 463870 - diff --git a/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_partition.out b/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_partition.out index 14212c9e7af..a0fd39be5f2 100644 --- a/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_partition.out +++ b/regression-test/data/external_table_p2/iceberg/test_external_catalog_iceberg_partition.out @@ -1,39 +1,39 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !q01 -- -\N 0.1 test1 2022-12-31T16:00 -\N 0.2 test2 2023-01-01T16:00 -100 0.3 test3 2023-01-02T16:00 +\N 0.1 test1 2023-01-01T00:00 +\N 0.2 test2 2023-01-02T00:00 +100 0.3 test3 2023-01-03T00:00 -- !q02 -- -\N 0.1 test1 2022-12-31T16:00 -\N 0.2 test2 2023-01-01T16:00 +\N 0.1 test1 2023-01-01T00:00 +\N 0.2 test2 2023-01-02T00:00 -- !q03 -- -100 0.3 test3 2023-01-02T16:00 +100 0.3 test3 2023-01-03T00:00 -- !q04 -- -\N 0.1 test1 2022-12-31T16:00 -\N 0.2 test2 2023-01-01T16:00 -100 0.3 test3 2023-01-02T16:00 +\N 0.1 test1 2023-01-01T00:00 +\N 0.2 test2 2023-01-02T00:00 +100 0.3 test3 2023-01-03T00:00 -- !q05 -- -\N 0.1 test1 2022-12-31T16:00 -\N 0.2 test2 2023-01-01T16:00 +\N 0.1 test1 2023-01-01T00:00 +\N 0.2 test2 2023-01-02T00:00 -- !q06 -- -100 0.3 test3 2023-01-02T16:00 +100 0.3 test3 2023-01-03T00:00 -- !q07 -- -\N 0.1 test1 2022-12-31T16:00 -\N 0.2 test2 2023-01-01T16:00 -100 0.3 test3 2023-01-02T16:00 +\N 0.1 test1 2023-01-01T00:00 +\N 0.2 test2 2023-01-02T00:00 +100 0.3 test3 2023-01-03T00:00 -- !q08 -- -\N 0.1 test1 2022-12-31T16:00 -\N 0.2 test2 2023-01-01T16:00 +\N 0.1 test1 2023-01-01T00:00 +\N 0.2 test2 2023-01-02T00:00 -- !q09 -- -100 0.3 test3 2023-01-02T16:00 +100 0.3 test3 2023-01-03T00:00 -- !q01 -- \N 0.1 test1 2023-01-01T00:00 @@ -72,19 +72,19 @@ 100 0.3 test3 2023-01-03T00:00 -- !q01 -- -1 true 2020-01-02 2020-01-01T17:02:03.123456 +1 true 2020-01-02 2020-01-02T01:02:03.123456 -- !q02 -- -1 true 2020-01-02 2020-01-01T17:02:03.123456 +1 true 2020-01-02 2020-01-02T01:02:03.123456 -- !q03 -- -1 true 2020-01-02 2020-01-01T17:02:03.123456 +1 true 2020-01-02 2020-01-02T01:02:03.123456 -- !q04 -- -1 true 2020-01-02 2020-01-01T17:02:03.123456 +1 true 2020-01-02 2020-01-02T01:02:03.123456 -- !q05 -- -1 true 2020-01-02 2020-01-01T17:02:03.123456 +1 true 2020-01-02 2020-01-02T01:02:03.123456 -- !q06 -- 1 2020-01-02 diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy b/regression-test/pipeline/p0/conf/regression-conf.groovy index 99fec1cd11b..98b8520194a 100644 --- a/regression-test/pipeline/p0/conf/regression-conf.groovy +++ b/regression-test/pipeline/p0/conf/regression-conf.groovy @@ -65,7 +65,6 @@ excludeSuites = "000_the_start_sentinel_do_not_touch," + // keep this line as th "test_bitmap_filter," + "test_dump_image," + "test_index_failure_injection," + - "test_information_schema_external," + "test_profile," + "test_refresh_mtmv," + "test_spark_load," + diff --git a/regression-test/suites/external_table_p0/hive/test_information_schema_external.groovy b/regression-test/suites/external_table_p0/hive/test_information_schema_external.groovy index c846060ff70..71cd62f8d6e 100644 --- a/regression-test/suites/external_table_p0/hive/test_information_schema_external.groovy +++ b/regression-test/suites/external_table_p0/hive/test_information_schema_external.groovy @@ -40,7 +40,7 @@ suite("test_information_schema_external", "p0,external,hive,external_docker,exte //schemata order_qt_schemata_1 """ - select * from internal.information_schema.schemata + select * from ${catalog_name}.information_schema.schemata where CATALOG_NAME = "${catalog_name}" and SCHEMA_NAME = "default"; """ sql """ create database if not exists ${db_name}_1; """ @@ -105,23 +105,23 @@ suite("test_information_schema_external", "p0,external,hive,external_docker,exte where TABLE_CATALOG = "internal" and TABLE_SCHEMA = "${db_name}"; """ order_qt_columns_3 """ - select * from internal.information_schema.columns + select * from ${catalog_name}.information_schema.columns where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "customer"; """ order_qt_columns_4 """ - select * from internal.information_schema.columns + select * from ${catalog_name}.information_schema.columns where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "lineitem"; """ order_qt_columns_5 """ - select * from internal.information_schema.columns + select * from ${catalog_name}.information_schema.columns where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "nation"; """ order_qt_columns_6 """ - select * from internal.information_schema.columns + select * from ${catalog_name}.information_schema.columns where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "orders"; """ order_qt_columns_7 """ - select * from internal.information_schema.columns + select * from ${catalog_name}.information_schema.columns where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "partsupp"; """ sql """ drop table if exists ${db_name}.abcd """ @@ -129,65 +129,65 @@ suite("test_information_schema_external", "p0,external,hive,external_docker,exte //metadata_name_ids order_qt_ids_1 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "customer"; """ order_qt_ids_2 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "lineitem"; """ order_qt_ids_3 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "nation"; """ order_qt_ids_4 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "orders"; """ order_qt_ids_5 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "part"; """ order_qt_ids_6 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "partsupp"; """ order_qt_ids_7 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "region"; """ order_qt_ids_8 """ - select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from internal.information_schema.metadata_name_ids + select CATALOG_NAME,DATABASE_NAME,TABLE_NAME from ${catalog_name}.information_schema.metadata_name_ids where CATALOG_NAME = "${catalog_name}" and DATABASE_NAME = "tpch1_parquet" and TABLE_NAME = "supplier"; """ //tables order_qt_tables_1 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "supplier"; """ order_qt_tables_2 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "region"; """ order_qt_tables_3 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "customer"; """ order_qt_tables_4 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "lineitem"; """ order_qt_tables_5 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "nation"; """ order_qt_tables_6 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "orders"; """ order_qt_tables_7 """ - select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from internal.information_schema.tables + select TABLE_CATALOG,TABLE_SCHEMA,TABLE_NAME,TABLE_TYPE,ENGINE,DATA_LENGTH,MAX_DATA_LENGTH,TABLE_COMMENT from ${catalog_name}.information_schema.tables where TABLE_CATALOG = "${catalog_name}" and TABLE_SCHEMA = "tpch1_parquet" and TABLE_NAME = "partsupp"; """ diff --git a/regression-test/suites/external_table_p0/hive/test_prepare_hive_data_in_case.groovy b/regression-test/suites/external_table_p0/hive/test_prepare_hive_data_in_case.groovy index 759e578d917..e64417afaad 100644 --- a/regression-test/suites/external_table_p0/hive/test_prepare_hive_data_in_case.groovy +++ b/regression-test/suites/external_table_p0/hive/test_prepare_hive_data_in_case.groovy @@ -24,7 +24,7 @@ suite("test_prepare_hive_data_in_case", "p0,external,hive,external_docker,extern } for (String hivePrefix : ["hive2", "hive3"]) { - setHivePrefix(hivePrefix) + setHivePrefix(hivePrefix) try { String externalEnvIp = context.config.otherConfigs.get("externalEnvIp") String hms_port = context.config.otherConfigs.get(hivePrefix + "HmsPort") diff --git a/regression-test/suites/external_table_p2/paimon/paimon_base_types.groovy b/regression-test/suites/external_table_p2/paimon/paimon_base_types.groovy index 5d14a7defa6..74994404564 100644 --- a/regression-test/suites/external_table_p2/paimon/paimon_base_types.groovy +++ b/regression-test/suites/external_table_p2/paimon/paimon_base_types.groovy @@ -39,13 +39,15 @@ suite("paimon_base_types", "p2,external,paimon,external_remote,external_remote_p if (enabled != null && enabled.equalsIgnoreCase("true")) { String catalog_name = "paimon" String user_name = context.config.otherConfigs.get("extHiveHmsUser") + String hiveHost = context.config.otherConfigs.get("extHiveHmsHost") + String hivePort = context.config.otherConfigs.get("extHdfsPort") sql """drop catalog if exists ${catalog_name};""" sql """ create catalog if not exists ${catalog_name} properties ( "type" = "paimon", "paimon.catalog.type" = "filesystem", - "warehouse" = "hdfs:///paimon/paimon1", + "warehouse" = "hdfs://${hiveHost}:${hivePort}/paimon/paimon1", "hadoop.username" = "${user_name}" ); """ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org