This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 6a41b262e0d branch-3.1: [improve](glue) Glue endpoint is required.
#57543 (#57610)
6a41b262e0d is described below
commit 6a41b262e0d7f44bf2d437b08411623feadd3543
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Nov 4 10:03:44 2025 +0800
branch-3.1: [improve](glue) Glue endpoint is required. #57543 (#57610)
Cherry-picked from #57543
---
.../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: [email protected]
For additional commands, e-mail: [email protected]
