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 55636e8035f [test](migrate) move 3 cases from p2 to p0 (#36957)
(#37264)
55636e8035f is described below
commit 55636e8035f7492e8db6ba1971329ca86952ec6d
Author: Mingyu Chen <[email protected]>
AuthorDate: Thu Jul 4 20:09:59 2024 +0800
[test](migrate) move 3 cases from p2 to p0 (#36957) (#37264)
bp #36957
Co-authored-by: slothever <[email protected]>
---
.../test_chinese_orc/create_table.hql | 19 +++
.../multi_catalog/test_chinese_orc/data.tar.gz | Bin 0 -> 415 bytes
.../data/multi_catalog/test_chinese_orc/run.sh | 12 ++
.../test_chinese_parquet/create_table.hql | 19 +++
.../multi_catalog/test_chinese_parquet/data.tar.gz | Bin 0 -> 413 bytes
.../data/multi_catalog/test_chinese_parquet/run.sh | 12 ++
.../test_chinese_text/create_table.hql | 23 ++++
.../multi_catalog/test_chinese_text/data.tar.gz | Bin 0 -> 198 bytes
.../data/multi_catalog/test_chinese_text/run.sh | 12 ++
.../test_multi_langs_orc/create_table.hql | 17 +++
.../multi_catalog/test_multi_langs_orc/data.tar.gz | Bin 0 -> 787 bytes
.../data/multi_catalog/test_multi_langs_orc/run.sh | 12 ++
.../test_multi_langs_parquet/create_table.hql | 17 +++
.../test_multi_langs_parquet/data.tar.gz | Bin 0 -> 783 bytes
.../multi_catalog/test_multi_langs_parquet/run.sh | 12 ++
.../test_multi_langs_text/create_table.hql | 21 +++
.../test_multi_langs_text/data.tar.gz | Bin 0 -> 512 bytes
.../multi_catalog/test_multi_langs_text/run.sh | 12 ++
.../multi_catalog/type_change_orc/create_table.hql | 45 +++++++
.../data/multi_catalog/type_change_orc/data.tar.gz | Bin 0 -> 2889 bytes
.../data/multi_catalog/type_change_orc/run.sh | 12 ++
.../type_change_origin/create_table.hql | 45 +++++++
.../multi_catalog/type_change_origin/data.tar.gz | Bin 0 -> 2892 bytes
.../data/multi_catalog/type_change_origin/run.sh | 12 ++
.../type_change_parquet/create_table.hql | 45 +++++++
.../multi_catalog/type_change_parquet/data.tar.gz | Bin 0 -> 2169 bytes
.../data/multi_catalog/type_change_parquet/run.sh | 12 ++
.../hive/test_hive_schema_change.out | 47 +++++++
.../hive/test_hive_star_qualifier.out | 95 ++++++++++++++
.../hive/test_multi_langs.out | 146 +++++++++++++++++++++
.../hive/test_hive_schema_change.groovy | 35 ++---
.../hive/test_hive_star_qualifier.groovy | 49 +++----
.../external_table_p0/hive/test_multi_langs.groovy | 66 ++++++++++
.../tvf/test_s3_tvf_with_resource.groovy | 7 -
.../external_table_p2/hive/test_multi_langs.groovy | 61 ---------
35 files changed, 760 insertions(+), 105 deletions(-)
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/create_table.hql
new file mode 100644
index 00000000000..8d6495ee931
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/create_table.hql
@@ -0,0 +1,19 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.test_chinese_orc`(
+ `id` int,
+ `col1` varchar(1148))
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.orc.OrcSerde'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/test_chinese_orc'
+TBLPROPERTIES (
+ 'last_modified_by'='hadoop',
+ 'last_modified_time'='1688972099',
+ 'transient_lastDdlTime'='1688972099');
+
+msck repair table test_chinese_orc;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/data.tar.gz
new file mode 100644
index 00000000000..c2b809ab10d
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_orc/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/create_table.hql
new file mode 100644
index 00000000000..1767098ad8d
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/create_table.hql
@@ -0,0 +1,19 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.test_chinese_parquet`(
+ `id` int,
+ `col1` varchar(1148))
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/test_chinese_parquet'
+TBLPROPERTIES (
+ 'last_modified_by'='hadoop',
+ 'last_modified_time'='1688972107',
+ 'transient_lastDdlTime'='1688972107');
+
+msck repair table test_chinese_parquet;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/data.tar.gz
new file mode 100644
index 00000000000..e770248e8c2
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_parquet/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/create_table.hql
new file mode 100644
index 00000000000..caacbd778e9
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/create_table.hql
@@ -0,0 +1,23 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.test_chinese_text`(
+ `id` int,
+ `col1` varchar(1148))
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
+WITH SERDEPROPERTIES (
+ 'field.delim'='\t',
+ 'line.delim'='\n',
+ 'serialization.format'='\t')
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.mapred.TextInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/test_chinese_text'
+TBLPROPERTIES (
+ 'last_modified_by'='hadoop',
+ 'last_modified_time'='1688972116',
+ 'transient_lastDdlTime'='1688972116');
+
+msck repair table test_chinese_text;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/data.tar.gz
new file mode 100644
index 00000000000..65dc336a3f8
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_chinese_text/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/create_table.hql
new file mode 100644
index 00000000000..5614ab55a1d
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/create_table.hql
@@ -0,0 +1,17 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.test_multi_langs_orc`(
+ `id` int,
+ `col1` varchar(1148))
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.orc.OrcSerde'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/test_multi_langs_orc'
+TBLPROPERTIES (
+ 'transient_lastDdlTime'='1688971851');
+
+msck repair table test_multi_langs_orc;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/data.tar.gz
new file mode 100644
index 00000000000..6d1d36b5f18
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_orc/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/create_table.hql
new file mode 100644
index 00000000000..e9c3109ac50
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/create_table.hql
@@ -0,0 +1,17 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.test_multi_langs_parquet`(
+ `id` int,
+ `col1` varchar(1148))
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/test_multi_langs_parquet'
+TBLPROPERTIES (
+ 'transient_lastDdlTime'='1688971869');
+
+msck repair table test_multi_langs_parquet;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/data.tar.gz
new file mode 100644
index 00000000000..c76ee5924d0
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_parquet/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/create_table.hql
new file mode 100644
index 00000000000..48eb733d5cc
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/create_table.hql
@@ -0,0 +1,21 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.test_multi_langs_text`(
+ `id` int,
+ `col1` varchar(1148))
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
+WITH SERDEPROPERTIES (
+ 'field.delim'='\t',
+ 'line.delim'='\n',
+ 'serialization.format'='\t')
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.mapred.TextInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/test_multi_langs_text'
+TBLPROPERTIES (
+ 'transient_lastDdlTime'='1688971823');
+
+msck repair table test_multi_langs_text;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/data.tar.gz
new file mode 100644
index 00000000000..4ec601c84dc
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/test_multi_langs_text/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/create_table.hql
new file mode 100644
index 00000000000..2a399308711
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/create_table.hql
@@ -0,0 +1,45 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.type_change_orc`(
+ `numeric_boolean` int,
+ `numeric_tinyint` double,
+ `numeric_smallint` bigint,
+ `numeric_int` int,
+ `numeric_bigint` float,
+ `numeric_float` float,
+ `numeric_double` bigint,
+ `ts_boolean` string,
+ `ts_int` string,
+ `ts_double` string,
+ `ts_decimal` string,
+ `ts_date` string,
+ `ts_timestamp` string,
+ `fs_boolean` boolean,
+ `fs_int` int,
+ `fs_float` float,
+ `fs_decimal` decimal(12,3),
+ `fs_date` date,
+ `fs_timestamp` timestamp,
+ `td_boolean` decimal(5,2),
+ `td_bigint` decimal(11,4),
+ `td_float` decimal(10,3),
+ `td_double` decimal(9,2),
+ `td_decimal` decimal(8,4),
+ `fd_boolean` boolean,
+ `fd_int` int,
+ `fd_float` float,
+ `fd_double` double,
+ `date_timestamp` timestamp,
+ `timestamp_date` date)
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.orc.OrcSerde'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/type_change_orc'
+TBLPROPERTIES (
+ 'transient_lastDdlTime'='1712484849');
+
+msck repair table type_change_orc;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/data.tar.gz
new file mode 100644
index 00000000000..39b27e4c38d
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_orc/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/create_table.hql
new file mode 100644
index 00000000000..80daa1f7592
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/create_table.hql
@@ -0,0 +1,45 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.type_change_origin`(
+ `numeric_boolean` boolean,
+ `numeric_tinyint` tinyint,
+ `numeric_smallint` smallint,
+ `numeric_int` int,
+ `numeric_bigint` bigint,
+ `numeric_float` float,
+ `numeric_double` double,
+ `ts_boolean` boolean,
+ `ts_int` int,
+ `ts_double` double,
+ `ts_decimal` decimal(12,4),
+ `ts_date` date,
+ `ts_timestamp` timestamp,
+ `fs_boolean` string,
+ `fs_int` string,
+ `fs_float` string,
+ `fs_decimal` string,
+ `fs_date` string,
+ `fs_timestamp` string,
+ `td_boolean` boolean,
+ `td_bigint` bigint,
+ `td_float` float,
+ `td_double` double,
+ `td_decimal` decimal(8,4),
+ `fd_boolean` decimal(12,3),
+ `fd_int` decimal(10,2),
+ `fd_float` decimal(11,4),
+ `fd_double` decimal(9,4),
+ `date_timestamp` date,
+ `timestamp_date` timestamp)
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.orc.OrcSerde'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/type_change_origin'
+TBLPROPERTIES (
+ 'transient_lastDdlTime'='1712485085');
+
+msck repair table type_change_origin;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/data.tar.gz
new file mode 100644
index 00000000000..e7c0e005a45
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_origin/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/create_table.hql
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/create_table.hql
new file mode 100644
index 00000000000..1dd7852d02a
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/create_table.hql
@@ -0,0 +1,45 @@
+CREATE DATABASE IF NOT EXISTS multi_catalog;
+USE multi_catalog;
+
+CREATE TABLE `multi_catalog.type_change_parquet`(
+ `numeric_boolean` int,
+ `numeric_tinyint` double,
+ `numeric_smallint` bigint,
+ `numeric_int` int,
+ `numeric_bigint` float,
+ `numeric_float` float,
+ `numeric_double` bigint,
+ `ts_boolean` string,
+ `ts_int` string,
+ `ts_double` string,
+ `ts_decimal` string,
+ `ts_date` string,
+ `ts_timestamp` string,
+ `fs_boolean` boolean,
+ `fs_int` int,
+ `fs_float` float,
+ `fs_decimal` decimal(12,3),
+ `fs_date` date,
+ `fs_timestamp` timestamp,
+ `td_boolean` decimal(5,2),
+ `td_bigint` decimal(11,4),
+ `td_float` decimal(10,3),
+ `td_double` decimal(9,2),
+ `td_decimal` decimal(8,4),
+ `fd_boolean` boolean,
+ `fd_int` int,
+ `fd_float` float,
+ `fd_double` double,
+ `date_timestamp` timestamp,
+ `timestamp_date` date)
+ROW FORMAT SERDE
+ 'org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe'
+STORED AS INPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat'
+OUTPUTFORMAT
+ 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat'
+LOCATION '/user/doris/suites/multi_catalog/type_change_parquet'
+TBLPROPERTIES (
+ 'transient_lastDdlTime'='1712485017');
+
+msck repair table type_change_parquet;
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/data.tar.gz
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/data.tar.gz
new file mode 100644
index 00000000000..34ac608b739
Binary files /dev/null and
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/data.tar.gz
differ
diff --git
a/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/run.sh
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/run.sh
new file mode 100644
index 00000000000..f3136eaa200
--- /dev/null
+++
b/docker/thirdparties/docker-compose/hive/scripts/data/multi_catalog/type_change_parquet/run.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+## mkdir and put data to hdfs
+cd "${CUR_DIR}" && rm -rf data/ && tar xzf data.tar.gz
+hadoop fs -mkdir -p /user/doris/suites/multi_catalog/
+hadoop fs -put "${CUR_DIR}"/data/* /user/doris/suites/multi_catalog/
+
+# create table
+hive -f "${CUR_DIR}/create_table.hql"
diff --git
a/regression-test/data/external_table_p2/hive/test_hive_schema_change.out
b/regression-test/data/external_table_p0/hive/test_hive_schema_change.out
similarity index 50%
rename from
regression-test/data/external_table_p2/hive/test_hive_schema_change.out
rename to
regression-test/data/external_table_p0/hive/test_hive_schema_change.out
index 526b2c75a86..d88ba8832ef 100644
--- a/regression-test/data/external_table_p2/hive/test_hive_schema_change.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_schema_change.out
@@ -47,3 +47,50 @@ true 9 9 9 9 9.9 9.9 true
9 9.9 9.9999 2024-04-17 2024-04-17T12:00 false 9
9.9 9
1 8.0 8 8 8.0 8.8 8 0 \N \N
\N 2024-04-16 2024-04-16 12:00:00 \N 8 8.8 \N
2024-04-16 2024-04-16T12:00 1.00 8.0000 8.800 8.80 8.8888
true 88 8.8901 8.8901 2024-04-16T00:00 2024-04-16
1 9.0 9 9 9.0 9.9 9 1 9
9.900000 9.9999 2024-04-17 2024-04-17 12:00:00 \N 9
9.9 \N 2024-04-17 2024-04-17T12:00 0.00 \N \N
\N \N \N \N \N \N 2024-04-17T00:00
2024-04-17
+-- !type_change_origin --
+\N \N \N \N \N \N \N true \N \N
\N 2024-04-08 2024-04-08T12:00 false \N \N \N
2024-04-08 2024-04-08 12:00:00 false \N \N \N \N
\N \N \N \N 2024-04-08 2024-04-08T12:00
+false 10 10 10 10 10.1 10.1 false 10 10.1
10.1010 2024-04-18 2024-04-18T12:00 true \N 10.1 10.101
2024-04-18 2024-04-18 12:00:00 true 10 10.1 10.1 10.1010
10.101 101.01 10.1010 10.1010 2024-04-18 2024-04-18T12:00
+false 12 12 12 12 12.12 12.12 false 12 12.12
12.1212 2024-04-20 2024-04-20T12:00 true 12 12.12 12.1212
2024-04-20 2024-04-20 12:00:00 true 12 12.12 12.12 12.1212
12.121 121.21 12.1212 12.1212 2024-04-20 2024-04-20T12:00
+false 3 3 3 3 3.3 3.3 false 3 3.3
3.3344 2024-04-10 2024-04-10T12:00 false 3 3.3 3.3344
2024-04-10 2024-04-10 12:00:00 false 3 3.3 3.3 3.3344
3.345 33.45 3.3456 3.3456 2024-04-10 2024-04-10T12:00
+false 7 7 7 7 7.7 7.7 true \N 7.7
7.7777 2024-04-15 2024-04-15T12:00 true 7 7.7 7.7777
2024-04-15 2024-04-15 12:00:00 false 7 7.7 7.7 7.7777
7.789 77.89 7.7890 7.7890 2024-04-15 2024-04-15T12:00
+true \N \N \N \N \N \N false \N \N
\N 2024-04-12 2024-04-12T12:00 true \N \N \N
2024-04-12 2024-04-12 12:00:00 true \N \N \N \N
\N \N \N \N 2024-04-12 2024-04-12T12:00
+true \N \N \N \N \N \N false 6 6.0
6.6666 2024-04-14 2024-04-14T12:00 false 6 6.0 6.6666
2024-04-14 2024-04-14 12:00:00 true \N \N \N \N
\N \N \N \N 2024-04-14 2024-04-14T12:00
+true \N \N \N \N \N \N true 11 11.0
11.1111 2024-04-19 2024-04-19T12:00 false 11 11.0 11.1111
2024-04-19 2024-04-19 12:00:00 false 11 11.0 11.0 11.1111
11.111 111.11 11.1111 11.1111 2024-04-19 2024-04-19T12:00
+true 1 1 1 1 1.1 1.1 true 1 1.1
1.1234 2024-04-07 2024-04-07T12:00 true 1 1.1 1.1234
2024-04-07 2024-04-07 12:00:00 true 1 1.1 1.1 1.1234
1.234 12.34 1.2345 1.2345 2024-04-07 2024-04-07T12:00
+true 2 2 2 2 2.2 2.2 false 2 2.2
2.2234 2024-04-09 2024-04-09T12:00 true 2 2.2 2.2234
2024-04-09 2024-04-09 12:00:00 true 2 2.2 2.2 2.2234
2.234 22.34 2.2345 2.2345 2024-04-09 2024-04-09T12:00
+true 4 4 4 4 4.4 4.4 true 4 4.4
4.4444 2024-04-11 2024-04-11T12:00 wrong wrong wrong wrong
wrong wrong true 4 4.4 4.4 4.4444 4.456 44.56 4.4567
4.4567 2024-04-11 2024-04-11T12:00
+true 5 5 5 5 5.5 5.5 true 5 5.5
5.5555 2024-04-13 2024-04-13T12:00 false 5 5.5 5.5555
2024-04-13 2024-04-13 12:00:00 false 5 5.5 5.5 5.5555
5.567 55.67 5.5678 5.5678 2024-04-13 2024-04-13T12:00
+true 8 8 8 8 8.8 8.8 false \N \N
\N 2024-04-16 2024-04-16T12:00 true 8 8.8 8.8888
2024-04-16 2024-04-16 12:00:00 true 8 8.8 8.8 8.8888
8.890 88.90 8.8901 8.8901 2024-04-16 2024-04-16T12:00
+true 9 9 9 9 9.9 9.9 true 9 9.9
9.9999 2024-04-17 2024-04-17T12:00 false 9 9.9 9.9999
2024-04-17 2024-04-17 12:00:00 false \N \N \N \N
\N \N \N \N 2024-04-17 2024-04-17T12:00
+
+-- !type_change_orc --
+\N \N \N \N \N \N \N 1 \N \N
\N 2024-04-08 2024-04-08 12:00:00 \N \N \N \N
2024-04-08 2024-04-08T12:00 0.00 \N \N \N \N
\N \N \N \N 2024-04-08T00:00 2024-04-08
+0 10.0 10 10 10.0 10.1 10 0 10
10.100000 10.1010 2024-04-18 2024-04-18 12:00:00 \N \N
10.1 10.101 2024-04-18 2024-04-18T12:00 1.00 10.0000 10.100
10.10 10.1010 true 101 10.101 10.101 2024-04-18T00:00
2024-04-18
+0 12.0 12 12 12.0 12.12 12 0 12
12.120000 12.1212 2024-04-20 2024-04-20 12:00:00 \N 12
12.12 \N 2024-04-20 2024-04-20T12:00 1.00 12.0000 12.119
12.12 12.1212 true 121 12.1212 12.1212 2024-04-20T00:00
2024-04-20
+0 3.0 3 3 3.0 3.3 3 0 3
3.300000 3.3344 2024-04-10 2024-04-10 12:00:00 \N 3
3.3 \N 2024-04-10 2024-04-10T12:00 0.00 3.0000 3.300
3.30 3.3344 true 33 3.3456 3.3456 2024-04-10T00:00
2024-04-10
+0 7.0 7 7 7.0 7.7 7 1 \N
7.700000 7.7777 2024-04-15 2024-04-15 12:00:00 \N 7
7.7 \N 2024-04-15 2024-04-15T12:00 0.00 7.0000 7.699
7.70 7.7777 true 77 7.789 7.789 2024-04-15T00:00
2024-04-15
+1 \N \N \N \N \N \N 0 \N \N
\N 2024-04-12 2024-04-12 12:00:00 \N \N \N \N
2024-04-12 2024-04-12T12:00 1.00 \N \N \N \N
\N \N \N \N 2024-04-12T00:00 2024-04-12
+1 \N \N \N \N \N \N 0 6
6.000000 6.6666 2024-04-14 2024-04-14 12:00:00 \N 6
6.0 \N 2024-04-14 2024-04-14T12:00 1.00 \N \N
\N \N \N \N \N \N 2024-04-14T00:00
2024-04-14
+1 \N \N \N \N \N \N 1 11
11.000000 11.1111 2024-04-19 2024-04-19 12:00:00 \N 11
11.0 \N 2024-04-19 2024-04-19T12:00 0.00 11.0000 11.000
11.00 11.1111 true 111 11.1111 11.1111 2024-04-19T00:00
2024-04-19
+1 1.0 1 1 1.0 1.1 1 1 1
1.100000 1.1234 2024-04-07 2024-04-07 12:00:00 \N 1
1.1 \N 2024-04-07 2024-04-07T12:00 1.00 1.0000 1.100
1.10 1.1234 true 12 1.2345 1.2345 2024-04-07T00:00
2024-04-07
+1 2.0 2 2 2.0 2.2 2 0 2
2.200000 2.2234 2024-04-09 2024-04-09 12:00:00 \N 2
2.2 \N 2024-04-09 2024-04-09T12:00 1.00 2.0000 2.200
2.20 2.2234 true 22 2.2345 2.2345 2024-04-09T00:00
2024-04-09
+1 4.0 4 4 4.0 4.4 4 1 4
4.400000 4.4444 2024-04-11 2024-04-11 12:00:00 \N \N
\N \N \N \N 1.00 4.0000 4.400 4.40 4.4444 true
44 4.4567 4.4567 2024-04-11T00:00 2024-04-11
+1 5.0 5 5 5.0 5.5 5 1 5
5.500000 5.5555 2024-04-13 2024-04-13 12:00:00 \N 5
5.5 \N 2024-04-13 2024-04-13T12:00 0.00 5.0000 5.500
5.50 5.5555 true 55 5.5678 5.5678 2024-04-13T00:00
2024-04-13
+1 8.0 8 8 8.0 8.8 8 0 \N \N
\N 2024-04-16 2024-04-16 12:00:00 \N 8 8.8 \N
2024-04-16 2024-04-16T12:00 1.00 8.0000 8.800 8.80 8.8888
true 88 8.8901 8.8901 2024-04-16T00:00 2024-04-16
+1 9.0 9 9 9.0 9.9 9 1 9
9.900000 9.9999 2024-04-17 2024-04-17 12:00:00 \N 9
9.9 \N 2024-04-17 2024-04-17T12:00 0.00 \N \N
\N \N \N \N \N \N 2024-04-17T00:00
2024-04-17
+
+-- !type_change_parquet --
+\N \N \N \N \N \N \N 1 \N \N
\N 2024-04-08 2024-04-08 12:00:00 \N \N \N \N
2024-04-08 2024-04-08T12:00 0.00 \N \N \N \N
\N \N \N \N 2024-04-08T00:00 2024-04-08
+0 10.0 10 10 10.0 10.1 10 0 10
10.100000 10.1010 2024-04-18 2024-04-18 12:00:00 \N \N
10.1 10.101 2024-04-18 2024-04-18T12:00 1.00 10.0000 10.100
10.10 10.1010 true 101 10.101 10.101 2024-04-18T00:00
2024-04-18
+0 12.0 12 12 12.0 12.12 12 0 12
12.120000 12.1212 2024-04-20 2024-04-20 12:00:00 \N 12
12.12 \N 2024-04-20 2024-04-20T12:00 1.00 12.0000 12.119
12.12 12.1212 true 121 12.1212 12.1212 2024-04-20T00:00
2024-04-20
+0 3.0 3 3 3.0 3.3 3 0 3
3.300000 3.3344 2024-04-10 2024-04-10 12:00:00 \N 3
3.3 \N 2024-04-10 2024-04-10T12:00 0.00 3.0000 3.300
3.30 3.3344 true 33 3.3456 3.3456 2024-04-10T00:00
2024-04-10
+0 7.0 7 7 7.0 7.7 7 1 \N
7.700000 7.7777 2024-04-15 2024-04-15 12:00:00 \N 7
7.7 \N 2024-04-15 2024-04-15T12:00 0.00 7.0000 7.699
7.70 7.7777 true 77 7.789 7.789 2024-04-15T00:00
2024-04-15
+1 \N \N \N \N \N \N 0 \N \N
\N 2024-04-12 2024-04-12 12:00:00 \N \N \N \N
2024-04-12 2024-04-12T12:00 1.00 \N \N \N \N
\N \N \N \N 2024-04-12T00:00 2024-04-12
+1 \N \N \N \N \N \N 0 6
6.000000 6.6666 2024-04-14 2024-04-14 12:00:00 \N 6
6.0 \N 2024-04-14 2024-04-14T12:00 1.00 \N \N
\N \N \N \N \N \N 2024-04-14T00:00
2024-04-14
+1 \N \N \N \N \N \N 1 11
11.000000 11.1111 2024-04-19 2024-04-19 12:00:00 \N 11
11.0 \N 2024-04-19 2024-04-19T12:00 0.00 11.0000 11.000
11.00 11.1111 true 111 11.1111 11.1111 2024-04-19T00:00
2024-04-19
+1 1.0 1 1 1.0 1.1 1 1 1
1.100000 1.1234 2024-04-07 2024-04-07 12:00:00 \N 1
1.1 \N 2024-04-07 2024-04-07T12:00 1.00 1.0000 1.100
1.10 1.1234 true 12 1.2345 1.2345 2024-04-07T00:00
2024-04-07
+1 2.0 2 2 2.0 2.2 2 0 2
2.200000 2.2234 2024-04-09 2024-04-09 12:00:00 \N 2
2.2 \N 2024-04-09 2024-04-09T12:00 1.00 2.0000 2.200
2.20 2.2234 true 22 2.2345 2.2345 2024-04-09T00:00
2024-04-09
+1 4.0 4 4 4.0 4.4 4 1 4
4.400000 4.4444 2024-04-11 2024-04-11 12:00:00 \N \N
\N \N \N \N 1.00 4.0000 4.400 4.40 4.4444 true
44 4.4567 4.4567 2024-04-11T00:00 2024-04-11
+1 5.0 5 5 5.0 5.5 5 1 5
5.500000 5.5555 2024-04-13 2024-04-13 12:00:00 \N 5
5.5 \N 2024-04-13 2024-04-13T12:00 0.00 5.0000 5.500
5.50 5.5555 true 55 5.5678 5.5678 2024-04-13T00:00
2024-04-13
+1 8.0 8 8 8.0 8.8 8 0 \N \N
\N 2024-04-16 2024-04-16 12:00:00 \N 8 8.8 \N
2024-04-16 2024-04-16T12:00 1.00 8.0000 8.800 8.80 8.8888
true 88 8.8901 8.8901 2024-04-16T00:00 2024-04-16
+1 9.0 9 9 9.0 9.9 9 1 9
9.900000 9.9999 2024-04-17 2024-04-17 12:00:00 \N 9
9.9 \N 2024-04-17 2024-04-17T12:00 0.00 \N \N
\N \N \N \N \N \N 2024-04-17T00:00
2024-04-17
diff --git
a/regression-test/data/external_table_p2/hive/test_hive_star_qualifier.out
b/regression-test/data/external_table_p0/hive/test_hive_star_qualifier.out
similarity index 54%
rename from
regression-test/data/external_table_p2/hive/test_hive_star_qualifier.out
rename to
regression-test/data/external_table_p0/hive/test_hive_star_qualifier.out
index 45457c19641..30f3a69c589 100644
--- a/regression-test/data/external_table_p2/hive/test_hive_star_qualifier.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_star_qualifier.out
@@ -95,3 +95,98 @@
5 \N
6 \N
+-- !test1 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test2 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test3 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test4 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test5 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test6 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test7 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test8 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test9 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test10 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test11 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
+
+-- !test12 --
+1 1
+2 1
+3 2
+4 2
+5 \N
+6 \N
diff --git a/regression-test/data/external_table_p2/hive/test_multi_langs.out
b/regression-test/data/external_table_p0/hive/test_multi_langs.out
similarity index 51%
rename from regression-test/data/external_table_p2/hive/test_multi_langs.out
rename to regression-test/data/external_table_p0/hive/test_multi_langs.out
index bebfc268544..c58a674a761 100644
--- a/regression-test/data/external_table_p2/hive/test_multi_langs.out
+++ b/regression-test/data/external_table_p0/hive/test_multi_langs.out
@@ -146,3 +146,149 @@
-- !06 --
5 1
+-- !01 --
+2 是
+
+-- !02 --
+1
+2 是
+3 III类户
+
+-- !03 --
+2 1
+
+-- !04 --
+5 ありがとう
+
+-- !05 --
+1 你好
+2 谢谢
+3 再见
+4 こんにちは
+5 ありがとう
+6 さようなら
+7 안녕하세요
+8 감사합니다
+9 안녕히 가세요
+10 Hola
+11 Gracias
+12 Adiós
+13 Hallo
+14 Danke
+15 Auf Wiedersehen
+16 مرحبا
+17 شكرًا
+18 مع السلامة
+19 Bonjour
+20 Merci
+21 Au revoir
+22 Ciao
+23 Grazie
+24 Arrivederci
+25 Olá
+26 Obrigado
+27 Adeus
+28 Hello
+29 Thank you
+30 Goodbye
+
+-- !06 --
+5 1
+
+-- !01 --
+2 是
+
+-- !02 --
+1
+2 是
+3 III类户
+
+-- !03 --
+2 1
+
+-- !04 --
+5 ありがとう
+
+-- !05 --
+1 你好
+2 谢谢
+3 再见
+4 こんにちは
+5 ありがとう
+6 さようなら
+7 안녕하세요
+8 감사합니다
+9 안녕히 가세요
+10 Hola
+11 Gracias
+12 Adiós
+13 Hallo
+14 Danke
+15 Auf Wiedersehen
+16 مرحبا
+17 شكرًا
+18 مع السلامة
+19 Bonjour
+20 Merci
+21 Au revoir
+22 Ciao
+23 Grazie
+24 Arrivederci
+25 Olá
+26 Obrigado
+27 Adeus
+28 Hello
+29 Thank you
+30 Goodbye
+
+-- !06 --
+5 1
+
+-- !01 --
+2 是
+
+-- !02 --
+1
+2 是
+3 III类户
+
+-- !03 --
+2 1
+
+-- !04 --
+5 ありがとう
+
+-- !05 --
+1 你好
+2 谢谢
+3 再见
+4 こんにちは
+5 ありがとう
+6 さようなら
+7 안녕하세요
+8 감사합니다
+9 안녕히 가세요
+10 Hola
+11 Gracias
+12 Adiós
+13 Hallo
+14 Danke
+15 Auf Wiedersehen
+16 مرحبا
+17 شكرًا
+18 مع السلامة
+19 Bonjour
+20 Merci
+21 Au revoir
+22 Ciao
+23 Grazie
+24 Arrivederci
+25 Olá
+26 Obrigado
+27 Adeus
+28 Hello
+29 Thank you
+30 Goodbye
+
+-- !06 --
+5 1
diff --git
a/regression-test/suites/external_table_p2/hive/test_hive_schema_change.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_schema_change.groovy
similarity index 76%
rename from
regression-test/suites/external_table_p2/hive/test_hive_schema_change.groovy
rename to
regression-test/suites/external_table_p0/hive/test_hive_schema_change.groovy
index 928ef581cb2..9150ba22195 100644
---
a/regression-test/suites/external_table_p2/hive/test_hive_schema_change.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_schema_change.groovy
@@ -89,25 +89,30 @@ alter table type_change_parquet change column fd_double
fd_double double;
alter table type_change_parquet change column date_timestamp date_timestamp
timestamp;
alter table type_change_parquet change column timestamp_date timestamp_date
date;
*/
-suite("test_hive_schema_change",
"p2,external,hive,external_remote,external_remote_hive") {
- String enabled = context.config.otherConfigs.get("enableExternalHiveTest")
+suite("test_hive_schema_change",
"p0,external,hive,external_docker,external_docker_hive") {
+ String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- String extHiveHmsHost =
context.config.otherConfigs.get("extHiveHmsHost")
- String extHiveHmsPort =
context.config.otherConfigs.get("extHiveHmsPort")
- String catalog_name = "test_hive_schema_change"
- sql """drop catalog if exists ${catalog_name};"""
- sql """
+ for (String hivePrefix : ["hive2", "hive3"]) {
+ setHivePrefix(hivePrefix)
+ String externalEnvIp =
context.config.otherConfigs.get("externalEnvIp")
+ String hmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
+ String hdfs_port = context.config.otherConfigs.get(hivePrefix +
"HdfsPort")
+ String catalog_name = "test_hive_schema_change"
+ sql """drop catalog if exists ${catalog_name};"""
+ sql """
create catalog if not exists ${catalog_name} properties (
'type'='hms',
'hadoop.username' = 'hadoop',
- 'hive.metastore.uris' =
'thrift://${extHiveHmsHost}:${extHiveHmsPort}'
+ 'fs.defaultFS' = 'hdfs://${externalEnvIp}:${hdfs_port}',
+ 'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}'
);
- """
- sql """ switch ${catalog_name} """
- sql """ use `multi_catalog` """
- order_qt_type_change_origin """ select * from type_change_origin """
- order_qt_type_change_orc """ select * from type_change_orc """
- order_qt_type_change_parquet """ select * from type_change_parquet """
- sql """ drop catalog ${catalog_name} """
+ """
+ sql """ switch ${catalog_name} """
+ sql """ use `multi_catalog` """
+ order_qt_type_change_origin """ select * from type_change_origin
"""
+ order_qt_type_change_orc """ select * from type_change_orc """
+ order_qt_type_change_parquet """ select * from type_change_parquet
"""
+ sql """ drop catalog ${catalog_name} """
+ }
}
}
diff --git
a/regression-test/suites/external_table_p2/hive/test_hive_star_qualifier.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_star_qualifier.groovy
similarity index 65%
rename from
regression-test/suites/external_table_p2/hive/test_hive_star_qualifier.groovy
rename to
regression-test/suites/external_table_p0/hive/test_hive_star_qualifier.groovy
index 91f8a293316..6146469c61d 100644
---
a/regression-test/suites/external_table_p2/hive/test_hive_star_qualifier.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_star_qualifier.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("test_hive_star_qualifier",
"p2,external,hive,external_remote,external_remote_hive") {
+suite("test_hive_star_qualifier",
"p0,external,hive,external_docker,external_docker_hive") {
String catalog_name = "test_hive_star_qualifier"
def test1 = """select * from ${catalog_name}.multi_catalog.one_partition
order by id;"""
@@ -31,32 +31,37 @@ suite("test_hive_star_qualifier",
"p2,external,hive,external_remote,external_rem
def test11 = """select ${catalog_name}.multi_catalog.one_partition.* from
multi_catalog.one_partition order by id;"""
def test12 = """select ${catalog_name}.multi_catalog.one_partition.* from
one_partition order by id;"""
- String enabled = context.config.otherConfigs.get("enableExternalHiveTest")
+ String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- String extHiveHmsHost =
context.config.otherConfigs.get("extHiveHmsHost")
- String extHiveHmsPort =
context.config.otherConfigs.get("extHiveHmsPort")
- sql """drop catalog if exists ${catalog_name};"""
- sql """
+ for (String hivePrefix : ["hive2", "hive3"]) {
+ setHivePrefix(hivePrefix)
+ String externalEnvIp =
context.config.otherConfigs.get("externalEnvIp")
+ String hmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
+ String hdfs_port = context.config.otherConfigs.get(hivePrefix +
"HdfsPort")
+ sql """drop catalog if exists ${catalog_name};"""
+ sql """
create catalog if not exists ${catalog_name} properties (
'type'='hms',
'hadoop.username' = 'hadoop',
- 'hive.metastore.uris' =
'thrift://${extHiveHmsHost}:${extHiveHmsPort}'
+ 'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
+ 'fs.defaultFS' = 'hdfs://${externalEnvIp}:${hdfs_port}'
);
- """
- sql """use ${catalog_name}.multi_catalog"""
- qt_test1 test1
- qt_test2 test2
- qt_test3 test3
- qt_test4 test4
- qt_test5 test5
- qt_test6 test6
- qt_test7 test7
- qt_test8 test8
- qt_test9 test9
- qt_test10 test10
- qt_test11 test11
- qt_test12 test12
- sql """drop catalog if exists ${catalog_name};"""
+ """
+ sql """use ${catalog_name}.multi_catalog"""
+ qt_test1 test1
+ qt_test2 test2
+ qt_test3 test3
+ qt_test4 test4
+ qt_test5 test5
+ qt_test6 test6
+ qt_test7 test7
+ qt_test8 test8
+ qt_test9 test9
+ qt_test10 test10
+ qt_test11 test11
+ qt_test12 test12
+ sql """drop catalog if exists ${catalog_name};"""
+ }
}
}
diff --git
a/regression-test/suites/external_table_p0/hive/test_multi_langs.groovy
b/regression-test/suites/external_table_p0/hive/test_multi_langs.groovy
new file mode 100644
index 00000000000..aee41f7d85b
--- /dev/null
+++ b/regression-test/suites/external_table_p0/hive/test_multi_langs.groovy
@@ -0,0 +1,66 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_multi_langs",
"p0,external,hive,external_docker,external_docker_hive") {
+
+ def formats = ["_parquet", "_orc", "_text"]
+ def q1 = """select * from test_chineseSUFFIX where col1='是' order by id"""
+ def q2 = """select * from test_chineseSUFFIX order by id"""
+ def q3 = """select id, count(col1) from test_chineseSUFFIX where col1='是'
group by id order by id"""
+ def q4 = """select * from test_multi_langsSUFFIX where col1='ありがとう' order
by id"""
+ def q5 = """select * from test_multi_langsSUFFIX order by id"""
+ def q6 = """select id, count(col1) from test_multi_langsSUFFIX where
col1='ありがとう' group by id order by id"""
+
+ String enabled = context.config.otherConfigs.get("enableHiveTest")
+ if (enabled != null && enabled.equalsIgnoreCase("true")) {
+ for (String hivePrefix : ["hive2", "hive3"]) {
+ setHivePrefix(hivePrefix)
+ try {
+ String externalEnvIp =
context.config.otherConfigs.get("externalEnvIp")
+ String hmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
+ String hdfs_port = context.config.otherConfigs.get(hivePrefix
+ "HdfsPort")
+ String catalog_name = "test_multi_langs"
+
+ sql """drop catalog if exists ${catalog_name};"""
+ sql """
+ create catalog if not exists ${catalog_name} properties (
+ 'type'='hms',
+ 'hive.metastore.uris' =
'thrift://${externalEnvIp}:${hmsPort}',
+ 'fs.defaultFS' = 'hdfs://${externalEnvIp}:${hdfs_port}'
+ );
+ """
+ logger.info("catalog " + catalog_name + " created")
+ sql """switch ${catalog_name};"""
+ logger.info("switched to catalog " + catalog_name)
+ sql """use multi_catalog;"""
+ logger.info("use multi_catalog")
+
+ for (String format in formats) {
+ logger.info("Process format " + format)
+ qt_01 q1.replace("SUFFIX", format)
+ qt_02 q2.replace("SUFFIX", format)
+ qt_03 q3.replace("SUFFIX", format)
+ qt_04 q4.replace("SUFFIX", format)
+ qt_05 q5.replace("SUFFIX", format)
+ qt_06 q6.replace("SUFFIX", format)
+ }
+ sql """drop catalog if exists ${catalog_name}"""
+ } finally {
+ }
+ }
+ }
+}
diff --git
a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
index 5322e16fad0..99b927144a7 100644
---
a/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
+++
b/regression-test/suites/external_table_p0/tvf/test_s3_tvf_with_resource.groovy
@@ -194,13 +194,6 @@ suite("test_s3_tvf_with_resource", "p0") {
) where k1 > 100 order by k3,k2,k1;
"""
- //cloud-mode
- if (isCloudMode()) {
- def clusters = sql " SHOW CLUSTERS; "
- assertTrue(!clusters.isEmpty())
- def validCluster = clusters[0][0]
- sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
- }
// not have usage priv, can not select tvf with resource
connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
test {
diff --git
a/regression-test/suites/external_table_p2/hive/test_multi_langs.groovy
b/regression-test/suites/external_table_p2/hive/test_multi_langs.groovy
deleted file mode 100644
index af82fe8767a..00000000000
--- a/regression-test/suites/external_table_p2/hive/test_multi_langs.groovy
+++ /dev/null
@@ -1,61 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_multi_langs",
"p2,external,hive,external_remote,external_remote_hive") {
-
- def formats = ["_parquet", "_orc", "_text"]
- def q1 = """select * from test_chineseSUFFIX where col1='是' order by id"""
- def q2 = """select * from test_chineseSUFFIX order by id"""
- def q3 = """select id, count(col1) from test_chineseSUFFIX where col1='是'
group by id order by id"""
- def q4 = """select * from test_multi_langsSUFFIX where col1='ありがとう' order
by id"""
- def q5 = """select * from test_multi_langsSUFFIX order by id"""
- def q6 = """select id, count(col1) from test_multi_langsSUFFIX where
col1='ありがとう' group by id order by id"""
-
- String enabled = context.config.otherConfigs.get("enableExternalHiveTest")
- if (enabled != null && enabled.equalsIgnoreCase("true")) {
- try {
- String extHiveHmsHost =
context.config.otherConfigs.get("extHiveHmsHost")
- String extHiveHmsPort =
context.config.otherConfigs.get("extHiveHmsPort")
- String catalog_name = "test_multi_langs"
-
- sql """drop catalog if exists ${catalog_name};"""
- sql """
- create catalog if not exists ${catalog_name} properties (
- 'type'='hms',
- 'hive.metastore.uris' =
'thrift://${extHiveHmsHost}:${extHiveHmsPort}'
- );
- """
- logger.info("catalog " + catalog_name + " created")
- sql """switch ${catalog_name};"""
- logger.info("switched to catalog " + catalog_name)
- sql """use multi_catalog;"""
- logger.info("use multi_catalog")
-
- for (String format in formats) {
- logger.info("Process format " + format)
- qt_01 q1.replace("SUFFIX", format)
- qt_02 q2.replace("SUFFIX", format)
- qt_03 q3.replace("SUFFIX", format)
- qt_04 q4.replace("SUFFIX", format)
- qt_05 q5.replace("SUFFIX", format)
- qt_06 q6.replace("SUFFIX", format)
- }
- sql """drop catalog if exists ${catalog_name}"""
- } finally {
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
