This is an automated email from the ASF dual-hosted git repository.
CalvinKirs 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 59de1a769f0 [fix](test) pin the OSS-HDFS URI qualification in
OssHdfsPropertiesSpiParityTest (#67986)
59de1a769f0 is described below
commit 59de1a769f0abed980d9196fbb827b1075f83bc8
Author: Calvin Kirs <[email protected]>
AuthorDate: Wed Sep 16 09:58:34 2026 +0800
[fix](test) pin the OSS-HDFS URI qualification in
OssHdfsPropertiesSpiParityTest (#67986)
### What problem does this PR solve?
Issue Number: None
Related PR: #67545
Problem Summary:
#67545 changed `OssHdfsProperties.validateAndNormalizeUri` to qualify a
bare bucket authority with the bound oss-dls endpoint host
(`oss://bucket/x` -> `oss://bucket.<region>.oss-dls.aliyuncs.com/x`),
and covered the new behavior in `OssHdfsPropertiesTest`. It did not
update `OssHdfsPropertiesSpiParityTest.testValidateUriOssSchemeOnly`,
which still asserted the old passthrough, so `fe-filesystem-oss-hdfs`
has failed on master since:
```
OssHdfsPropertiesSpiParityTest.testValidateUriOssSchemeOnly:113
expected: <oss://mybucket/x> but was:
<oss://mybucket.cn-hangzhou.oss-dls.aliyuncs.com/x>
```
The fe-core oracle the test comment refers to no longer exists on
master, so the passthrough expectation had nothing left backing it. This
PR only updates the test: it now asserts the qualified form, its
idempotence when the input is already qualified under the same endpoint,
and keeps the rejection of non-`oss://` schemes. No production code is
changed.
---
.../doris/filesystem/hdfs/OssHdfsPropertiesSpiParityTest.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-filesystem/fe-filesystem-oss-hdfs/src/test/java/org/apache/doris/filesystem/hdfs/OssHdfsPropertiesSpiParityTest.java
b/fe/fe-filesystem/fe-filesystem-oss-hdfs/src/test/java/org/apache/doris/filesystem/hdfs/OssHdfsPropertiesSpiParityTest.java
index 1499e48ac2a..2827a6a7e4b 100644
---
a/fe/fe-filesystem/fe-filesystem-oss-hdfs/src/test/java/org/apache/doris/filesystem/hdfs/OssHdfsPropertiesSpiParityTest.java
+++
b/fe/fe-filesystem/fe-filesystem-oss-hdfs/src/test/java/org/apache/doris/filesystem/hdfs/OssHdfsPropertiesSpiParityTest.java
@@ -108,9 +108,15 @@ class OssHdfsPropertiesSpiParityTest {
}
@Test
- void testValidateUriOssSchemeOnly() {
+ void testValidateUriQualifiesBucketWithEndpointAndRejectsOtherSchemes() {
OssHdfsProperties p = PROVIDER.bind(baseProps());
- Assertions.assertEquals("oss://mybucket/x",
p.validateAndNormalizeUri("oss://mybucket/x"));
+ // A bare bucket authority is qualified with the bound OSS-HDFS
endpoint host so JindoFS
+ // resolves it as the oss-dls bucket rather than a native OSS one
(#67545); the path is kept.
+
Assertions.assertEquals("oss://mybucket.cn-hangzhou.oss-dls.aliyuncs.com/x",
+ p.validateAndNormalizeUri("oss://mybucket/x"));
+ // An already-qualified authority is idempotent under the same
endpoint.
+
Assertions.assertEquals("oss://mybucket.cn-hangzhou.oss-dls.aliyuncs.com/x",
+
p.validateAndNormalizeUri("oss://mybucket.cn-hangzhou.oss-dls.aliyuncs.com/x"));
Assertions.assertThrows(IllegalArgumentException.class,
() -> p.validateAndNormalizeUri("hdfs://ns1/x"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
