This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 55cdacea8b4 branch-4.1: [fix](paimon) add jindo oss support and token
propagation #62106 (#62220)
55cdacea8b4 is described below
commit 55cdacea8b47b4854a1a56dc4f6e730ffafde71c
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 9 11:34:07 2026 +0800
branch-4.1: [fix](paimon) add jindo oss support and token propagation
#62106 (#62220)
Cherry-picked from #62106
Co-authored-by: Calvin Kirs <[email protected]>
---
fe/be-java-extensions/paimon-scanner/pom.xml | 8 +++---
.../paimon-scanner/src/main/resources/package.xml | 6 +++++
fe/be-java-extensions/preload-extensions/pom.xml | 1 -
fe/fe-core/pom.xml | 8 +++---
.../datasource/property/storage/OSSProperties.java | 3 +++
.../property/storage/OSSPropertiesTest.java | 2 ++
fe/pom.xml | 30 ++++++++++++++++++++++
7 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/fe/be-java-extensions/paimon-scanner/pom.xml
b/fe/be-java-extensions/paimon-scanner/pom.xml
index e11a8c63e28..32d1e55cda0 100644
--- a/fe/be-java-extensions/paimon-scanner/pom.xml
+++ b/fe/be-java-extensions/paimon-scanner/pom.xml
@@ -45,24 +45,24 @@ under the License.
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-core</artifactId>
- <version>${paimon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-common</artifactId>
- <version>${paimon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-hive-connector-3.1</artifactId>
- <version>${paimon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-format</artifactId>
- <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-jindo</artifactId>
</dependency>
</dependencies>
diff --git
a/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
b/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
index 4bbb2610603..6566bb46f11 100644
--- a/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
+++ b/fe/be-java-extensions/paimon-scanner/src/main/resources/package.xml
@@ -38,4 +38,10 @@ under the License.
</unpackOptions>
</dependencySet>
</dependencySets>
+
+ <containerDescriptorHandlers>
+ <containerDescriptorHandler>
+ <handlerName>metaInf-services</handlerName>
+ </containerDescriptorHandler>
+ </containerDescriptorHandlers>
</assembly>
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index 2c66405d0bc..a94f3ab69e1 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -82,7 +82,6 @@ under the License.
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-s3</artifactId>
- <version>${paimon.version}</version>
</dependency>
<!-- For Avro and Hudi Scanner PreLoad -->
<dependency>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index d34e9f008b5..ea867eb4438 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -536,25 +536,25 @@ under the License.
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-core</artifactId>
- <version>${paimon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-common</artifactId>
- <version>${paimon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-format</artifactId>
- <version>${paimon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-s3</artifactId>
- <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-jindo</artifactId>
</dependency>
<dependency>
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 dd8a75c4bbd..b38bc639076 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
@@ -318,6 +318,9 @@ public class OSSProperties extends
AbstractS3CompatibleProperties {
hadoopStorageConfig.set("fs.AbstractFileSystem.oss.impl",
JINDO_OSS_ABSTRACT_FILE_SYSTEM_IMPL);
hadoopStorageConfig.set("fs.oss.accessKeyId", accessKey);
hadoopStorageConfig.set("fs.oss.accessKeySecret", secretKey);
+ if (StringUtils.isNotBlank(sessionToken)) {
+ hadoopStorageConfig.set("fs.oss.securityToken", sessionToken);
+ }
hadoopStorageConfig.set("fs.oss.endpoint", endpoint);
hadoopStorageConfig.set("fs.oss.region", region);
}
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 d5c5b029031..7c9ec53b177 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
@@ -277,11 +277,13 @@ public class OSSPropertiesTest {
Map<String, String> props = Maps.newHashMap();
props.put("oss.endpoint", "oss-cn-hangzhou.aliyuncs.com");
props.put("oss.region", "cn-hangzhou");
+ props.put("oss.session_token", "testSessionToken");
OSSProperties ossProperties = (OSSProperties)
StorageProperties.createPrimary(props);
Assertions.assertEquals(OSSProperties.JINDO_OSS_FILE_SYSTEM_IMPL,
ossProperties.hadoopStorageConfig.get("fs.oss.impl"));
Assertions.assertEquals(OSSProperties.JINDO_OSS_ABSTRACT_FILE_SYSTEM_IMPL,
ossProperties.hadoopStorageConfig.get("fs.AbstractFileSystem.oss.impl"));
+ Assertions.assertEquals("testSessionToken",
ossProperties.hadoopStorageConfig.get("fs.oss.securityToken"));
Assertions.assertEquals("cn-hangzhou",
ossProperties.hadoopStorageConfig.get("fs.oss.region"));
}
diff --git a/fe/pom.xml b/fe/pom.xml
index 2db2b7c68d0..e3920dc3614 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -1310,6 +1310,36 @@ under the License.
<artifactId>iceberg-aws</artifactId>
<version>${iceberg.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-core</artifactId>
+ <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-common</artifactId>
+ <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-hive-connector-3.1</artifactId>
+ <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-format</artifactId>
+ <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-s3</artifactId>
+ <version>${paimon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-jindo</artifactId>
+ <version>${paimon.version}</version>
+ </dependency>
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-core</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
