This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 14753d28dc3 branch-4.1: [Fix](Regression) reduce duplicate hive2/hive3
regression runs #61671 (#61749)
14753d28dc3 is described below
commit 14753d28dc3a3b77a649a2313e9ab66cc1c2226f
Author: Chenjunwei <[email protected]>
AuthorDate: Thu Mar 26 17:53:03 2026 +0800
branch-4.1: [Fix](Regression) reduce duplicate hive2/hive3 regression runs
#61671 (#61749)
### What problem does this PR solve?
Issue Number: None
Related PR: #61671
Problem Summary: Cherry-pick #61671 to branch-4.1. This reduces
duplicate hive2/hive3 regression execution by limiting the affected Hive
regression suites to hive3-only on branch-4.1.
### Release note
None
### Check List (For Author)
- Test: No need to test (regression script-only backport); verified `git
diff --check HEAD^ HEAD`
- Behavior changed: Yes (affected Hive regression suites no longer run
duplicated hive2/hive3 coverage)
- Does this need documentation: No
---
.../suites/external_table_p0/hive/hive_json_basic_test.groovy | 2 +-
regression-test/suites/external_table_p0/hive/hive_tpch_sf1_orc.groovy | 3 +--
.../suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy | 3 +--
.../suites/external_table_p0/hive/test_complex_types.groovy | 2 +-
.../suites/external_table_p0/hive/test_different_column_orders.groovy | 2 +-
.../suites/external_table_p0/hive/test_different_parquet_types.groovy | 2 +-
.../suites/external_table_p0/hive/test_drop_expired_table_stats.groovy | 2 +-
.../suites/external_table_p0/hive/test_external_catalog_hive.groovy | 2 +-
.../external_table_p0/hive/test_external_catalog_hive_partition.groovy | 2 +-
.../suites/external_table_p0/hive/test_external_credit_data.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_analyze_db.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_basic_type.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_broker_scan.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_default_partition.groovy | 2 +-
.../external_table_p0/hive/test_hive_get_schema_from_table.groovy | 2 +-
regression-test/suites/external_table_p0/hive/test_hive_orc.groovy | 2 +-
regression-test/suites/external_table_p0/hive/test_hive_other.groovy | 2 +-
regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy | 2 +-
.../external_table_p0/hive/test_hive_parquet_alter_column.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_parquet_skip_page.groovy | 2 +-
.../external_table_p0/hive/test_hive_partition_column_analyze.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_partition_location.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_query_cache.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_remove_partition.groovy | 2 +-
.../hive/test_hive_runtime_filter_partition_pruning.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_same_db_table_name.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_schema_evolution.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_statistic.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_statistic_auto.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_statistic_clean.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_statistic_timeout.groovy | 2 +-
.../external_table_p0/hive/test_hive_statistics_all_type_p0.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_statistics_p0.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_tablesample_p0.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_text_complex_type.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_to_array.groovy | 2 +-
regression-test/suites/external_table_p0/hive/test_hive_to_date.groovy | 2 +-
.../suites/external_table_p0/hive/test_hive_varbinary_type.groovy | 2 +-
.../suites/external_table_p0/hive/test_mixed_par_locations.groovy | 2 +-
.../suites/external_table_p0/hive/test_multi_delimit_serde.groovy | 2 +-
.../suites/external_table_p0/hive/test_open_csv_serde.groovy | 2 +-
.../suites/external_table_p0/hive/test_orc_nested_types.groovy | 2 +-
.../suites/external_table_p0/hive/test_parquet_bloom_filter.groovy | 2 +-
.../suites/external_table_p0/hive/test_parquet_nested_types.groovy | 2 +-
.../suites/external_table_p0/hive/test_special_orc_formats.groovy | 2 +-
.../suites/external_table_p0/hive/test_string_dict_filter.groovy | 2 +-
.../suites/external_table_p0/hive/test_text_garbled_file.groovy | 2 +-
.../suites/external_table_p0/hive/test_text_skip_header.groovy | 2 +-
.../hive/test_truncate_char_or_varchar_columns.groovy | 2 +-
.../suites/external_table_p0/hive/test_upper_case_column_name.groovy | 2 +-
regression-test/suites/external_table_p0/hive/test_utf8_check.groovy | 2 +-
regression-test/suites/external_table_p0/hive/test_wide_table.groovy | 2 +-
regression-test/suites/mtmv_p0/test_hive_mtmv.groovy | 2 +-
regression-test/suites/mtmv_p0/test_hive_olap_mtmv.groovy | 2 +-
regression-test/suites/mtmv_p0/test_hive_rewrite_mtmv.groovy | 2 +-
55 files changed, 55 insertions(+), 57 deletions(-)
diff --git
a/regression-test/suites/external_table_p0/hive/hive_json_basic_test.groovy
b/regression-test/suites/external_table_p0/hive/hive_json_basic_test.groovy
index 9d05e1a4c74..504dab1824f 100644
--- a/regression-test/suites/external_table_p0/hive/hive_json_basic_test.groovy
+++ b/regression-test/suites/external_table_p0/hive/hive_json_basic_test.groovy
@@ -24,7 +24,7 @@ suite("hive_json_basic_test",
"p0,external,hive,external_docker,external_docker
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
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_p0/hive/hive_tpch_sf1_orc.groovy
b/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_orc.groovy
index 9834ab5550a..5d81d57001e 100644
--- a/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_orc.groovy
+++ b/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_orc.groovy
@@ -854,7 +854,7 @@ order by
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_catalog_${hivePrefix}_orc"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
@@ -892,4 +892,3 @@ order by
}
-
diff --git
a/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy
b/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy
index d167a51353d..56ecf6a4495 100644
--- a/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy
+++ b/regression-test/suites/external_table_p0/hive/hive_tpch_sf1_parquet.groovy
@@ -854,7 +854,7 @@ order by
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_catalog_${hivePrefix}_parquet"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
@@ -893,4 +893,3 @@ order by
}
-
diff --git
a/regression-test/suites/external_table_p0/hive/test_complex_types.groovy
b/regression-test/suites/external_table_p0/hive/test_complex_types.groovy
index e8cba5df36d..a9208cdbae3 100644
--- a/regression-test/suites/external_table_p0/hive/test_complex_types.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_complex_types.groovy
@@ -22,7 +22,7 @@ suite("test_complex_types",
"p0,external,hive,external_docker,external_docker_hi
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_complex_types"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_different_column_orders.groovy
b/regression-test/suites/external_table_p0/hive/test_different_column_orders.groovy
index 11a91028287..e474d80d3bd 100644
---
a/regression-test/suites/external_table_p0/hive/test_different_column_orders.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_different_column_orders.groovy
@@ -44,7 +44,7 @@ suite("test_different_column_orders",
"p0,external,hive,external_docker,external
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_different_column_orders_${hivePrefix}"
diff --git
a/regression-test/suites/external_table_p0/hive/test_different_parquet_types.groovy
b/regression-test/suites/external_table_p0/hive/test_different_parquet_types.groovy
index 56cc5a48723..0015c17d5e9 100644
---
a/regression-test/suites/external_table_p0/hive/test_different_parquet_types.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_different_parquet_types.groovy
@@ -22,7 +22,7 @@ suite("test_different_parquet_types",
"p0,external,hive,external_docker,external
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String hdfs_port = context.config.otherConfigs.get(hivePrefix +
"HdfsPort")
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_drop_expired_table_stats.groovy
b/regression-test/suites/external_table_p0/hive/test_drop_expired_table_stats.groovy
index dbbe014e28b..672f380a6bc 100644
---
a/regression-test/suites/external_table_p0/hive/test_drop_expired_table_stats.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_drop_expired_table_stats.groovy
@@ -22,7 +22,7 @@ suite("test_drop_expired_table_stats",
"p0,external,hive,external_docker,externa
return
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = hivePrefix + "_test_drop_expired_table_stats"
diff --git
a/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy
b/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy
index 2553df10bb3..e7adebee46a 100644
---
a/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_external_catalog_hive.groovy
@@ -21,7 +21,7 @@ suite("test_external_catalog_hive",
"p0,external,hive,external_docker,external_d
logger.info("diable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_external_catalog_hive"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_external_catalog_hive_partition.groovy
b/regression-test/suites/external_table_p0/hive/test_external_catalog_hive_partition.groovy
index d34467c4c56..dbfb717445c 100644
---
a/regression-test/suites/external_table_p0/hive/test_external_catalog_hive_partition.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_external_catalog_hive_partition.groovy
@@ -21,7 +21,7 @@ suite("test_external_catalog_hive_partition",
"p0,external,hive,external_docker,
logger.info("disable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name =
"${hivePrefix}_test_external_catalog_hive_partition"
diff --git
a/regression-test/suites/external_table_p0/hive/test_external_credit_data.groovy
b/regression-test/suites/external_table_p0/hive/test_external_credit_data.groovy
index 2be0ab2920f..b2cf275d30d 100644
---
a/regression-test/suites/external_table_p0/hive/test_external_credit_data.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_external_credit_data.groovy
@@ -21,7 +21,7 @@ suite("test_external_credit_data",
"p0,external,hive,external_docker,external_do
logger.info("diable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_external_credit_data"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_analyze_db.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_analyze_db.groovy
index b47b0cdd3b1..4f221f82422 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_analyze_db.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_analyze_db.groovy
@@ -40,7 +40,7 @@
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name =
"${hivePrefix}_test_hive_partition_column_analyze"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_basic_type.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_basic_type.groovy
index fda250fbce8..8295bbb0eaf 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_basic_type.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_basic_type.groovy
@@ -22,7 +22,7 @@ suite("test_hive_basic_type",
"external_docker,hive,external_docker_hive,p0,exte
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
for (boolean enable_filter_by_min_max : [true, false]) {
String catalog_name = "test_${hivePrefix}_basic_type"
String ex_db_name = "`default`"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_broker_scan.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_broker_scan.groovy
index ee15dcd4bde..4e0f978a057 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_broker_scan.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_broker_scan.groovy
@@ -35,7 +35,7 @@ suite("test_hive_broker_scan",
"p0,external,hive,external_docker,external_docker
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
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_p0/hive/test_hive_default_partition.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_default_partition.groovy
index b3760481559..dc45903964d 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_default_partition.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_default_partition.groovy
@@ -58,7 +58,7 @@ suite("test_hive_default_partition",
"p0,external,hive,external_docker,external_
return
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = hivePrefix + "_hive_default_partition"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_get_schema_from_table.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_get_schema_from_table.groovy
index 4fbba0fb778..6ab962717df 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_get_schema_from_table.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_get_schema_from_table.groovy
@@ -65,7 +65,7 @@ suite("test_hive_get_schema_from_table",
"external_docker,hive,external_docker_h
}
// test get scheam from table
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String catalog_name = "test_${hivePrefix}_get_schema"
String ex_db_name = "`default`"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git a/regression-test/suites/external_table_p0/hive/test_hive_orc.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_orc.groovy
index 0b6a6541039..cde82e12c85 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_orc.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_orc.groovy
@@ -181,7 +181,7 @@ suite("test_hive_orc",
"all_types,p0,external,hive,external_docker,external_dock
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_orc"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
index 198c746d42e..b2ec544ecd1 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_other.groovy
@@ -56,7 +56,7 @@ suite("test_hive_other",
"p0,external,hive,external_docker,external_docker_hive"
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String hdfs_port = context.config.otherConfigs.get(hivePrefix +
"HdfsPort")
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy
index 81d2954daf9..15a0cce323a 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_parquet.groovy
@@ -175,7 +175,7 @@ suite("test_hive_parquet",
"p0,external,hive,external_docker,external_docker_hiv
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_parquet"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
index 35bb732c111..e012d8ca0c1 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_parquet_alter_column.groovy
@@ -27,7 +27,7 @@ suite("test_hive_parquet_alter_column",
"p0,external,hive,external_docker,extern
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_parquet_alter_column"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_parquet_skip_page.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_parquet_skip_page.groovy
index 0bded7d820a..e9ac8e77726 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_parquet_skip_page.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_parquet_skip_page.groovy
@@ -105,7 +105,7 @@ suite("test_hive_parquet_skip_page",
"p0,external,hive,external_docker,external_
"format" = "parquet") where a = 1024 or a = 4049
order by a;"""
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_parquet_skip_page"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_partition_column_analyze.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_partition_column_analyze.groovy
index 843bad3c23d..47a8efc4eb5 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_partition_column_analyze.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_partition_column_analyze.groovy
@@ -28,7 +28,7 @@ suite("test_hive_partition_column_analyze",
"p0,external,hive,external_docker,ex
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name =
"${hivePrefix}_test_hive_partition_column_analyze"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_partition_location.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_partition_location.groovy
index e3a93ad577e..b8c761111f9 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_partition_location.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_partition_location.groovy
@@ -35,7 +35,7 @@ suite("test_hive_partition_location",
"p0,external,hive,external_docker,external
logger.info("diable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_partition_location"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
index 947c8c2248f..bcfa917bf1b 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
@@ -69,7 +69,7 @@ suite("test_hive_query_cache",
"p0,external,hive,external_docker,external_docker
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String hdfs_port = context.config.otherConfigs.get(hivePrefix +
"HdfsPort")
String externalEnvIp =
context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_remove_partition.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_remove_partition.groovy
index 6da8748e741..2a3f0ea81d8 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_remove_partition.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_remove_partition.groovy
@@ -24,7 +24,7 @@ suite("test_hive_remove_partition",
"p0,external,hive,external_docker,external_d
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_remove_partition"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_runtime_filter_partition_pruning.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_runtime_filter_partition_pruning.groovy
index 77a127605ce..7988fc8bddc 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_runtime_filter_partition_pruning.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_runtime_filter_partition_pruning.groovy
@@ -85,7 +85,7 @@ suite("test_hive_runtime_filter_partition_pruning",
"p0,external,hive,external_d
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name =
"${hivePrefix}_test_hive_runtime_filter_partition_pruning"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_same_db_table_name.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_same_db_table_name.groovy
index d881facbba2..9bcfe443f2c 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_same_db_table_name.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_same_db_table_name.groovy
@@ -22,7 +22,7 @@ suite("test_hive_same_db_table_name",
"p0,external,hive,external_docker,external
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_same_db_table_name"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_schema_evolution.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_schema_evolution.groovy
index b78f2598a41..3f400763180 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_schema_evolution.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_schema_evolution.groovy
@@ -58,7 +58,7 @@ suite("test_hive_schema_evolution",
"p0,external,hive,external_docker,external_d
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_${hivePrefix}_schema_evolution"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistic.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistic.groovy
index 03a84e45001..5835046ad7f 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_statistic.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_statistic.groovy
@@ -22,7 +22,7 @@ suite("test_hive_statistic",
"p0,external,hive,external_docker,external_docker_h
return
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = hivePrefix + "_test_hive_statistic"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistic_auto.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistic_auto.groovy
index 5a97470b2e9..2cab450d193 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_statistic_auto.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_statistic_auto.groovy
@@ -21,7 +21,7 @@ suite("test_hive_statistic_auto",
"p0,external,hive,external_docker,external_doc
logger.info("disable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_statistic_auto"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistic_clean.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistic_clean.groovy
index 2813f1ffc90..2ef83036b83 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_statistic_clean.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_statistic_clean.groovy
@@ -21,7 +21,7 @@ suite("test_hive_statistic_clean",
"p0,external,hive,external_docker,external_do
logger.info("disable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_statistic_clean"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistic_timeout.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistic_timeout.groovy
index d1ae297f3d5..8b62757b725 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_statistic_timeout.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_statistic_timeout.groovy
@@ -22,7 +22,7 @@ suite("test_hive_statistic_timeout",
"p0,external,hive,external_docker,external_
return
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = hivePrefix + "_test_hive_statistic_timeout"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistics_all_type_p0.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistics_all_type_p0.groovy
index b111247d9e7..759ebe719bc 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_statistics_all_type_p0.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_statistics_all_type_p0.groovy
@@ -22,7 +22,7 @@ suite("test_hive_statistics_all_type_p0",
"all_types,p0,external,hive,external_d
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_${hivePrefix}_statistics_all_type_p0"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
index b182c61606f..60716f710d8 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_statistics_p0.groovy
@@ -22,7 +22,7 @@ suite("test_hive_statistics_p0",
"all_types,p0,external,hive,external_docker,ext
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_${hivePrefix}_statistics_p0"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_tablesample_p0.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_tablesample_p0.groovy
index b95a79448a6..71794cf3e26 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_tablesample_p0.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_tablesample_p0.groovy
@@ -23,7 +23,7 @@ suite("test_hive_tablesample_p0",
"all_types,p0,external,hive,external_docker,ex
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_${hivePrefix}_tablesample_p0"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_text_complex_type.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_text_complex_type.groovy
index 718f29a1daa..869bac149c6 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_text_complex_type.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_text_complex_type.groovy
@@ -20,7 +20,7 @@ suite("test_hive_text_complex_type",
"p0,external,hive,external_docker,external_
if (!"true".equalsIgnoreCase(enabled)) {
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String hmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_hive_text_complex_type"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_to_array.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_to_array.groovy
index 058afc51430..98518ed3231 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_to_array.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_to_array.groovy
@@ -22,7 +22,7 @@ suite("test_hive_to_array",
"p0,external,hive,external_docker,external_docker_hi
return
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = hivePrefix + "_test_hive_to_array"
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_to_date.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_to_date.groovy
index c6ba99e9412..550b51433c8 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_to_date.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_to_date.groovy
@@ -22,7 +22,7 @@ suite("test_hive_to_date",
"p0,external,hive,external_docker,external_docker_hiv
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_hive_to_date"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_varbinary_type.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_varbinary_type.groovy
index cfb1a86200f..80d1b03c722 100644
---
a/regression-test/suites/external_table_p0/hive/test_hive_varbinary_type.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_hive_varbinary_type.groovy
@@ -23,7 +23,7 @@
suite("test_hive_varbinary_type","p0,external,tvf,hive,external_docker,external_
return;
}
- for (String hivePrefix : ["hive2","hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name_no_mapping =
"${hivePrefix}_test_varbinary_no_mapping"
diff --git
a/regression-test/suites/external_table_p0/hive/test_mixed_par_locations.groovy
b/regression-test/suites/external_table_p0/hive/test_mixed_par_locations.groovy
index 39367877107..5d171404295 100644
---
a/regression-test/suites/external_table_p0/hive/test_mixed_par_locations.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_mixed_par_locations.groovy
@@ -27,7 +27,7 @@ suite("test_mixed_par_locations",
"p0,external,hive,external_docker,external_doc
logger.info("disable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_mixed_par_locations"
diff --git
a/regression-test/suites/external_table_p0/hive/test_multi_delimit_serde.groovy
b/regression-test/suites/external_table_p0/hive/test_multi_delimit_serde.groovy
index 8823a169ff5..d367d6773dc 100644
---
a/regression-test/suites/external_table_p0/hive/test_multi_delimit_serde.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_multi_delimit_serde.groovy
@@ -22,7 +22,7 @@ suite("test_multi_delimit_serde",
"p0,external,hive,external_docker,external_doc
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_multi_delimit_serde"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_open_csv_serde.groovy
b/regression-test/suites/external_table_p0/hive/test_open_csv_serde.groovy
index f1131b31a2d..bb8ebbc7506 100644
--- a/regression-test/suites/external_table_p0/hive/test_open_csv_serde.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_open_csv_serde.groovy
@@ -23,7 +23,7 @@
suite("test_open_csv_serde","p0,external,tvf,hive,external_docker,external_docke
return;
}
- for (String hivePrefix : ["hive2","hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_open_csv_serde"
diff --git
a/regression-test/suites/external_table_p0/hive/test_orc_nested_types.groovy
b/regression-test/suites/external_table_p0/hive/test_orc_nested_types.groovy
index f3d9af89e7e..ffb2a851a78 100644
--- a/regression-test/suites/external_table_p0/hive/test_orc_nested_types.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_orc_nested_types.groovy
@@ -22,7 +22,7 @@ suite("test_orc_nested_types",
"p0,external,hive,external_docker,external_docker
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_orc_nested_types"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_parquet_bloom_filter.groovy
b/regression-test/suites/external_table_p0/hive/test_parquet_bloom_filter.groovy
index 4647d55646e..31920497e62 100644
---
a/regression-test/suites/external_table_p0/hive/test_parquet_bloom_filter.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_parquet_bloom_filter.groovy
@@ -20,7 +20,7 @@ suite("test_parquet_bloom_filter",
"p0,external,hive,external_docker,external_do
if (!"true".equalsIgnoreCase(enabled)) {
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
String hmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_parquet_bloom_filter"
diff --git
a/regression-test/suites/external_table_p0/hive/test_parquet_nested_types.groovy
b/regression-test/suites/external_table_p0/hive/test_parquet_nested_types.groovy
index 874a4a35b71..062c5526261 100644
---
a/regression-test/suites/external_table_p0/hive/test_parquet_nested_types.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_parquet_nested_types.groovy
@@ -22,7 +22,7 @@ suite("test_parquet_nested_types",
"p0,external,hive,external_docker,external_do
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_parquet_nested_types"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_special_orc_formats.groovy
b/regression-test/suites/external_table_p0/hive/test_special_orc_formats.groovy
index 9f92d060f99..b82ca6b9097 100644
---
a/regression-test/suites/external_table_p0/hive/test_special_orc_formats.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_special_orc_formats.groovy
@@ -22,7 +22,7 @@ suite("test_special_orc_formats",
"p0,external,hive,external_docker,external_doc
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_special_orc_formats"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_string_dict_filter.groovy
b/regression-test/suites/external_table_p0/hive/test_string_dict_filter.groovy
index 18e62570ad7..7072a5d3108 100644
---
a/regression-test/suites/external_table_p0/hive/test_string_dict_filter.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_string_dict_filter.groovy
@@ -152,7 +152,7 @@ suite("test_string_dict_filter",
"p0,external,hive,external_docker,external_dock
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "test_string_dict_filter_${hivePrefix}"
diff --git
a/regression-test/suites/external_table_p0/hive/test_text_garbled_file.groovy
b/regression-test/suites/external_table_p0/hive/test_text_garbled_file.groovy
index 27e171bab8c..868519adc4d 100644
---
a/regression-test/suites/external_table_p0/hive/test_text_garbled_file.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_text_garbled_file.groovy
@@ -21,7 +21,7 @@ suite("test_text_garbled_file",
"p0,external,hive,external_docker,external_docke
String enabled = context.config.otherConfigs.get("enableHiveTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix
+ "HmsPort")
String catalog_name = hivePrefix + "_test_text_garbled_file"
diff --git
a/regression-test/suites/external_table_p0/hive/test_text_skip_header.groovy
b/regression-test/suites/external_table_p0/hive/test_text_skip_header.groovy
index 375190f6414..8f47db19ff0 100644
--- a/regression-test/suites/external_table_p0/hive/test_text_skip_header.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_text_skip_header.groovy
@@ -23,7 +23,7 @@
suite("test_hive_text_skip_header","p0,external,tvf,hive,external_docker,externa
return;
}
- for (String hivePrefix : ["hive2","hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_utf8_check"
diff --git
a/regression-test/suites/external_table_p0/hive/test_truncate_char_or_varchar_columns.groovy
b/regression-test/suites/external_table_p0/hive/test_truncate_char_or_varchar_columns.groovy
index 88ba9afca62..4671ab14a15 100644
---
a/regression-test/suites/external_table_p0/hive/test_truncate_char_or_varchar_columns.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_truncate_char_or_varchar_columns.groovy
@@ -21,7 +21,7 @@ suite("test_truncate_char_or_varchar_columns",
"p0,external,hive,external_docker
logger.info("disable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String extHiveHmsHost =
context.config.otherConfigs.get("externalEnvIp")
String extHiveHmsPort = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name =
"${hivePrefix}_test_truncate_char_or_varchar_columns"
diff --git
a/regression-test/suites/external_table_p0/hive/test_upper_case_column_name.groovy
b/regression-test/suites/external_table_p0/hive/test_upper_case_column_name.groovy
index a43af56a12e..1b5d6b3d98f 100644
---
a/regression-test/suites/external_table_p0/hive/test_upper_case_column_name.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_upper_case_column_name.groovy
@@ -38,7 +38,7 @@ suite("test_upper_case_column_name",
"p0,external,hive,external_docker,external_
logger.info("diable Hive test.")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_upper_case_column_name"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git
a/regression-test/suites/external_table_p0/hive/test_utf8_check.groovy
b/regression-test/suites/external_table_p0/hive/test_utf8_check.groovy
index 23d6238ba52..ac91504cb75 100644
--- a/regression-test/suites/external_table_p0/hive/test_utf8_check.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_utf8_check.groovy
@@ -23,7 +23,7 @@
suite("test_utf8_check","p0,external,tvf,hive,external_docker,external_docker_hi
return;
}
- for (String hivePrefix : ["hive2","hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_utf8_check"
diff --git
a/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
b/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
index 153e125d98c..e07e9793a87 100644
--- a/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_wide_table.groovy
@@ -45,7 +45,7 @@ suite("test_wide_table",
"p0,external,hive,external_docker,external_docker_hive"
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_wide_table"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git a/regression-test/suites/mtmv_p0/test_hive_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_hive_mtmv.groovy
index 020990f5a44..fa3cd6c046d 100644
--- a/regression-test/suites/mtmv_p0/test_hive_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_hive_mtmv.groovy
@@ -22,7 +22,7 @@ suite("test_hive_mtmv",
"p0,external,hive,external_docker,external_docker_hive")
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
try {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_test_mtmv"
diff --git a/regression-test/suites/mtmv_p0/test_hive_olap_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_hive_olap_mtmv.groovy
index 85bddd9cd43..33add4d9f84 100644
--- a/regression-test/suites/mtmv_p0/test_hive_olap_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_hive_olap_mtmv.groovy
@@ -22,7 +22,7 @@ suite("test_hive_olap_mtmv",
"p0,external,hive,external_docker,external_docker_h
return;
}
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
String catalog_name = "${hivePrefix}_olap_test_mtmv"
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
diff --git a/regression-test/suites/mtmv_p0/test_hive_rewrite_mtmv.groovy
b/regression-test/suites/mtmv_p0/test_hive_rewrite_mtmv.groovy
index f10d6bd65b4..d577352b8e1 100644
--- a/regression-test/suites/mtmv_p0/test_hive_rewrite_mtmv.groovy
+++ b/regression-test/suites/mtmv_p0/test_hive_rewrite_mtmv.groovy
@@ -27,7 +27,7 @@ suite("test_hive_rewrite_mtmv",
"p0,external,hive,external_docker,external_docke
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
sql """set materialized_view_rewrite_enable_contain_external_table=true;"""
String mvSql = "SELECT part_col,count(*) as num FROM
${catalogName}.`default`.mtmv_base1 group by part_col;";
- for (String hivePrefix : ["hive2", "hive3"]) {
+ for (String hivePrefix : ["hive3"]) {
String hms_port = context.config.otherConfigs.get(hivePrefix +
"HmsPort")
sql """drop catalog if exists ${catalogName}"""
sql """create catalog if not exists ${catalogName} properties (
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
