This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new c981585f367 [fix](case)fix some external regression test. (#60744)
c981585f367 is described below
commit c981585f3676a25eb83fde4ed6f18505c9b924c2
Author: daidai <[email protected]>
AuthorDate: Fri Feb 27 23:24:50 2026 +0800
[fix](case)fix some external regression test. (#60744)
---
.../hive/test_orc_lazy_mat_profile.groovy | 2 +-
.../hive/test_hive_translation_insert_only.groovy | 7 ++++---
.../hive/test_orc_merge_io_input_streams.groovy | 17 ++++++++++++++---
.../hive/test_parquet_complex_cross_page.groovy | 9 +++++----
.../maxcompute/write/test_mc_write_ctas.groovy | 2 +-
.../maxcompute/write/test_mc_write_insert.groovy | 2 +-
.../maxcompute/write/test_mc_write_large_data.groovy | 2 +-
.../maxcompute/write/test_mc_write_partitions.groovy | 2 +-
.../write/test_mc_write_static_partitions.groovy | 2 +-
.../maxcompute/write/test_mc_write_types.groovy | 2 +-
10 files changed, 30 insertions(+), 17 deletions(-)
diff --git
a/regression-test/suites/external_table_p0/hive/test_orc_lazy_mat_profile.groovy
b/regression-test/suites/external_table_p0/hive/test_orc_lazy_mat_profile.groovy
index c7ffa7aaf5d..4653f71400f 100644
---
a/regression-test/suites/external_table_p0/hive/test_orc_lazy_mat_profile.groovy
+++
b/regression-test/suites/external_table_p0/hive/test_orc_lazy_mat_profile.groovy
@@ -93,7 +93,7 @@ suite("test_orc_lazy_mat_profile",
"p0,external,hive,external_docker,external_do
}
def extractProfileValue = { String profileText, String keyName ->
- def matcher = profileText =~ /(?m)^\s*-\s*${keyName}:\s*(.+)$/
+ def matcher = profileText =~ /(?m)^\s*-\s*${keyName}:\s*sum\s+(\S+),/
return matcher.find() ? matcher.group(1).trim() : null
}
diff --git
a/regression-test/suites/external_table_p2/hive/test_hive_translation_insert_only.groovy
b/regression-test/suites/external_table_p2/hive/test_hive_translation_insert_only.groovy
index f7135175152..33a732ae3b7 100644
---
a/regression-test/suites/external_table_p2/hive/test_hive_translation_insert_only.groovy
+++
b/regression-test/suites/external_table_p2/hive/test_hive_translation_insert_only.groovy
@@ -17,22 +17,23 @@
suite("test_hive_translation_insert_only",
"p2,external,hive,external_remote,external_remote_hive") {
- String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
+ String enabled = context.config.otherConfigs.get("enableExternalEmrTest")
//hudi hive use same catalog in p2.
if (enabled == null || !enabled.equalsIgnoreCase("true")) {
logger.info("disable test")
return;
}
- String props = context.config.otherConfigs.get("hudiEmrCatalog")
+ String props = context.config.otherConfigs.get("emrCatalogCommonProp")
String hms_catalog_name = "test_hive_translation_insert_only"
sql """drop catalog if exists ${hms_catalog_name};"""
sql """
CREATE CATALOG IF NOT EXISTS ${hms_catalog_name}
PROPERTIES (
+ "type" = "hms",
+ 'hive.version' = '3.1.3',
${props}
- ,'hive.version' = '3.1.3'
);
"""
diff --git
a/regression-test/suites/external_table_p2/hive/test_orc_merge_io_input_streams.groovy
b/regression-test/suites/external_table_p2/hive/test_orc_merge_io_input_streams.groovy
index 8406bf0b423..7fbd7accef8 100644
---
a/regression-test/suites/external_table_p2/hive/test_orc_merge_io_input_streams.groovy
+++
b/regression-test/suites/external_table_p2/hive/test_orc_merge_io_input_streams.groovy
@@ -17,22 +17,23 @@
suite("test_orc_merge_io_input_streams",
"p2,external,hive,external_remote,external_remote_hive") {
- String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
+ String enabled = context.config.otherConfigs.get("enableExternalEmrTest")
//hudi hive use same catalog in p2.
if (enabled == null || !enabled.equalsIgnoreCase("true")) {
logger.info("disable test")
return;
}
- String props = context.config.otherConfigs.get("hudiEmrCatalog")
+ String props = context.config.otherConfigs.get("emrCatalogCommonProp")
String hms_catalog_name = "test_orc_merge_io_input_streams"
sql """drop catalog if exists ${hms_catalog_name};"""
sql """
CREATE CATALOG IF NOT EXISTS ${hms_catalog_name}
PROPERTIES (
+ "type" = "hms",
+ 'hive.version' = '3.1.3',
${props}
- ,'hive.version' = '3.1.3'
);
"""
@@ -50,3 +51,13 @@ suite("test_orc_merge_io_input_streams",
"p2,external,hive,external_remote,exter
sql """drop catalog ${hms_catalog_name};"""
}
+// create table test_orc_merge_io_input_streams_table (
+// dt string,
+// type string,
+// risk_flow_id string,
+// trace_id string,
+// created_time string,
+// created_ts bigint,
+// subflow_decision string
+// )stored as orc;
+// load data local inpath '004691_0' into table
test_orc_merge_io_input_streams_table;
diff --git
a/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
b/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
index 4d6fd115756..59ce5f2003f 100644
---
a/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
+++
b/regression-test/suites/external_table_p2/hive/test_parquet_complex_cross_page.groovy
@@ -17,22 +17,23 @@
suite("test_parquet_complex_cross_page",
"p2,external,hive,external_remote,external_remote_hive") {
- String enabled = context.config.otherConfigs.get("enableExternalHudiTest")
+ String enabled = context.config.otherConfigs.get("enableExternalEmrTest")
//hudi hive use same catalog in p2.
if (enabled == null || !enabled.equalsIgnoreCase("true")) {
logger.info("disable test")
return;
}
- String props = context.config.otherConfigs.get("hudiEmrCatalog")
+ String props = context.config.otherConfigs.get("emrCatalogCommonProp")
String hms_catalog_name = "test_parquet_complex_cross_page"
sql """drop catalog if exists ${hms_catalog_name};"""
sql """
CREATE CATALOG IF NOT EXISTS ${hms_catalog_name}
- PROPERTIES (
+ PROPERTIES (
+ "type" = "hms",
+ 'hive.version' = '3.1.3',
${props}
- ,'hive.version' = '3.1.3'
);
"""
diff --git
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_ctas.groovy
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_ctas.groovy
index 709d1bcde5c..bd6b28c4506 100644
---
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_ctas.groovy
+++
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_ctas.groovy
@@ -25,7 +25,7 @@ suite("test_mc_write_ctas",
"p2,external,maxcompute,external_remote,external_rem
String ak = context.config.otherConfigs.get("ak")
String sk = context.config.otherConfigs.get("sk")
String mc_catalog_name = "test_mc_write_ctas"
- String defaultProject = "doris_test_schema"
+ String defaultProject = "mc_doris_test_write"
sql """drop catalog if exists ${mc_catalog_name}"""
sql """
diff --git
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_insert.groovy
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_insert.groovy
index 472ac6b8b73..031918add73 100644
---
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_insert.groovy
+++
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_insert.groovy
@@ -25,7 +25,7 @@ suite("test_mc_write_insert",
"p2,external,maxcompute,external_remote,external_r
String ak = context.config.otherConfigs.get("ak")
String sk = context.config.otherConfigs.get("sk")
String mc_catalog_name = "test_mc_write_insert"
- String defaultProject = "doris_test_schema"
+ String defaultProject = "mc_doris_test_write"
sql """drop catalog if exists ${mc_catalog_name}"""
sql """
diff --git
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_large_data.groovy
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_large_data.groovy
index 1d720bbd0ad..2d6e89c594a 100644
---
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_large_data.groovy
+++
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_large_data.groovy
@@ -25,7 +25,7 @@ suite("test_mc_write_large_data",
"p2,external,maxcompute,external_remote,extern
String ak = context.config.otherConfigs.get("ak")
String sk = context.config.otherConfigs.get("sk")
String mc_catalog_name = "test_mc_write_large_data"
- String defaultProject = "doris_test_schema"
+ String defaultProject = "mc_doris_test_write"
sql """drop catalog if exists ${mc_catalog_name}"""
sql """
diff --git
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_partitions.groovy
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_partitions.groovy
index 9db6a73d3ab..9bcc48ba199 100644
---
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_partitions.groovy
+++
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_partitions.groovy
@@ -25,7 +25,7 @@ suite("test_mc_write_partitions",
"p2,external,maxcompute,external_remote,extern
String ak = context.config.otherConfigs.get("ak")
String sk = context.config.otherConfigs.get("sk")
String mc_catalog_name = "test_mc_write_partitions"
- String defaultProject = "doris_test_schema"
+ String defaultProject = "mc_doris_test_write"
sql """drop catalog if exists ${mc_catalog_name}"""
sql """
diff --git
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_static_partitions.groovy
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_static_partitions.groovy
index b130ae72ed2..0436577336b 100644
---
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_static_partitions.groovy
+++
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_static_partitions.groovy
@@ -25,7 +25,7 @@ suite("test_mc_write_static_partitions",
"p2,external,maxcompute,external_remote
String ak = context.config.otherConfigs.get("ak")
String sk = context.config.otherConfigs.get("sk")
String mc_catalog_name = "test_mc_write_static_partitions"
- String defaultProject = "doris_test_schema"
+ String defaultProject = "mc_doris_test_write"
sql """drop catalog if exists ${mc_catalog_name}"""
sql """
diff --git
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_types.groovy
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_types.groovy
index ca9142361a9..805d645bf36 100644
---
a/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_types.groovy
+++
b/regression-test/suites/external_table_p2/maxcompute/write/test_mc_write_types.groovy
@@ -25,7 +25,7 @@ suite("test_mc_write_types",
"p2,external,maxcompute,external_remote,external_re
String ak = context.config.otherConfigs.get("ak")
String sk = context.config.otherConfigs.get("sk")
String mc_catalog_name = "test_mc_write_types"
- String defaultProject = "doris_test_schema"
+ String defaultProject = "mc_doris_test_write"
sql """drop catalog if exists ${mc_catalog_name}"""
sql """
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
