This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 188ce2175a [filesystem] support report access extended information to
DLF OSS (#7337)
188ce2175a is described below
commit 188ce2175a574ab86557012ece693fa6484128c4
Author: shyjsarah <[email protected]>
AuthorDate: Wed Mar 4 19:59:31 2026 +0800
[filesystem] support report access extended information to DLF OSS (#7337)
---
.../java/org/apache/paimon/jindo/JindoFileIO.java | 16 ++++
.../paimon/jindo/TestJindoDlfAccessTracking.java | 103 +++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git
a/paimon-filesystems/paimon-jindo/src/main/java/org/apache/paimon/jindo/JindoFileIO.java
b/paimon-filesystems/paimon-jindo/src/main/java/org/apache/paimon/jindo/JindoFileIO.java
index 909cf247e7..01761bc117 100644
---
a/paimon-filesystems/paimon-jindo/src/main/java/org/apache/paimon/jindo/JindoFileIO.java
+++
b/paimon-filesystems/paimon-jindo/src/main/java/org/apache/paimon/jindo/JindoFileIO.java
@@ -25,6 +25,7 @@ import org.apache.paimon.fs.TwoPhaseOutputStream;
import org.apache.paimon.options.Options;
import org.apache.paimon.utils.IOUtils;
import org.apache.paimon.utils.Pair;
+import org.apache.paimon.utils.StringUtils;
import com.aliyun.jindodata.common.JindoHadoopSystem;
import com.aliyun.jindodata.dls.JindoDlsFileSystem;
@@ -64,6 +65,9 @@ public class JindoFileIO extends HadoopCompliantFileIO {
private static final String OSS_ACCESS_KEY_ID = "fs.oss.accessKeyId";
private static final String OSS_ACCESS_KEY_SECRET =
"fs.oss.accessKeySecret";
private static final String OSS_SECURITY_TOKEN = "fs.oss.securityToken";
+ private static final String OSS_USER_AGENT_EXTENDED =
"fs.oss.user.agent.extended";
+ private static final String DLF_ACCESS_TRACKING_EXTENDED_INFO =
+ "dlf.access-tracking.extended-info";
private static final Map<String, String> CASE_SENSITIVE_KEYS =
new HashMap<String, String>() {
@@ -130,6 +134,18 @@ public class JindoFileIO extends HadoopCompliantFileIO {
.forEachRemaining(entry ->
hadoopOptions.set(entry.getKey(), entry.getValue()));
}
+ String dlfAccessTrackingExtendedInfo =
+ context.options().get(DLF_ACCESS_TRACKING_EXTENDED_INFO);
+ if
(!StringUtils.isNullOrWhitespaceOnly(dlfAccessTrackingExtendedInfo)) {
+ LOG.info("Adding DLF access tracking extended info: {}",
dlfAccessTrackingExtendedInfo);
+ String existedUserAgentExtended =
hadoopOptions.get(OSS_USER_AGENT_EXTENDED);
+ hadoopOptions.set(
+ OSS_USER_AGENT_EXTENDED,
+
StringUtils.isNullOrWhitespaceOnly(existedUserAgentExtended)
+ ? dlfAccessTrackingExtendedInfo
+ : existedUserAgentExtended + " " +
dlfAccessTrackingExtendedInfo);
+ }
+
// another config when enable cache
hadoopOptionsWithCache = new Options(hadoopOptions.toMap());
hadoopOptionsWithCache.set("fs.xengine", "jindocache");
diff --git
a/paimon-filesystems/paimon-jindo/src/test/java/org/apache/paimon/jindo/TestJindoDlfAccessTracking.java
b/paimon-filesystems/paimon-jindo/src/test/java/org/apache/paimon/jindo/TestJindoDlfAccessTracking.java
new file mode 100644
index 0000000000..67132a4148
--- /dev/null
+++
b/paimon-filesystems/paimon-jindo/src/test/java/org/apache/paimon/jindo/TestJindoDlfAccessTracking.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.paimon.jindo;
+
+import org.apache.paimon.catalog.CatalogContext;
+import org.apache.paimon.options.Options;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Field;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Test for DLF access tracking extended info in {@link JindoFileIO}. */
+public class TestJindoDlfAccessTracking {
+
+ private static final String DLF_ACCESS_TRACKING_EXTENDED_INFO =
+ "dlf.access-tracking.extended-info";
+ private static final String OSS_USER_AGENT_EXTENDED =
"fs.oss.user.agent.extended";
+
+ private Options getHadoopOptions(JindoFileIO fileIO) {
+ try {
+ Field field = JindoFileIO.class.getDeclaredField("hadoopOptions");
+ field.setAccessible(true);
+ return (Options) field.get(fileIO);
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ throw new RuntimeException("Failed to access hadoopOptions field",
e);
+ }
+ }
+
+ @Test
+ public void testExtendedInfoSetToUserAgent() {
+ Options options = new Options();
+ options.set(DLF_ACCESS_TRACKING_EXTENDED_INFO, "tracking-info-123");
+ options.set("fs.oss.accessKeyId", "testAk");
+ options.set("fs.oss.accessKeySecret", "testSk");
+
+ JindoFileIO fileIO = new JindoFileIO();
+ fileIO.configure(CatalogContext.create(options));
+
+ Options hadoopOptions = getHadoopOptions(fileIO);
+
assertThat(hadoopOptions.get(OSS_USER_AGENT_EXTENDED)).isEqualTo("tracking-info-123");
+ }
+
+ @Test
+ public void testExtendedInfoAppendedToExistingUserAgent() {
+ Options options = new Options();
+ options.set(DLF_ACCESS_TRACKING_EXTENDED_INFO, "tracking-info-456");
+ options.set(OSS_USER_AGENT_EXTENDED, "existing-agent");
+ options.set("fs.oss.accessKeyId", "testAk");
+ options.set("fs.oss.accessKeySecret", "testSk");
+
+ JindoFileIO fileIO = new JindoFileIO();
+ fileIO.configure(CatalogContext.create(options));
+
+ Options hadoopOptions = getHadoopOptions(fileIO);
+ assertThat(hadoopOptions.get(OSS_USER_AGENT_EXTENDED))
+ .isEqualTo("existing-agent tracking-info-456");
+ }
+
+ @Test
+ public void testNoExtendedInfoWhenNotConfigured() {
+ Options options = new Options();
+ options.set("fs.oss.accessKeyId", "testAk");
+ options.set("fs.oss.accessKeySecret", "testSk");
+
+ JindoFileIO fileIO = new JindoFileIO();
+ fileIO.configure(CatalogContext.create(options));
+
+ Options hadoopOptions = getHadoopOptions(fileIO);
+ assertThat(hadoopOptions.get(OSS_USER_AGENT_EXTENDED)).isNull();
+ }
+
+ @Test
+ public void testEmptyExtendedInfoIgnored() {
+ Options options = new Options();
+ options.set(DLF_ACCESS_TRACKING_EXTENDED_INFO, " ");
+ options.set("fs.oss.accessKeyId", "testAk");
+ options.set("fs.oss.accessKeySecret", "testSk");
+
+ JindoFileIO fileIO = new JindoFileIO();
+ fileIO.configure(CatalogContext.create(options));
+
+ Options hadoopOptions = getHadoopOptions(fileIO);
+ assertThat(hadoopOptions.get(OSS_USER_AGENT_EXTENDED)).isNull();
+ }
+}
