Use metastore constants from Iceberg library

trinodb · Feb 18, 2022 · fe7ad03 · fe7ad03
1 parent 0790a5a
commit fe7ad03
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/...eberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractMetastoreTableOperations.java b/...eberg/src/main/java/io/trino/plugin/iceberg/catalog/AbstractMetastoreTableOperations.java
@@ -62,6 +62,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.UUID.randomUUID;
 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.TableMetadataParser.getFileExtension;
 import static org.apache.iceberg.TableProperties.METADATA_COMPRESSION;
@@ -74,8 +75,6 @@ public abstract class AbstractMetastoreTableOperations
 {
     private static final Logger log = Logger.get(AbstractMetastoreTableOperations.class);
 
-    public static final String METADATA_LOCATION = "metadata_location";
-    public static final String PREVIOUS_METADATA_LOCATION = "previous_metadata_location";
     protected static final String METADATA_FOLDER_NAME = "metadata";
 
     protected static final StorageFormat STORAGE_FORMAT = StorageFormat.create(
@@ -151,9 +150,9 @@ public TableMetadata refresh()
             throw new UnknownTableTypeException(getSchemaTableName());
         }
 
-        String metadataLocation = table.getParameters().get(METADATA_LOCATION);
+        String metadataLocation = table.getParameters().get(METADATA_LOCATION_PROP);
         if (metadataLocation == null) {
-            throw new TrinoException(ICEBERG_INVALID_METADATA, format("Table is missing [%s] property: %s", METADATA_LOCATION, getSchemaTableName()));
+            throw new TrinoException(ICEBERG_INVALID_METADATA, format("Table is missing [%s] property: %s", METADATA_LOCATION_PROP, getSchemaTableName()));
         }
 
         refreshFromMetadataLocation(metadataLocation);
@@ -202,7 +201,7 @@ protected void commitNewTable(TableMetadata metadata)
                     .withStorage(storage -> storage.setStorageFormat(STORAGE_FORMAT))
                     .setParameter("EXTERNAL", "TRUE")
                     .setParameter(TABLE_TYPE_PROP, ICEBERG_TABLE_TYPE_VALUE)
-                    .setParameter(METADATA_LOCATION, newMetadataLocation);
+                    .setParameter(METADATA_LOCATION_PROP, newMetadataLocation);
             String tableComment = metadata.properties().get(TABLE_COMMENT);
             if (tableComment != null) {
                 builder.setParameter(TABLE_COMMENT, tableComment);

diff --git a/...berg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java b/...berg/src/main/java/io/trino/plugin/iceberg/catalog/file/FileMetastoreTableOperations.java
@@ -29,6 +29,8 @@
 import static com.google.common.base.Preconditions.checkState;
 import static io.trino.plugin.hive.metastore.MetastoreUtil.buildInitialPrivilegeSet;
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
+import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
+import static org.apache.iceberg.BaseMetastoreTableOperations.PREVIOUS_METADATA_LOCATION_PROP;
 
 @NotThreadSafe
 public class FileMetastoreTableOperations
@@ -56,7 +58,7 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
             Table currentTable = getTable();
 
             checkState(currentMetadataLocation != null, "No current metadata location for existing table");
-            String metadataLocation = currentTable.getParameters().get(METADATA_LOCATION);
+            String metadataLocation = currentTable.getParameters().get(METADATA_LOCATION_PROP);
             if (!currentMetadataLocation.equals(metadataLocation)) {
                 throw new CommitFailedException("Metadata location [%s] is not same as table metadata location [%s] for %s",
                         currentMetadataLocation, metadataLocation, getSchemaTableName());
@@ -65,8 +67,8 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
             table = Table.builder(currentTable)
                     .setDataColumns(toHiveColumns(metadata.schema().columns()))
                     .withStorage(storage -> storage.setLocation(metadata.location()))
-                    .setParameter(METADATA_LOCATION, newMetadataLocation)
-                    .setParameter(PREVIOUS_METADATA_LOCATION, currentMetadataLocation)
+                    .setParameter(METADATA_LOCATION_PROP, newMetadataLocation)
+                    .setParameter(PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation)
                     .build();
         }
         catch (RuntimeException e) {

diff --git a/...eberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java b/...eberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
@@ -34,6 +34,8 @@
 import static io.trino.plugin.hive.metastore.PrincipalPrivileges.NO_PRIVILEGES;
 import static io.trino.plugin.hive.metastore.thrift.ThriftMetastoreUtil.fromMetastoreApiTable;
 import static java.util.Objects.requireNonNull;
+import static org.apache.iceberg.BaseMetastoreTableOperations.METADATA_LOCATION_PROP;
+import static org.apache.iceberg.BaseMetastoreTableOperations.PREVIOUS_METADATA_LOCATION_PROP;
 
 @NotThreadSafe
 public class HiveMetastoreTableOperations
@@ -73,7 +75,7 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
                         .orElseThrow(() -> new TableNotFoundException(getSchemaTableName())));
 
                 checkState(currentMetadataLocation != null, "No current metadata location for existing table");
-                String metadataLocation = currentTable.getParameters().get(METADATA_LOCATION);
+                String metadataLocation = currentTable.getParameters().get(METADATA_LOCATION_PROP);
                 if (!currentMetadataLocation.equals(metadataLocation)) {
                     throw new CommitFailedException("Metadata location [%s] is not same as table metadata location [%s] for %s",
                             currentMetadataLocation, metadataLocation, getSchemaTableName());
@@ -82,8 +84,8 @@ protected void commitToExistingTable(TableMetadata base, TableMetadata metadata)
                 table = Table.builder(currentTable)
                         .setDataColumns(toHiveColumns(metadata.schema().columns()))
                         .withStorage(storage -> storage.setLocation(metadata.location()))
-                        .setParameter(METADATA_LOCATION, newMetadataLocation)
-                        .setParameter(PREVIOUS_METADATA_LOCATION, currentMetadataLocation)
+                        .setParameter(METADATA_LOCATION_PROP, newMetadataLocation)
+                        .setParameter(PREVIOUS_METADATA_LOCATION_PROP, currentMetadataLocation)
                         .build();
             }
             catch (RuntimeException e) {