Skip to content

Let GlueIcebergUtil.getTableInput populate the table type property #14976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebyhr merged 1 commit into from
Nov 10, 2022
Merged

Let GlueIcebergUtil.getTableInput populate the table type property #14976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions ...ceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,9 @@
import static io.trino.plugin.iceberg.IcebergErrorCode.ICEBERG_INVALID_METADATA;
import static io.trino.plugin.iceberg.catalog.glue.GlueIcebergUtil.getTableInput;
import static java.lang.String.format;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
import static org.apache.iceberg.BaseMetastoreTableOperations.PREVIOUS_METADATA_LOCATION_PROP;
import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;

public class GlueIcebergTableOperations
extends AbstractIcebergTableOperations
Expand Down Expand Up @@ -106,10 +103,7 @@ protected void commitNewTable(TableMetadata metadata)
{
verify(version == -1, "commitNewTable called on a table which already exists");
String newMetadataLocation = writeNewMetadata(metadata, 0);
TableInput tableInput = getTableInput(tableName, owner, ImmutableMap.<String, String>builder()
.put(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
.put(METADATA_LOCATION_PROP, newMetadataLocation)
.buildOrThrow());
TableInput tableInput = getTableInput(tableName, owner, ImmutableMap.of(METADATA_LOCATION_PROP, newMetadataLocation));

CreateTableRequest createTableRequest = new CreateTableRequest()
.withDatabaseName(database)
Expand All @@ -122,11 +116,12 @@ protected void commitNewTable(TableMetadata metadata)
protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
{
String newMetadataLocation = writeNewMetadata(metadata, version + 1);
TableInput tableInput = getTableInput(tableName, owner, ImmutableMap.<String, String>builder()
.put(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
.put(METADATA_LOCATION_PROP, newMetadataLocation)
.put(PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation)
.buildOrThrow());
TableInput tableInput = getTableInput(
tableName,
owner,
ImmutableMap.of(
METADATA_LOCATION_PROP, newMetadataLocation,
PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation));

UpdateTableRequest updateTableRequest = new UpdateTableRequest()
.withDatabaseName(database)
Expand Down
9 changes: 8 additions & 1 deletion plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/GlueIcebergUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
package io.trino.plugin.iceberg.catalog.glue;

import com.amazonaws.services.glue.model.TableInput;
import com.google.common.collect.ImmutableMap;

import javax.annotation.Nullable;

Expand All @@ -22,8 +23,11 @@

import static io.trino.plugin.hive.HiveMetadata.PRESTO_VIEW_EXPANDED_TEXT_MARKER;
import static io.trino.plugin.hive.ViewReaderUtil.ICEBERG_MATERIALIZED_VIEW_COMMENT;
import static java.util.Locale.ENGLISH;
import static org.apache.hadoop.hive.metastore.TableType.EXTERNAL_TABLE;
import static org.apache.hadoop.hive.metastore.TableType.VIRTUAL_VIEW;
import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;

public final class GlueIcebergUtil
{
Expand All @@ -34,7 +38,10 @@ public static TableInput getTableInput(String tableName, Optional<String> owner,
return new TableInput()
.withName(tableName)
.withOwner(owner.orElse(null))
.withParameters(parameters)
.withParameters(ImmutableMap.<String, String>builder()
.putAll(parameters)
.put(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
.buildKeepingLast())
// Iceberg does not distinguish managed and external tables, all tables are treated the same and marked as EXTERNAL
.withTableType(EXTERNAL_TABLE.name());
}
Expand Down
7 changes: 1 addition & 6 deletions ...in/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/glue/TrinoGlueCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,7 @@
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static org.apache.hadoop.hive.metastore.TableType.VIRTUAL_VIEW;
import static org.apache.iceberg.BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE;
import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
import static org.apache.iceberg.BaseMetastoreTableOperations.TABLE_TYPE_PROP;
import static org.apache.iceberg.CatalogUtil.dropTableData;

public class TrinoGlueCatalog
Expand Down Expand Up @@ -376,10 +374,7 @@ public Transaction newCreateTableTransaction(
public void registerTable(ConnectorSession session, SchemaTableName schemaTableName, String tableLocation, String metadataLocation)
throws TrinoException
{
TableInput tableInput = getTableInput(schemaTableName.getTableName(), Optional.of(session.getUser()), ImmutableMap.<String, String>builder()
.put(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE.toUpperCase(ENGLISH))
.put(METADATA_LOCATION_PROP, metadataLocation)
.buildOrThrow());
TableInput tableInput = getTableInput(schemaTableName.getTableName(), Optional.of(session.getUser()), ImmutableMap.of(METADATA_LOCATION_PROP, metadataLocation));
createTable(schemaTableName.getSchemaName(), tableInput);
}

Expand Down