Skip to content

Commit 18b4486

Browse files
committed
Move method to GlueInputConverter
1 parent f15df0a commit 18b4486

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@
155155
import static io.trino.plugin.hive.metastore.MetastoreUtil.verifyCanDropColumn;
156156
import static io.trino.plugin.hive.metastore.glue.v1.AwsSdkUtil.getPaginatedResults;
157157
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueInputConverter.convertFunction;
158+
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueInputConverter.convertGlueTableToTableInput;
158159
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueInputConverter.convertPartition;
159160
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueToTrinoConverter.getTableParameters;
160161
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueToTrinoConverter.getTableType;
161-
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueToTrinoConverter.getTableTypeNullable;
162162
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueToTrinoConverter.mappedCopy;
163163
import static io.trino.plugin.hive.util.HiveUtil.escapeSchemaName;
164164
import static io.trino.spi.StandardErrorCode.ALREADY_EXISTS;
@@ -510,7 +510,7 @@ public void renameTable(String databaseName, String tableName, String newDatabas
510510
GetTableRequest getTableRequest = new GetTableRequest().withDatabaseName(databaseName)
511511
.withName(tableName);
512512
GetTableResult glueTable = glueClient.getTable(getTableRequest);
513-
TableInput tableInput = convertGlueTableToTableInput(glueTable.getTable(), newTableName);
513+
TableInput tableInput = convertGlueTableToTableInput(glueTable.getTable()).withName(newTableName);
514514
CreateTableRequest createTableRequest = new CreateTableRequest()
515515
.withDatabaseName(newDatabaseName)
516516
.withTableInput(tableInput);
@@ -533,24 +533,6 @@ public void renameTable(String databaseName, String tableName, String newDatabas
533533
}
534534
}
535535

536-
private static TableInput convertGlueTableToTableInput(com.amazonaws.services.glue.model.Table glueTable, String newTableName)
537-
{
538-
return new TableInput()
539-
.withName(newTableName)
540-
.withDescription(glueTable.getDescription())
541-
.withOwner(glueTable.getOwner())
542-
.withLastAccessTime(glueTable.getLastAccessTime())
543-
.withLastAnalyzedTime(glueTable.getLastAnalyzedTime())
544-
.withRetention(glueTable.getRetention())
545-
.withStorageDescriptor(glueTable.getStorageDescriptor())
546-
.withPartitionKeys(glueTable.getPartitionKeys())
547-
.withViewOriginalText(glueTable.getViewOriginalText())
548-
.withViewExpandedText(glueTable.getViewExpandedText())
549-
.withTableType(getTableTypeNullable(glueTable))
550-
.withTargetTable(glueTable.getTargetTable())
551-
.withParameters(getTableParameters(glueTable));
552-
}
553-
554536
@Override
555537
public void commentTable(String databaseName, String tableName, Optional<String> comment)
556538
{

plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/glue/v1/converter/GlueInputConverter.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
import static io.trino.plugin.hive.metastore.MetastoreUtil.metastoreFunctionName;
4949
import static io.trino.plugin.hive.metastore.MetastoreUtil.toResourceUris;
5050
import static io.trino.plugin.hive.metastore.MetastoreUtil.updateStatisticsParameters;
51+
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueToTrinoConverter.getTableParameters;
52+
import static io.trino.plugin.hive.metastore.glue.v1.converter.GlueToTrinoConverter.getTableTypeNullable;
5153

5254
public final class GlueInputConverter
5355
{
@@ -89,6 +91,24 @@ public static TableInput convertTable(Table table)
8991
return input;
9092
}
9193

94+
public static TableInput convertGlueTableToTableInput(com.amazonaws.services.glue.model.Table glueTable)
95+
{
96+
return new TableInput()
97+
.withName(glueTable.getName())
98+
.withDescription(glueTable.getDescription())
99+
.withOwner(glueTable.getOwner())
100+
.withLastAccessTime(glueTable.getLastAccessTime())
101+
.withLastAnalyzedTime(glueTable.getLastAnalyzedTime())
102+
.withRetention(glueTable.getRetention())
103+
.withStorageDescriptor(glueTable.getStorageDescriptor())
104+
.withPartitionKeys(glueTable.getPartitionKeys())
105+
.withViewOriginalText(glueTable.getViewOriginalText())
106+
.withViewExpandedText(glueTable.getViewExpandedText())
107+
.withTableType(getTableTypeNullable(glueTable))
108+
.withTargetTable(glueTable.getTargetTable())
109+
.withParameters(getTableParameters(glueTable));
110+
}
111+
92112
public static PartitionInput convertPartition(PartitionWithStatistics partitionWithStatistics)
93113
{
94114
PartitionInput input = convertPartition(partitionWithStatistics.getPartition());

0 commit comments

Comments
 (0)