From 3dff0a502f3afe858e3fd75bd438d67bb43b40eb Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Fri, 15 Oct 2021 21:53:29 +0200 Subject: [PATCH] Remove redundant parameters from IcebergTableOperationsProvider --- .../src/main/java/io/trino/plugin/iceberg/IcebergUtil.java | 5 ----- .../main/java/io/trino/plugin/iceberg/TrinoHiveCatalog.java | 2 -- .../iceberg/catalog/IcebergTableOperationsProvider.java | 3 --- .../catalog/file/FileMetastoreTableOperationsProvider.java | 4 +--- .../catalog/hms/HiveMetastoreTableOperationsProvider.java | 4 +--- 5 files changed, 2 insertions(+), 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 index f1fa9196099d..147ce7b041c7 100644 --- 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 index eb0db9e4ba55..ef49d95b11a7 100644 --- 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/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergTableOperationsProvider.java index c36f2dbea267..c4e970cab61b 100644 --- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/IcebergTableOperationsProvider.java +++ b/plugin/trino-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/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java index d6ed9bbba3d1..7fafc4a58c95 100644 --- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java +++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperationsProvider.java @@ -40,8 +40,6 @@ public FileMetastoreTableOperationsProvider(FileIoProvider fileIoProvider) @Override public IcebergTableOperations createTableOperations( HiveMetastore hiveMetastore, - HdfsContext hdfsContext, - String queryId, ConnectorSession session, String database, String table, @@ -49,7 +47,7 @@ public IcebergTableOperations createTableOperations( Optional location) { return new FileMetastoreTableOperations( - fileIoProvider.createFileIo(hdfsContext, queryId), + fileIoProvider.createFileIo(new HdfsContext(session), session.getQueryId()), hiveMetastore, session, database, diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java index 5252bbec271e..38422ae428ba 100644 --- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java +++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperationsProvider.java @@ -43,8 +43,6 @@ public HiveMetastoreTableOperationsProvider(FileIoProvider fileIoProvider, Thrif @Override public IcebergTableOperations createTableOperations( HiveMetastore hiveMetastore, - HdfsContext hdfsContext, - String queryId, ConnectorSession session, String database, String table, @@ -52,7 +50,7 @@ public IcebergTableOperations createTableOperations( Optional location) { return new HiveMetastoreTableOperations( - fileIoProvider.createFileIo(hdfsContext, queryId), + fileIoProvider.createFileIo(new HdfsContext(session), session.getQueryId()), hiveMetastore, thriftMetastore, session,