Remove redundant parameters from IcebergTableOperationsProvider

trinodb · Oct 16, 2021 · 3dff0a5 · 3dff0a5
1 parent 55b5b9d
commit 3dff0a5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 16 deletions.
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergUtil.java
@@ -16,7 +16,6 @@
 import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.Slice;
 import io.airlift.slice.SliceUtf8;
-import io.trino.plugin.hive.HdfsEnvironment.HdfsContext;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperations;
 import io.trino.plugin.iceberg.catalog.IcebergTableOperationsProvider;
@@ -124,8 +123,6 @@ public static Table loadIcebergTable(HiveMetastore metastore, IcebergTableOperat
     {
         TableOperations operations = tableOperationsProvider.createTableOperations(
                 metastore,
-                new HdfsContext(session),
-                session.getQueryId(),
                 session,
                 table.getSchemaName(),
                 table.getTableName(),
@@ -143,8 +140,6 @@ public static Table getIcebergTableWithMetadata(
     {
         IcebergTableOperations operations = tableOperationsProvider.createTableOperations(
                 metastore,
-                new HdfsContext(session),
-                session.getQueryId(),
                 session,
                 table.getSchemaName(),
                 table.getTableName(),

diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoHiveCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/TrinoHiveCatalog.java
@@ -262,8 +262,6 @@ public Transaction newCreateTableTransaction(ConnectorSession session, SchemaTab
         TableMetadata metadata = newTableMetadata(schema, partitionSpec, location, properties);
         TableOperations ops = tableOperationsProvider.createTableOperations(
                 metastore,
-                new HdfsContext(session),
-                session.getQueryId(),
                 session,
                 schemaTableName.getSchemaName(),
                 schemaTableName.getTableName(),

diff --git a/...iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergTableOperationsProvider.java b/...iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergTableOperationsProvider.java
@@ -13,7 +13,6 @@
  */
 package io.trino.plugin.iceberg.catalog;
 
-import io.trino.plugin.hive.HdfsEnvironment.HdfsContext;
 import io.trino.plugin.hive.metastore.HiveMetastore;
 import io.trino.spi.connector.ConnectorSession;
 
@@ -23,8 +22,6 @@ public interface IcebergTableOperationsProvider
 {
     IcebergTableOperations createTableOperations(
             HiveMetastore hiveMetastore,
-            HdfsContext hdfsContext,
-            String queryId,
             ConnectorSession session,
             String database,
             String table,

diff --git a/.../main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java b/.../main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java
@@ -40,16 +40,14 @@ public FileMetastoreTableOperationsProvider(FileIoProvider fileIoProvider)
     @Override
     public IcebergTableOperations createTableOperations(
             HiveMetastore hiveMetastore,
-            HdfsContext hdfsContext,
-            String queryId,
             ConnectorSession session,
             String database,
             String table,
             Optional<String> owner,
             Optional<String> location)
     {
         return new FileMetastoreTableOperations(
-                fileIoProvider.createFileIo(hdfsContext, queryId),
+                fileIoProvider.createFileIo(new HdfsContext(session), session.getQueryId()),
                 hiveMetastore,
                 session,
                 database,

diff --git a/...c/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java b/...c/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java
@@ -43,16 +43,14 @@ public HiveMetastoreTableOperationsProvider(FileIoProvider fileIoProvider, Thrif
     @Override
     public IcebergTableOperations createTableOperations(
             HiveMetastore hiveMetastore,
-            HdfsContext hdfsContext,
-            String queryId,
             ConnectorSession session,
             String database,
             String table,
             Optional<String> owner,
             Optional<String> location)
     {
         return new HiveMetastoreTableOperations(
-                fileIoProvider.createFileIo(hdfsContext, queryId),
+                fileIoProvider.createFileIo(new HdfsContext(session), session.getQueryId()),
                 hiveMetastore,
                 thriftMetastore,
                 session,