Adds provider for GlueClient, fixes test - TestIcebergPlugin#testGlueMetastore

Author: ShubhamChaurasia

plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/GlueMetastoreModule.java

@@ -29,6 +29,7 @@
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
 import software.amazon.awssdk.services.glue.GlueAsyncClient;
+import software.amazon.awssdk.services.glue.GlueClient;
 import software.amazon.awssdk.services.glue.model.Table;
 
 import java.util.concurrent.Executor;
@@ -68,7 +69,8 @@ protected void setup(Binder binder)
         // export under the old name, for backwards compatibility
         binder.bind(GlueHiveMetastoreFactory.class).in(Scopes.SINGLETON);
         binder.bind(Key.get(GlueMetastoreStats.class, ForGlueHiveMetastore.class)).toInstance(new GlueMetastoreStats());
-        binder.bind(GlueAsyncClient.class).toProvider(HiveGlueClientProvider.class).in(Scopes.SINGLETON);
+        binder.bind(GlueAsyncClient.class).toProvider(HiveGlueAsyncClientProvider.class).in(Scopes.SINGLETON);
+        binder.bind(GlueClient.class).toProvider(HiveGlueSyncClientProvider.class).in(Scopes.SINGLETON);
         newExporter(binder).export(GlueHiveMetastoreFactory.class).as(generator -> generator.generatedNameOf(GlueHiveMetastore.class));
 
         binder.bind(Key.get(boolean.class, AllowHiveTableRename.class)).toInstance(false);

plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueClientProvider.java renamed to plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueAsyncClientProvider.java

@@ -24,7 +24,7 @@
 import static io.trino.plugin.hive.metastore.glue.GlueClientUtil.createAsyncGlueClient;
 import static java.util.Objects.requireNonNull;
 
-public class HiveGlueClientProvider
+public class HiveGlueAsyncClientProvider
         implements Provider<GlueAsyncClient>
 {
     private final GlueMetastoreStats stats;
@@ -33,7 +33,7 @@ public class HiveGlueClientProvider
     private final Optional<ExecutionInterceptor> requestHandler;
 
     @Inject
-    public HiveGlueClientProvider(
+    public HiveGlueAsyncClientProvider(
             @ForGlueHiveMetastore GlueMetastoreStats stats,
             AwsCredentialsProvider credentialsProvider,
             @ForGlueHiveMetastore Optional<ExecutionInterceptor> requestHandler,

plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/HiveGlueSyncClientProvider.java

@@ -0,0 +1,53 @@
+/*
+ * Licensed 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 io.trino.plugin.hive.metastore.glue;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
+import software.amazon.awssdk.services.glue.GlueClient;
+
+import java.util.Optional;
+
+import static io.trino.plugin.hive.metastore.glue.GlueClientUtil.createSyncGlueClient;
+import static java.util.Objects.requireNonNull;
+
+public class HiveGlueSyncClientProvider
+        implements Provider<GlueClient>
+{
+    private final GlueMetastoreStats stats;
+    private final AwsCredentialsProvider credentialsProvider;
+    private final GlueHiveMetastoreConfig glueConfig; // TODO do not keep mutable config instance on a field
+    private final Optional<ExecutionInterceptor> requestHandler;
+
+    @Inject
+    public HiveGlueSyncClientProvider(
+            @ForGlueHiveMetastore GlueMetastoreStats stats,
+            AwsCredentialsProvider credentialsProvider,
+            @ForGlueHiveMetastore Optional<ExecutionInterceptor> requestHandler,
+            GlueHiveMetastoreConfig glueConfig)
+    {
+        this.stats = requireNonNull(stats, "stats is null");
+        this.credentialsProvider = requireNonNull(credentialsProvider, "credentialsProvider is null");
+        this.requestHandler = requireNonNull(requestHandler, "requestHandler is null");
+        this.glueConfig = glueConfig;
+    }
+
+    @Override
+    public GlueClient get()
+    {
+        return createSyncGlueClient(glueConfig, credentialsProvider, requestHandler, stats.newRequestMetricsPublisher());
+    }
+}

plugin/trino-hive/src/test/java/io/trino/plugin/hive/metastore/glue/TestHiveGlueMetastore.java

@@ -23,7 +23,6 @@
 import io.trino.plugin.hive.HiveMetastoreClosure;
 import io.trino.plugin.hive.HiveType;
 import io.trino.plugin.hive.PartitionStatistics;
-import io.trino.plugin.hive.aws.AwsApiCallStats;
 import io.trino.plugin.hive.metastore.HiveColumnStatistics;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.hive.metastore.PartitionWithStatistics;
@@ -270,7 +269,7 @@ public void cleanupOrphanedDatabases()
                         .forEach(database -> {
                             orphanedDbBuilder.add(database.name());
                         }),
-                new AwsApiCallStats());
+                stats.getGetDatabases());
 
         List<String> orphanedDatabases = orphanedDbBuilder.build();