Skip to content

Commit 50a7742

Browse files
infvgpratyakshsharma
infvg
and
pratyakshsharma
committed
Add write mapping
Co-authored-by: pratyakshsharma <[email protected]>
1 parent 65b832b commit 50a7742

File tree

29 files changed

+1065
-556
lines changed

29 files changed

+1065
-556
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ test-reports/
1818
.DS_Store
1919
.classpath
2020
.settings
21+
.java-version
2122
.project
2223
temp-testng-customsuite.xml
2324
test-output

‎presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/BaseJdbcClient.java

Lines changed: 68 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
import com.facebook.presto.common.type.Type;
2121
import com.facebook.presto.common.type.UuidType;
2222
import com.facebook.presto.common.type.VarcharType;
23+
import com.facebook.presto.plugin.jdbc.mapping.ColumnMapping;
24+
import com.facebook.presto.plugin.jdbc.mapping.WriteMapping;
25+
import com.facebook.presto.plugin.jdbc.mapping.functions.BooleanWriteFunction;
26+
import com.facebook.presto.plugin.jdbc.mapping.functions.DoubleWriteFunction;
27+
import com.facebook.presto.plugin.jdbc.mapping.functions.LongWriteFunction;
28+
import com.facebook.presto.plugin.jdbc.mapping.functions.SliceWriteFunction;
2329
import com.facebook.presto.spi.ColumnHandle;
2430
import com.facebook.presto.spi.ColumnMetadata;
2531
import com.facebook.presto.spi.ConnectorSession;
@@ -70,7 +76,25 @@
7076
import static com.facebook.presto.common.type.VarbinaryType.VARBINARY;
7177
import static com.facebook.presto.common.type.Varchars.isVarcharType;
7278
import static com.facebook.presto.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
73-
import static com.facebook.presto.plugin.jdbc.StandardReadMappings.jdbcTypeToPrestoType;
79+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.bigintColumnMapping;
80+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.booleanColumnMapping;
81+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.charColumnMapping;
82+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.dateColumnMapping;
83+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.decimalColumnMapping;
84+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.doubleColumnMapping;
85+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.integerColumnMapping;
86+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.jdbcTypeToPrestoType;
87+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.realColumnMapping;
88+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.smallintColumnMapping;
89+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.timeColumnMapping;
90+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.timestampColumnMapping;
91+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.tinyintColumnMapping;
92+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.uuidColumnMapping;
93+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.varbinaryColumnMapping;
94+
import static com.facebook.presto.plugin.jdbc.mapping.StandardColumnMappings.varcharColumnMapping;
95+
import static com.facebook.presto.plugin.jdbc.mapping.WriteMapping.booleanMapping;
96+
import static com.facebook.presto.plugin.jdbc.mapping.WriteMapping.longMapping;
97+
import static com.facebook.presto.plugin.jdbc.mapping.WriteMapping.sliceMapping;
7498
import static com.facebook.presto.spi.StandardErrorCode.NOT_FOUND;
7599
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
76100
import static com.google.common.base.MoreObjects.firstNonNull;
@@ -94,21 +118,21 @@ public class BaseJdbcClient
94118
{
95119
private static final Logger log = Logger.get(BaseJdbcClient.class);
96120

97-
private static final Map<Type, String> SQL_TYPES = ImmutableMap.<Type, String>builder()
98-
.put(BOOLEAN, "boolean")
99-
.put(BIGINT, "bigint")
100-
.put(INTEGER, "integer")
101-
.put(SMALLINT, "smallint")
102-
.put(TINYINT, "tinyint")
103-
.put(DOUBLE, "double precision")
104-
.put(REAL, "real")
105-
.put(VARBINARY, "varbinary")
106-
.put(DATE, "date")
107-
.put(TIME, "time")
108-
.put(TIME_WITH_TIME_ZONE, "time with timezone")
109-
.put(TIMESTAMP, "timestamp")
110-
.put(TIMESTAMP_WITH_TIME_ZONE, "timestamp with timezone")
111-
.put(UuidType.UUID, "uuid")
121+
private static final Map<Type, WriteMapping> TYPE_MAPPINGS = ImmutableMap.<Type, WriteMapping>builder()
122+
.put(BOOLEAN, booleanMapping("boolean", (BooleanWriteFunction) booleanColumnMapping().getWriteFunction()))
123+
.put(BIGINT, longMapping("bigint", (LongWriteFunction) bigintColumnMapping().getWriteFunction()))
124+
.put(INTEGER, longMapping("integer", (LongWriteFunction) integerColumnMapping().getWriteFunction()))
125+
.put(SMALLINT, longMapping("smallint", (LongWriteFunction) smallintColumnMapping().getWriteFunction()))
126+
.put(TINYINT, longMapping("tinyint", (LongWriteFunction) tinyintColumnMapping().getWriteFunction()))
127+
.put(DOUBLE, WriteMapping.doubleMapping("double precision", (DoubleWriteFunction) doubleColumnMapping().getWriteFunction()))
128+
.put(REAL, longMapping("real", (LongWriteFunction) realColumnMapping().getWriteFunction()))
129+
.put(VARBINARY, sliceMapping("varbinary", (SliceWriteFunction) varbinaryColumnMapping().getWriteFunction()))
130+
.put(DATE, longMapping("date", (LongWriteFunction) dateColumnMapping().getWriteFunction()))
131+
.put(TIME, longMapping("time", (LongWriteFunction) timeColumnMapping().getWriteFunction()))
132+
.put(TIMESTAMP, longMapping("timestamp", (LongWriteFunction) timestampColumnMapping().getWriteFunction()))
133+
.put(TIME_WITH_TIME_ZONE, longMapping("time with timezone", null))
134+
.put(TIMESTAMP_WITH_TIME_ZONE, longMapping("timestamp with timezone", null))
135+
.put(UuidType.UUID, sliceMapping("uuid", (SliceWriteFunction) uuidColumnMapping().getWriteFunction()))
112136
.build();
113137

114138
protected final String connectorId;
@@ -241,7 +265,7 @@ public List<JdbcColumnHandle> getColumns(ConnectorSession session, JdbcTableHand
241265
resultSet.getString("TYPE_NAME"),
242266
resultSet.getInt("COLUMN_SIZE"),
243267
resultSet.getInt("DECIMAL_DIGITS"));
244-
Optional<ReadMapping> columnMapping = toPrestoType(session, typeHandle);
268+
Optional<ColumnMapping> columnMapping = toPrestoType(session, typeHandle);
245269
// skip unsupported column types
246270
if (columnMapping.isPresent()) {
247271
String columnName = resultSet.getString("COLUMN_NAME");
@@ -267,7 +291,7 @@ public List<JdbcColumnHandle> getColumns(ConnectorSession session, JdbcTableHand
267291
}
268292

269293
@Override
270-
public Optional<ReadMapping> toPrestoType(ConnectorSession session, JdbcTypeHandle typeHandle)
294+
public Optional<ColumnMapping> toPrestoType(ConnectorSession session, JdbcTypeHandle typeHandle)
271295
{
272296
return jdbcTypeToPrestoType(typeHandle);
273297
}
@@ -403,7 +427,7 @@ private String getColumnString(ColumnMetadata column, String columnName)
403427
StringBuilder sb = new StringBuilder()
404428
.append(quoted(columnName))
405429
.append(" ")
406-
.append(toSqlType(column.getType()));
430+
.append(toWriteMapping(column.getType()));
407431
if (!column.isNullable()) {
408432
sb.append(" NOT NULL");
409433
}
@@ -737,28 +761,42 @@ protected void execute(Connection connection, String query)
737761
}
738762
}
739763

740-
protected String toSqlType(Type type)
764+
public WriteMapping toWriteMapping(Type type)
741765
{
766+
String dataType;
742767
if (isVarcharType(type)) {
743768
VarcharType varcharType = (VarcharType) type;
744769
if (varcharType.isUnbounded()) {
745-
return "varchar";
770+
dataType = "varchar";
746771
}
747-
return "varchar(" + varcharType.getLengthSafe() + ")";
772+
else {
773+
dataType = "varchar(" + varcharType.getLengthSafe() + ")";
774+
}
775+
return sliceMapping(dataType, (SliceWriteFunction) varcharColumnMapping(varcharType).getWriteFunction());
748776
}
749777
if (type instanceof CharType) {
750-
if (((CharType) type).getLength() == CharType.MAX_LENGTH) {
751-
return "char";
778+
CharType charType = (CharType) type;
779+
if (charType.getLength() == CharType.MAX_LENGTH) {
780+
dataType = "char";
781+
}
782+
else {
783+
dataType = "char(" + ((CharType) type).getLength() + ")";
752784
}
753-
return "char(" + ((CharType) type).getLength() + ")";
785+
return sliceMapping(dataType, (SliceWriteFunction) charColumnMapping(charType).getWriteFunction());
754786
}
755787
if (type instanceof DecimalType) {
756-
return format("decimal(%s, %s)", ((DecimalType) type).getPrecision(), ((DecimalType) type).getScale());
788+
DecimalType decimalType = (DecimalType) type;
789+
dataType = format("decimal(%s, %s)", ((DecimalType) type).getPrecision(), ((DecimalType) type).getScale());
790+
if (decimalType.isShort()) {
791+
return WriteMapping.longMapping(dataType, (LongWriteFunction) decimalColumnMapping(decimalType).getWriteFunction());
792+
}
793+
else {
794+
return WriteMapping.sliceMapping(dataType, (SliceWriteFunction) decimalColumnMapping(decimalType).getWriteFunction());
795+
}
757796
}
758-
759-
String sqlType = SQL_TYPES.get(type);
760-
if (sqlType != null) {
761-
return sqlType;
797+
WriteMapping writeMapping = TYPE_MAPPINGS.get(type);
798+
if (writeMapping != null) {
799+
return writeMapping;
762800
}
763801
throw new PrestoException(NOT_SUPPORTED, "Unsupported column type: " + type.getDisplayName());
764802
}

‎presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcClient.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
package com.facebook.presto.plugin.jdbc;
1515

1616
import com.facebook.presto.common.predicate.TupleDomain;
17+
import com.facebook.presto.common.type.Type;
18+
import com.facebook.presto.plugin.jdbc.mapping.ColumnMapping;
19+
import com.facebook.presto.plugin.jdbc.mapping.WriteMapping;
1720
import com.facebook.presto.spi.ColumnHandle;
1821
import com.facebook.presto.spi.ColumnMetadata;
1922
import com.facebook.presto.spi.ConnectorSession;
@@ -49,7 +52,9 @@ default boolean schemaExists(ConnectorSession session, JdbcIdentity identity, St
4952

5053
List<JdbcColumnHandle> getColumns(ConnectorSession session, JdbcTableHandle tableHandle);
5154

52-
Optional<ReadMapping> toPrestoType(ConnectorSession session, JdbcTypeHandle typeHandle);
55+
Optional<ColumnMapping> toPrestoType(ConnectorSession session, JdbcTypeHandle typeHandle);
56+
57+
WriteMapping toWriteMapping(Type type);
5358

5459
ConnectorSplitSource getSplits(ConnectorSession session, JdbcIdentity identity, JdbcTableLayoutHandle layoutHandle);
5560

‎presto-base-jdbc/src/main/java/com/facebook/presto/plugin/jdbc/JdbcPageSink.java

Lines changed: 27 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,33 @@
1616
import com.facebook.airlift.log.Logger;
1717
import com.facebook.presto.common.Page;
1818
import com.facebook.presto.common.block.Block;
19-
import com.facebook.presto.common.type.DecimalType;
20-
import com.facebook.presto.common.type.TimestampType;
2119
import com.facebook.presto.common.type.Type;
22-
import com.facebook.presto.common.type.UuidType;
20+
import com.facebook.presto.plugin.jdbc.mapping.WriteFunction;
21+
import com.facebook.presto.plugin.jdbc.mapping.functions.BooleanWriteFunction;
22+
import com.facebook.presto.plugin.jdbc.mapping.functions.DoubleWriteFunction;
23+
import com.facebook.presto.plugin.jdbc.mapping.functions.LongWriteFunction;
24+
import com.facebook.presto.plugin.jdbc.mapping.functions.ObjectWriteFunction;
25+
import com.facebook.presto.plugin.jdbc.mapping.functions.SliceWriteFunction;
2326
import com.facebook.presto.spi.ConnectorPageSink;
2427
import com.facebook.presto.spi.ConnectorSession;
2528
import com.facebook.presto.spi.PrestoException;
2629
import com.google.common.collect.ImmutableList;
27-
import com.google.common.primitives.Shorts;
28-
import com.google.common.primitives.SignedBytes;
2930
import io.airlift.slice.Slice;
30-
import org.joda.time.DateTimeZone;
3131

3232
import java.sql.Connection;
33-
import java.sql.Date;
3433
import java.sql.PreparedStatement;
3534
import java.sql.SQLException;
3635
import java.sql.SQLNonTransientException;
37-
import java.sql.Timestamp;
38-
import java.time.Instant;
3936
import java.util.Collection;
4037
import java.util.List;
4138
import java.util.concurrent.CompletableFuture;
4239

43-
import static com.facebook.presto.common.type.BigintType.BIGINT;
44-
import static com.facebook.presto.common.type.BooleanType.BOOLEAN;
45-
import static com.facebook.presto.common.type.Chars.isCharType;
46-
import static com.facebook.presto.common.type.DateType.DATE;
47-
import static com.facebook.presto.common.type.Decimals.readBigDecimal;
48-
import static com.facebook.presto.common.type.DoubleType.DOUBLE;
49-
import static com.facebook.presto.common.type.IntegerType.INTEGER;
50-
import static com.facebook.presto.common.type.RealType.REAL;
51-
import static com.facebook.presto.common.type.SmallintType.SMALLINT;
52-
import static com.facebook.presto.common.type.TinyintType.TINYINT;
53-
import static com.facebook.presto.common.type.UuidType.prestoUuidToJavaUuid;
54-
import static com.facebook.presto.common.type.VarbinaryType.VARBINARY;
55-
import static com.facebook.presto.common.type.Varchars.isVarcharType;
5640
import static com.facebook.presto.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
5741
import static com.facebook.presto.plugin.jdbc.JdbcErrorCode.JDBC_NON_TRANSIENT_ERROR;
58-
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
59-
import static java.lang.Float.intBitsToFloat;
60-
import static java.lang.Math.toIntExact;
42+
import static com.google.common.base.Verify.verify;
43+
import static com.google.common.collect.ImmutableList.toImmutableList;
44+
import static java.lang.String.format;
6145
import static java.util.concurrent.CompletableFuture.completedFuture;
62-
import static java.util.concurrent.TimeUnit.DAYS;
63-
import static org.joda.time.chrono.ISOChronology.getInstanceUTC;
6446

6547
public class JdbcPageSink
6648
implements ConnectorPageSink
@@ -71,6 +53,7 @@ public class JdbcPageSink
7153
private final PreparedStatement statement;
7254

7355
private final List<Type> columnTypes;
56+
private final List<WriteFunction> columnWriters;
7457
private int batchSize;
7558

7659
public JdbcPageSink(ConnectorSession session, JdbcOutputTableHandle handle, JdbcClient jdbcClient)
@@ -92,6 +75,12 @@ public JdbcPageSink(ConnectorSession session, JdbcOutputTableHandle handle, Jdbc
9275
}
9376

9477
columnTypes = handle.getColumnTypes();
78+
columnWriters = columnTypes.stream().map(type -> {
79+
WriteFunction writeFunction = jdbcClient.toWriteMapping(type).getWriteFunction();
80+
verify(type.getJavaType() == writeFunction.getJavaType(),
81+
format("Presto type %s is not compatible with write function %s accepting %s", type, writeFunction, writeFunction.getJavaType()));
82+
return writeFunction;
83+
}).collect(toImmutableList());
9584
}
9685

9786
@Override
@@ -132,55 +121,22 @@ private void appendColumn(Page page, int position, int channel)
132121
}
133122

134123
Type type = columnTypes.get(channel);
135-
if (BOOLEAN.equals(type)) {
136-
statement.setBoolean(parameter, type.getBoolean(block, position));
124+
Class<?> javaType = type.getJavaType();
125+
WriteFunction writeFunction = columnWriters.get(channel);
126+
if (javaType == boolean.class) {
127+
((BooleanWriteFunction) writeFunction).set(statement, parameter, type.getBoolean(block, position));
137128
}
138-
else if (BIGINT.equals(type)) {
139-
statement.setLong(parameter, type.getLong(block, position));
129+
else if (javaType == long.class) {
130+
((LongWriteFunction) writeFunction).set(statement, parameter, type.getLong(block, position));
140131
}
141-
else if (INTEGER.equals(type)) {
142-
statement.setInt(parameter, toIntExact(type.getLong(block, position)));
132+
else if (javaType == double.class) {
133+
((DoubleWriteFunction) writeFunction).set(statement, parameter, type.getDouble(block, position));
143134
}
144-
else if (SMALLINT.equals(type)) {
145-
statement.setShort(parameter, Shorts.checkedCast(type.getLong(block, position)));
146-
}
147-
else if (TINYINT.equals(type)) {
148-
statement.setByte(parameter, SignedBytes.checkedCast(type.getLong(block, position)));
149-
}
150-
else if (DOUBLE.equals(type)) {
151-
statement.setDouble(parameter, type.getDouble(block, position));
152-
}
153-
else if (REAL.equals(type)) {
154-
statement.setFloat(parameter, intBitsToFloat(toIntExact(type.getLong(block, position))));
155-
}
156-
else if (type instanceof DecimalType) {
157-
statement.setBigDecimal(parameter, readBigDecimal((DecimalType) type, block, position));
158-
}
159-
else if (isVarcharType(type) || isCharType(type)) {
160-
statement.setString(parameter, type.getSlice(block, position).toStringUtf8());
161-
}
162-
else if (VARBINARY.equals(type)) {
163-
statement.setBytes(parameter, type.getSlice(block, position).getBytes());
164-
}
165-
else if (DATE.equals(type)) {
166-
// convert to midnight in default time zone
167-
long utcMillis = DAYS.toMillis(type.getLong(block, position));
168-
long localMillis = getInstanceUTC().getZone().getMillisKeepLocal(DateTimeZone.getDefault(), utcMillis);
169-
statement.setDate(parameter, new Date(localMillis));
170-
}
171-
else if (type instanceof TimestampType) {
172-
long timestampValue = type.getLong(block, position);
173-
statement.setTimestamp(parameter,
174-
Timestamp.from(Instant.ofEpochSecond(
175-
((TimestampType) type).getEpochSecond(timestampValue),
176-
((TimestampType) type).getNanos(timestampValue))));
177-
}
178-
else if (UuidType.UUID.equals(type)) {
179-
Slice slice = type.getSlice(block, position);
180-
statement.setObject(parameter, prestoUuidToJavaUuid(slice));
135+
else if (javaType == Slice.class) {
136+
((SliceWriteFunction) writeFunction).set(statement, parameter, type.getSlice(block, position));
181137
}
182138
else {
183-
throw new PrestoException(NOT_SUPPORTED, "Unsupported column type: " + type.getDisplayName());
139+
((ObjectWriteFunction) writeFunction).set(statement, parameter, type.getObject(block, position));
184140
}
185141
}
186142

0 commit comments

Comments
 (0)