From a64ffc2fb18205eeb49a58c27f72fa2c879c714a Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Sat, 13 Jan 2024 12:10:39 +0900 Subject: [PATCH] Remove deprecated createTableSql method from BaseJdbcClient --- .../main/java/io/trino/plugin/jdbc/BaseJdbcClient.java | 8 +------- .../java/io/trino/plugin/clickhouse/ClickHouseClient.java | 4 ++-- .../main/java/io/trino/plugin/mariadb/MariaDbClient.java | 5 +++-- .../src/main/java/io/trino/plugin/mysql/MySqlClient.java | 4 ++-- .../java/io/trino/plugin/sqlserver/SqlServerClient.java | 6 +++--- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java index 42d6731d52cc..4114798297f5 100644 --- a/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java +++ b/plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/BaseJdbcClient.java @@ -728,18 +728,12 @@ protected JdbcOutputTableHandle createTable( } protected List createTableSqls(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) - { - return ImmutableList.of(createTableSql(remoteTableName, columns, tableMetadata)); - } - - @Deprecated - protected String createTableSql(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) { if (tableMetadata.getComment().isPresent()) { throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with table comment"); } checkArgument(tableMetadata.getProperties().isEmpty(), "Unsupported table properties: %s", tableMetadata.getProperties()); - return format("CREATE TABLE %s (%s)", quoted(remoteTableName), join(", ", columns)); + return ImmutableList.of(format("CREATE TABLE %s (%s)", quoted(remoteTableName), join(", ", columns))); } protected String getColumnDefinitionSql(ConnectorSession session, ColumnMetadata column, String columnName) diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java index fb50bcc386b7..42143e1827b0 100644 --- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java +++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java @@ -332,7 +332,7 @@ public Optional getTableComment(ResultSet resultSet) } @Override - protected String createTableSql(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) + protected List createTableSqls(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) { ImmutableList.Builder tableOptions = ImmutableList.builder(); Map tableProperties = tableMetadata.getProperties(); @@ -349,7 +349,7 @@ protected String createTableSql(RemoteTableName remoteTableName, List co ClickHouseTableProperties.getSampleBy(tableProperties).ifPresent(value -> tableOptions.add("SAMPLE BY " + quoted(value))); tableMetadata.getComment().ifPresent(comment -> tableOptions.add(format("COMMENT %s", clickhouseVarcharLiteral(comment)))); - return format("CREATE TABLE %s (%s) %s", quoted(remoteTableName), join(", ", columns), join(" ", tableOptions.build())); + return ImmutableList.of(format("CREATE TABLE %s (%s) %s", quoted(remoteTableName), join(", ", columns), join(" ", tableOptions.build()))); } @Override diff --git a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java index 18b6e2ec02b5..a58a6029506e 100644 --- a/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java +++ b/plugin/trino-mariadb/src/main/java/io/trino/plugin/mariadb/MariaDbClient.java @@ -13,6 +13,7 @@ */ package io.trino.plugin.mariadb; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; @@ -549,10 +550,10 @@ protected void copyTableSchema(ConnectorSession session, Connection connection, } @Override - protected String createTableSql(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) + protected List createTableSqls(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) { checkArgument(tableMetadata.getProperties().isEmpty(), "Unsupported table properties: %s", tableMetadata.getProperties()); - return format("CREATE TABLE %s (%s) COMMENT %s", quoted(remoteTableName), join(", ", columns), mariaDbVarcharLiteral(tableMetadata.getComment().orElse(NO_COMMENT))); + return ImmutableList.of(format("CREATE TABLE %s (%s) COMMENT %s", quoted(remoteTableName), join(", ", columns), mariaDbVarcharLiteral(tableMetadata.getComment().orElse(NO_COMMENT)))); } private static String mariaDbVarcharLiteral(String value) diff --git a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java index 241ffd0cf051..14d86597eaf2 100644 --- a/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java +++ b/plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java @@ -458,10 +458,10 @@ protected String getTableSchemaName(ResultSet resultSet) } @Override - protected String createTableSql(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) + protected List createTableSqls(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) { checkArgument(tableMetadata.getProperties().isEmpty(), "Unsupported table properties: %s", tableMetadata.getProperties()); - return format("CREATE TABLE %s (%s) COMMENT %s", quoted(remoteTableName), join(", ", columns), mysqlVarcharLiteral(tableMetadata.getComment().orElse(NO_COMMENT))); + return ImmutableList.of(format("CREATE TABLE %s (%s) COMMENT %s", quoted(remoteTableName), join(", ", columns), mysqlVarcharLiteral(tableMetadata.getComment().orElse(NO_COMMENT)))); } // This is overridden to pass NULL to MySQL for TIMESTAMP column types diff --git a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java index a148e184ce72..50a323a0a980 100644 --- a/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java +++ b/plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java @@ -1145,18 +1145,18 @@ private boolean isCaseSensitiveVarchar(JdbcColumnHandle columnHandle) } @Override - protected String createTableSql(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) + protected List createTableSqls(RemoteTableName remoteTableName, List columns, ConnectorTableMetadata tableMetadata) { if (tableMetadata.getComment().isPresent()) { throw new TrinoException(NOT_SUPPORTED, "This connector does not support creating tables with table comment"); } - return format( + return ImmutableList.of(format( "CREATE TABLE %s (%s) %s", quoted(remoteTableName), join(", ", columns), getDataCompression(tableMetadata.getProperties()) .map(dataCompression -> format("WITH (DATA_COMPRESSION = %s)", dataCompression)) - .orElse("")); + .orElse(""))); } @Override