Remove deprecated Hive internal Column constructor

plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeMetadata.java

@@ -346,7 +346,7 @@ public class DeltaLakeMetadata
 
     // Matches the dummy column Databricks stores in the metastore
     private static final List<Column> DUMMY_DATA_COLUMNS = ImmutableList.of(
-            new Column("col", HiveType.toHiveType(new ArrayType(VarcharType.createUnboundedVarcharType())), Optional.empty()));
+            new Column("col", HiveType.toHiveType(new ArrayType(VarcharType.createUnboundedVarcharType())), Optional.empty(), Map.of()));
     private static final Set<ColumnStatisticType> SUPPORTED_STATISTICS_TYPE = ImmutableSet.<ColumnStatisticType>builder()
             .add(TOTAL_SIZE_IN_BYTES)
             .add(NUMBER_OF_DISTINCT_VALUES_SUMMARY)

plugin/trino-delta-lake/src/test/java/io/trino/plugin/deltalake/metastore/glue/TestDeltaLakeGlueMetastore.java

@@ -289,7 +289,7 @@ private void createTable(SchemaTableName tableName, String tableLocation, Consum
                 .setTableName(tableName.getTableName())
                 .setOwner(Optional.of(session.getUser()))
                 .setTableType(EXTERNAL_TABLE.name())
-                .setDataColumns(List.of(new Column("a_column", HIVE_STRING, Optional.empty())));
+                .setDataColumns(List.of(new Column("a_column", HIVE_STRING, Optional.empty(), Map.of())));
 
         table.getStorageBuilder()
                 .setStorageFormat(fromHiveStorageFormat(PARQUET))
@@ -308,7 +308,7 @@ private void createView(SchemaTableName viewName, String tableLocation, Consumer
                 .setTableName(viewName.getTableName())
                 .setOwner(Optional.of(session.getUser()))
                 .setTableType(VIRTUAL_VIEW.name())
-                .setDataColumns(List.of(new Column("a_column", HIVE_STRING, Optional.empty())));
+                .setDataColumns(List.of(new Column("a_column", HIVE_STRING, Optional.empty(), Map.of())));
 
         table.getStorageBuilder()
                 .setStorageFormat(fromHiveStorageFormat(PARQUET))

plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveFileSystemS3.java

@@ -49,6 +49,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -145,8 +146,8 @@ public void testFileIteratorPartitionedListingNativeS3Client()
         Table.Builder tableBuilder = Table.builder()
                 .setDatabaseName(table.getSchemaName())
                 .setTableName(table.getTableName())
-                .setDataColumns(ImmutableList.of(new Column("data", HIVE_LONG, Optional.empty())))
-                .setPartitionColumns(ImmutableList.of(new Column("part", HIVE_STRING, Optional.empty())))
+                .setDataColumns(ImmutableList.of(new Column("data", HIVE_LONG, Optional.empty(), Map.of())))
+                .setPartitionColumns(ImmutableList.of(new Column("part", HIVE_STRING, Optional.empty(), Map.of())))
                 .setOwner(Optional.empty())
                 .setTableType("fake");
         tableBuilder.getStorageBuilder()

plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveColumnHandle.java

@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.collect.ImmutableMap;
 import io.airlift.slice.SizeOf;
 import io.trino.plugin.hive.metastore.Column;
 import io.trino.spi.connector.ColumnHandle;
@@ -254,7 +255,7 @@ public String toString()
 
     public Column toMetastoreColumn()
     {
-        return new Column(name, getHiveType(), comment);
+        return new Column(name, getHiveType(), comment, ImmutableMap.of());
     }
 
     public static HiveColumnHandle mergeRowIdColumnHandle()

plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java

@@ -1398,7 +1398,7 @@ private static Table buildTableObject(
             HiveType type = columnHandle.getHiveType();
             if (!partitionColumnNames.contains(name)) {
                 verify(!columnHandle.isPartitionKey(), "Column handles are not consistent with partitioned by property");
-                columns.add(new Column(name, type, columnHandle.getComment()));
+                columns.add(new Column(name, type, columnHandle.getComment(), ImmutableMap.of()));
             }
             else {
                 verify(columnHandle.isPartitionKey(), "Column handles are not consistent with partitioned by property");
@@ -2664,7 +2664,7 @@ public void createView(ConnectorSession session, SchemaTableName viewName, Conne
                 .put(PRESTO_QUERY_ID_NAME, session.getQueryId())
                 .buildOrThrow();
 
-        Column dummyColumn = new Column("dummy", HIVE_STRING, Optional.empty());
+        Column dummyColumn = new Column("dummy", HIVE_STRING, Optional.empty(), ImmutableMap.of());
 
         Table.Builder tableBuilder = Table.builder()
                 .setDatabaseName(viewName.getSchemaName())
@@ -3671,7 +3671,7 @@ private static void validateBucketColumns(ConnectorTableMetadata tableMetadata)
         }
 
         List<Column> dataColumns = tableMetadata.getColumns().stream()
-                .map(columnMetadata -> new Column(columnMetadata.getName(), toHiveType(columnMetadata.getType()), Optional.ofNullable(columnMetadata.getComment())))
+                .map(columnMetadata -> new Column(columnMetadata.getName(), toHiveType(columnMetadata.getType()), Optional.ofNullable(columnMetadata.getComment()), ImmutableMap.of()))
                 .collect(toImmutableList());
         if (!isSupportedBucketing(bucketProperty.get(), dataColumns, tableMetadata.getTable().getTableName())) {
             throw new TrinoException(NOT_SUPPORTED, "Cannot create a table bucketed on an unsupported type");

plugin/trino-hive/src/main/java/io/trino/plugin/hive/TrinoViewHiveMetastore.java

@@ -73,7 +73,7 @@ public void createView(ConnectorSession session, SchemaTableName schemaViewName,
                 .setTableName(schemaViewName.getTableName())
                 .setOwner(isUsingSystemSecurity ? Optional.empty() : Optional.of(session.getUser()))
                 .setTableType(VIRTUAL_VIEW.name())
-                .setDataColumns(ImmutableList.of(new Column("dummy", HIVE_STRING, Optional.empty())))
+                .setDataColumns(ImmutableList.of(new Column("dummy", HIVE_STRING, Optional.empty(), Map.of())))
                 .setPartitionColumns(ImmutableList.of())
                 .setParameters(createViewProperties(session, trinoVersion, connectorName))
                 .setViewOriginalText(Optional.of(encodeViewData(definition)))

plugin/trino-hive/src/main/java/io/trino/plugin/hive/ViewReaderUtil.java

@@ -110,7 +110,7 @@ private static CoralTableRedirectionResolver coralTableRedirectionResolver(
                             format("%s is redirected to %s, but that relation cannot be found", schemaTableName, target)));
             List<Column> columns = tableSchema.getColumns().stream()
                     .filter(columnSchema -> !columnSchema.isHidden())
-                    .map(columnSchema -> new Column(columnSchema.getName(), toHiveType(columnSchema.getType()), Optional.empty() /* comment */))
+                    .map(columnSchema -> new Column(columnSchema.getName(), toHiveType(columnSchema.getType()), Optional.empty() /* comment */, Map.of()))
                     .collect(toImmutableList());
             Table table = Table.builder()
                     .setDatabaseName(schemaTableName.getSchemaName())

plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/Column.java

@@ -34,15 +34,6 @@ public class Column
     private final Optional<String> comment;
     private final Map<String, String> properties;
 
-    @Deprecated
-    public Column(
-            String name,
-            HiveType type,
-            Optional<String> comment)
-    {
-        this(name, type, comment, ImmutableMap.of());
-    }
-
     @JsonCreator
     public Column(
             @JsonProperty("name") String name,

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

@@ -778,7 +778,7 @@ public void addColumn(String databaseName, String tableName, String columnName,
     {
         Table oldTable = getExistingTable(databaseName, tableName);
         Table newTable = Table.builder(oldTable)
-                .addDataColumn(new Column(columnName, columnType, Optional.ofNullable(columnComment)))
+                .addDataColumn(new Column(columnName, columnType, Optional.ofNullable(columnComment), ImmutableMap.of()))
                 .build();
         replaceTable(databaseName, tableName, newTable, null);
     }
@@ -794,7 +794,7 @@ public void renameColumn(String databaseName, String tableName, String oldColumn
         ImmutableList.Builder<Column> newDataColumns = ImmutableList.builder();
         for (Column column : oldTable.getDataColumns()) {
             if (column.getName().equals(oldColumnName)) {
-                newDataColumns.add(new Column(newColumnName, column.getType(), column.getComment()));
+                newDataColumns.add(new Column(newColumnName, column.getType(), column.getComment(), column.getProperties()));
             }
             else {
                 newDataColumns.add(column);

plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/thrift/ThriftMetastoreUtil.java

@@ -686,7 +686,7 @@ public static FieldSchema toMetastoreApiFieldSchema(Column column)
 
     private static Column fromMetastoreApiFieldSchema(FieldSchema fieldSchema)
     {
-        return new Column(fieldSchema.getName(), HiveType.valueOf(fieldSchema.getType().toLowerCase(ENGLISH)), Optional.ofNullable(fieldSchema.getComment()));
+        return new Column(fieldSchema.getName(), HiveType.valueOf(fieldSchema.getType().toLowerCase(ENGLISH)), Optional.ofNullable(fieldSchema.getComment()), ImmutableMap.of());
     }
 
     private static void fromMetastoreApiStorageDescriptor(