Skip to content

Simplify MySqlClient.toColumnMapping #11210

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
findepi merged 1 commit into from
Feb 28, 2022
Merged

Simplify MySqlClient.toColumnMapping #11210

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
41 changes: 12 additions & 29 deletions plugin/trino-mysql/src/main/java/io/trino/plugin/mysql/MySqlClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
import static java.lang.Math.max;
import static java.lang.Math.min;
import static java.lang.String.format;
import static java.util.Locale.ENGLISH;
import static java.util.stream.Collectors.joining;

public class MySqlClient
Expand Down Expand Up @@ -283,13 +284,18 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
if (mapping.isPresent()) {
return mapping;
}
Optional<ColumnMapping> unsignedMapping = getUnsignedMapping(typeHandle);
if (unsignedMapping.isPresent()) {
return unsignedMapping;
}

if (jdbcTypeName.equalsIgnoreCase("json")) {
return Optional.of(jsonColumnMapping());
switch (jdbcTypeName.toLowerCase(ENGLISH)) {
case "tinyint unsigned":
return Optional.of(smallintColumnMapping());
case "smallint unsigned":
return Optional.of(integerColumnMapping());
case "int unsigned":
return Optional.of(bigintColumnMapping());
case "bigint unsigned":
return Optional.of(decimalColumnMapping(createDecimalType(20)));
case "json":
return Optional.of(jsonColumnMapping());
}

switch (typeHandle.getJdbcType()) {
Expand Down Expand Up @@ -663,27 +669,4 @@ private static boolean isGtidMode(Connection connection)
throw new TrinoException(JDBC_ERROR, e);
}
}

private static Optional<ColumnMapping> getUnsignedMapping(JdbcTypeHandle typeHandle)
{
if (typeHandle.getJdbcTypeName().isEmpty()) {
return Optional.empty();
}

String typeName = typeHandle.getJdbcTypeName().get();
if (typeName.equalsIgnoreCase("tinyint unsigned")) {
return Optional.of(smallintColumnMapping());
}
if (typeName.equalsIgnoreCase("smallint unsigned")) {
return Optional.of(integerColumnMapping());
}
if (typeName.equalsIgnoreCase("int unsigned")) {
return Optional.of(bigintColumnMapping());
}
if (typeName.equalsIgnoreCase("bigint unsigned")) {
return Optional.of(decimalColumnMapping(createDecimalType(20)));
}

return Optional.empty();
}
}