You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2025/11/08 13:31:34 UTC
(doris) branch branch-4.0 updated: branch-4.0: [improve](glue) Glue endpoint is required. #57543 (#57812)
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 2b76ebb0b4a branch-4.0: [improve](glue) Glue endpoint is required. #57543 (#57812)
2b76ebb0b4a is described below
commit 2b76ebb0b4ac3bc10abff0e71f42785251513bee
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Sat Nov 8 21:31:27 2025 +0800
branch-4.0: [improve](glue) Glue endpoint is required. #57543 (#57812)
Cherry-picked from #57543
Co-authored-by: zy-kkk <zh...@gmail.com>
---
.../property/metastore/AWSGlueMetaStoreBaseProperties.java | 6 +-----
.../property/metastore/AWSGlueMetaStoreBasePropertiesTest.java | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBaseProperties.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBaseProperties.java
index 762b2808423..e2dee4c8eab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBaseProperties.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBaseProperties.java
@@ -98,8 +98,7 @@ public class AWSGlueMetaStoreBaseProperties {
"glue.access_key and glue.secret_key must be set together")
.requireAtLeastOne(new String[]{glueAccessKey, glueIAMRole},
"At least one of glue.access_key or glue.role_arn must be set")
- .requireAtLeastOne(new String[]{glueEndpoint, glueRegion},
- "At least one of glue.endpoint or glue.region must be set");
+ .require(glueEndpoint, "glue.endpoint must be set");
}
private void checkAndInit() {
@@ -107,9 +106,6 @@ public class AWSGlueMetaStoreBaseProperties {
if (StringUtils.isNotBlank(glueRegion) && StringUtils.isNotBlank(glueEndpoint)) {
return;
}
- if (StringUtils.isBlank(glueEndpoint) && StringUtils.isNotBlank(glueRegion)) {
- return;
- }
// glue region is not set, try to extract from endpoint
Matcher matcher = ENDPOINT_PATTERN.matcher(glueEndpoint.toLowerCase());
if (matcher.matches()) {
diff --git a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBasePropertiesTest.java b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBasePropertiesTest.java
index b49cb8d73dc..f091ac31784 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBasePropertiesTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/AWSGlueMetaStoreBasePropertiesTest.java
@@ -96,7 +96,7 @@ public class AWSGlueMetaStoreBasePropertiesTest {
IllegalArgumentException.class,
() -> AWSGlueMetaStoreBaseProperties.of(props)
);
- Assertions.assertTrue(ex.getMessage().contains("At least one of glue.endpoint or glue.region must be set"));
+ Assertions.assertTrue(ex.getMessage().contains("glue.endpoint must be set"));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org