This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 581c3c12900 branch-4.0:[fix](case)fix some external regression test.
(#60744) (#60992)
581c3c12900 is described below
commit 581c3c129000962b238cf3246b33828ff05e5add
Author: daidai <[email protected]>
AuthorDate: Tue Mar 3 22:58:42 2026 +0800
branch-4.0:[fix](case)fix some external regression test. (#60744) (#60992)
bp #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 +++++----
4 files changed, 24 insertions(+), 11 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'
);
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]