Update airlift to 295

trinodb · Jan 13, 2025 · f8916c3 · f8916c3
1 parent 9b13c1d
commit f8916c3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemModule.java b/lib/trino-filesystem-manager/src/main/java/io/trino/filesystem/manager/FileSystemModule.java
@@ -19,6 +19,7 @@
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
+import io.airlift.configuration.ConfigPropertyMetadata;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Tracer;
 import io.trino.filesystem.Location;
@@ -85,7 +86,9 @@ protected void setup(Binder binder)
                     nodeManager,
                     openTelemetry);
 
-            loader.configure().forEach(this::consumeProperty);
+            loader.configure().forEach((name, securitySensitive) ->
+                    consumeProperty(new ConfigPropertyMetadata(name, securitySensitive)));
+
             binder.bind(HdfsFileSystemLoader.class).toInstance(loader);
         }
 

diff --git a/...no-filesystem-manager/src/main/java/io/trino/filesystem/manager/HdfsFileSystemLoader.java b/...no-filesystem-manager/src/main/java/io/trino/filesystem/manager/HdfsFileSystemLoader.java
@@ -30,7 +30,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.Streams.stream;
@@ -85,10 +84,10 @@ public HdfsFileSystemLoader(
     }
 
     @SuppressWarnings("unchecked")
-    public Set<String> configure()
+    public Map<String, Boolean> configure()
     {
         try (var _ = new ThreadContextClassLoader(classLoader)) {
-            return (Set<String>) manager.getClass().getMethod("configure").invoke(manager);
+            return (Map<String, Boolean>) manager.getClass().getMethod("configure").invoke(manager);
         }
         catch (ReflectiveOperationException e) {
             throw new RuntimeException("Failed to configure HDFS:\n%s\n%s\n%s".formatted("<".repeat(70), e.getCause(), ">".repeat(70)), e);

diff --git a/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemManager.java b/lib/trino-hdfs/src/main/java/io/trino/filesystem/hdfs/HdfsFileSystemManager.java
@@ -17,6 +17,7 @@
 import com.google.inject.Module;
 import io.airlift.bootstrap.Bootstrap;
 import io.airlift.bootstrap.LifeCycleManager;
+import io.airlift.configuration.ConfigPropertyMetadata;
 import io.opentelemetry.api.OpenTelemetry;
 import io.trino.filesystem.TrinoFileSystemFactory;
 import io.trino.hdfs.HdfsModule;
@@ -34,9 +35,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.stream.Collectors.toMap;
 
 public final class HdfsFileSystemManager
 {
@@ -84,9 +85,11 @@ public HdfsFileSystemManager(
                 .setOptionalConfigurationProperties(config);
     }
 
-    public Set<String> configure()
+    public Map<String, Boolean> configure()
     {
-        return bootstrap.configure();
+        return bootstrap.configure()
+                .stream()
+                .collect(toMap(ConfigPropertyMetadata::name, ConfigPropertyMetadata::securitySensitive));
     }
 
     public TrinoFileSystemFactory create()

diff --git a/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemManager.java b/lib/trino-hdfs/src/test/java/io/trino/filesystem/hdfs/TestHdfsFileSystemManager.java
@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.util.Set;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -47,8 +46,7 @@ void testManager()
                 new TestingNodeManager(),
                 OpenTelemetry.noop());
 
-        Set<String> used = manager.configure();
-        assertThat(used).containsExactly("hive.dfs.verify-checksum", "hive.s3.region");
+        assertThat(manager.configure().keySet()).containsExactly("hive.dfs.verify-checksum", "hive.s3.region");
 
         TrinoFileSystemFactory factory = manager.create();
         TrinoFileSystem fileSystem = factory.create(ConnectorIdentity.ofUser("test"));

diff --git a/pom.xml b/pom.xml
@@ -184,7 +184,7 @@
         <air.test.jvm.additional-arguments>${air.test.jvm.additional-arguments.default}</air.test.jvm.additional-arguments>
 
         <!-- keep dependency properties sorted -->
-        <dep.airlift.version>294</dep.airlift.version>
+        <dep.airlift.version>295</dep.airlift.version>
         <dep.alluxio.version>2.9.6</dep.alluxio.version>
         <dep.antlr.version>4.13.2</dep.antlr.version>
         <dep.avro.version>1.12.0</dep.avro.version>