This is an automated email from the ASF dual-hosted git repository.
morningman 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 358d5523ff1 branch-4.0: [feat](oss)Support DeltaLake VPC Endpoint
Format (dlf / deltalake-vpc) #56473 (#56477)
358d5523ff1 is described below
commit 358d5523ff154d2fd03e7a630fa304dae4a7955b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Sep 25 09:39:00 2025 -0700
branch-4.0: [feat](oss)Support DeltaLake VPC Endpoint Format (dlf /
deltalake-vpc) #56473 (#56477)
Cherry-picked from #56473
Co-authored-by: Calvin Kirs <[email protected]>
---
.../org/apache/doris/datasource/property/storage/OSSProperties.java | 5 ++++-
.../apache/doris/datasource/property/storage/OSSPropertiesTest.java | 6 ++++++
.../iceberg_on_hms_and_filesystem_and_dlf.groovy | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
index 5296dc3ef32..1239cf6181d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/storage/OSSProperties.java
@@ -138,11 +138,14 @@ public class OSSProperties extends
AbstractS3CompatibleProperties {
* use-amazon-s3-sdks-to-access-oss">...</a>
* - s3.cn-hangzhou.aliyuncs.com => region = cn-hangzhou
* <p>
+ *
https://help.aliyun.com/zh/dlf/dlf-1-0/developer-reference/api-datalake-2020-07-10-endpoint
+ * - detalake.cn-hangzhou.aliyuncs.com => region = cn-hangzhou
*/
public static final Set<Pattern> ENDPOINT_PATTERN = ImmutableSet.of(Pattern
.compile("^(?:https?://)?(?:s3\\.)?oss-([a-z0-9-]+?)(?:-internal)?\\.aliyuncs\\.com$"),
Pattern.compile("(?:https?://)?([a-z]{2}-[a-z0-9-]+)\\.oss-dls\\.aliyuncs\\.com"),
-
Pattern.compile("^(?:https?://)?dlf(?:-vpc)?\\.([a-z0-9-]+)\\.aliyuncs\\.com(?:/.*)?$"));
+
Pattern.compile("^(?:https?://)?dlf(?:-vpc)?\\.([a-z0-9-]+)\\.aliyuncs\\.com(?:/.*)?$"),
+
Pattern.compile("^(?:https?://)?datalake(?:-vpc)?\\.([a-z0-9-]+)\\.aliyuncs\\.com(?:/.*)?$"));
private static final List<String> URI_KEYWORDS = Arrays.asList("uri",
"warehouse");
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/storage/OSSPropertiesTest.java
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/storage/OSSPropertiesTest.java
index f00fb0215e7..d9c08c5bae7 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/storage/OSSPropertiesTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/storage/OSSPropertiesTest.java
@@ -120,6 +120,12 @@ public class OSSPropertiesTest {
Assertions.assertEquals("cn-hongkong", ((OSSProperties)
StorageProperties.createPrimary(origProps)).getRegion());
origProps.put("oss.endpoint", "https://dlf.cn-beijing.aliyuncs.com";);
Assertions.assertEquals("cn-beijing", ((OSSProperties)
StorageProperties.createAll(origProps).get(1)).getRegion());
+ origProps.put("oss.endpoint", "datalake-vpc.cn-shenzhen.aliyuncs.com");
+ Assertions.assertEquals("cn-shenzhen", ((OSSProperties)
StorageProperties.createPrimary(origProps)).getRegion());
+ origProps.put("oss.endpoint",
"https://datalake-vpc.cn-shenzhen.aliyuncs.com";);
+ Assertions.assertEquals("cn-shenzhen", ((OSSProperties)
StorageProperties.createPrimary(origProps)).getRegion());
+ origProps.put("oss.endpoint",
"http://datalake-vpc.eu-central-1.aliyuncs.com";);
+ Assertions.assertEquals("eu-central-1", ((OSSProperties)
StorageProperties.createPrimary(origProps)).getRegion());
}
@Test
diff --git
a/regression-test/suites/external_table_p2/refactor_catalog_param/iceberg_on_hms_and_filesystem_and_dlf.groovy
b/regression-test/suites/external_table_p2/refactor_catalog_param/iceberg_on_hms_and_filesystem_and_dlf.groovy
index 89fedf6255a..f3ccbb36889 100644
---
a/regression-test/suites/external_table_p2/refactor_catalog_param/iceberg_on_hms_and_filesystem_and_dlf.groovy
+++
b/regression-test/suites/external_table_p2/refactor_catalog_param/iceberg_on_hms_and_filesystem_and_dlf.groovy
@@ -417,7 +417,7 @@ suite("iceberg_on_hms_and_filesystem_and_dlf",
"p2,external,new_catalog_property
String dlf_uid = context.config.otherConfigs.get("dlf_uid")
- String dlf_catalog_id = context.config.otherConfigs("dlf_catalog_id")
+ String dlf_catalog_id = context.config.otherConfigs.get("dlf_catalog_id")
String dlf_access_key = context.config.otherConfigs.get("dlf_access_key")
String dlf_secret_key = context.config.otherConfigs.get("dlf_secret_key")
/**************** DLF *******************/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
