Skip to content

Commit bb674b0

Browse files
Mariamalmesferpratyakshsharmaagrawalreetika
authored and
Mariam-Almesfer
committed
Add support for geometry type in mysql connector
Co-authored-by: pratyakshsharma <pratyaksh13@gmail.com>3@gmail.com> Co-authored-by: agrawalreetika <agrawal.reetika786@gmail.com>
1 parent e936ad0 commit bb674b0

5 files changed

Lines changed: 175 additions & 15 deletions

File tree

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

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.facebook.presto.spi.ConnectorSession;
3737
import com.google.common.base.Joiner;
3838
import com.google.common.collect.ImmutableList;
39+
import com.google.common.collect.ImmutableMap;
3940
import io.airlift.slice.Slice;
4041
import org.joda.time.DateTimeZone;
4142

@@ -47,6 +48,7 @@
4748
import java.sql.Timestamp;
4849
import java.util.ArrayList;
4950
import java.util.List;
51+
import java.util.Map;
5052
import java.util.Optional;
5153

5254
import static com.facebook.presto.common.type.DateTimeEncoding.unpackMillisUtc;
@@ -55,6 +57,7 @@
5557
import static com.google.common.base.Strings.isNullOrEmpty;
5658
import static com.google.common.collect.Iterables.getOnlyElement;
5759
import static java.lang.Float.intBitsToFloat;
60+
import static java.lang.String.format;
5861
import static java.util.Collections.nCopies;
5962
import static java.util.Objects.requireNonNull;
6063
import static java.util.concurrent.TimeUnit.DAYS;
@@ -104,22 +107,15 @@ public PreparedStatement buildSql(
104107
String schema,
105108
String table,
106109
List<JdbcColumnHandle> columns,
110+
Map<String, String> columnExpressions,
107111
TupleDomain<ColumnHandle> tupleDomain,
108112
Optional<JdbcExpression> additionalPredicate)
109113
throws SQLException
110114
{
111115
StringBuilder sql = new StringBuilder();
112116

113-
String columnNames = columns.stream()
114-
.map(JdbcColumnHandle::getColumnName)
115-
.map(this::quote)
116-
.collect(joining(", "));
117-
118117
sql.append("SELECT ");
119-
sql.append(columnNames);
120-
if (columns.isEmpty()) {
121-
sql.append("null");
122-
}
118+
sql.append(addColumns(columns, columnExpressions));
123119

124120
sql.append(" FROM ");
125121
if (!isNullOrEmpty(catalog)) {
@@ -202,6 +198,40 @@ else if (typeAndValue.getType() instanceof CharType) {
202198
return statement;
203199
}
204200

201+
public PreparedStatement buildSql(
202+
JdbcClient client,
203+
ConnectorSession session,
204+
Connection connection,
205+
String catalog,
206+
String schema,
207+
String table,
208+
List<JdbcColumnHandle> columns,
209+
TupleDomain<ColumnHandle> tupleDomain,
210+
Optional<JdbcExpression> additionalPredicate)
211+
throws SQLException
212+
{
213+
return buildSql(client, session, connection, catalog, schema, table, columns, ImmutableMap.of(), tupleDomain, additionalPredicate);
214+
}
215+
216+
private String addColumns(List<JdbcColumnHandle> columns, Map<String, String> columnExpressions)
217+
{
218+
if (columns.isEmpty()) {
219+
return "null";
220+
}
221+
222+
return columns.stream()
223+
.map(jdbcColumnHandle -> {
224+
String columnName = jdbcColumnHandle.getColumnName();
225+
String columnAlias = quote(columnName);
226+
String expression = columnExpressions.get(columnName);
227+
if (expression == null) {
228+
return columnAlias;
229+
}
230+
return format("%s AS %s", expression, columnAlias);
231+
})
232+
.collect(joining(", "));
233+
}
234+
205235
private static boolean isAcceptedType(Type type)
206236
{
207237
Type validType = requireNonNull(type, "type is null");

‎presto-docs/src/main/sphinx/connector/mysql.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ The connector maps MySQL types to the corresponding PrestoDB types:
166166
- ``DATETIME``
167167
* - ``TIMESTAMP(n)``
168168
- ``TIMESTAMP``
169+
* - ``GEOMETRY``
170+
- ``VARCHAR``
169171

170172
No other types are supported.
171173

‎presto-mysql/pom.xml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,22 @@
6565
<scope>provided</scope>
6666
</dependency>
6767

68+
<dependency>
69+
<groupId>com.esri.geometry</groupId>
70+
<artifactId>esri-geometry-api</artifactId>
71+
</dependency>
72+
73+
<dependency>
74+
<groupId>org.openjdk.jol</groupId>
75+
<artifactId>jol-core</artifactId>
76+
<scope>provided</scope>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>com.facebook.presto</groupId>
81+
<artifactId>presto-geospatial-toolkit</artifactId>
82+
</dependency>
83+
6884
<dependency>
6985
<groupId>com.facebook.drift</groupId>
7086
<artifactId>drift-api</artifactId>
@@ -114,12 +130,6 @@
114130
<scope>test</scope>
115131
</dependency>
116132

117-
<dependency>
118-
<groupId>com.facebook.airlift</groupId>
119-
<artifactId>json</artifactId>
120-
<scope>test</scope>
121-
</dependency>
122-
123133
<dependency>
124134
<groupId>com.facebook.presto</groupId>
125135
<artifactId>presto-main-base</artifactId>

‎presto-mysql/src/main/java/com/facebook/presto/plugin/mysql/MySqlClient.java‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
package com.facebook.presto.plugin.mysql;
1515

16+
import com.esri.core.geometry.ogc.OGCGeometry;
1617
import com.facebook.presto.common.type.TimestampType;
1718
import com.facebook.presto.common.type.Type;
1819
import com.facebook.presto.common.type.VarcharType;
@@ -23,14 +24,19 @@
2324
import com.facebook.presto.plugin.jdbc.JdbcColumnHandle;
2425
import com.facebook.presto.plugin.jdbc.JdbcConnectorId;
2526
import com.facebook.presto.plugin.jdbc.JdbcIdentity;
27+
import com.facebook.presto.plugin.jdbc.JdbcSplit;
2628
import com.facebook.presto.plugin.jdbc.JdbcTableHandle;
29+
import com.facebook.presto.plugin.jdbc.JdbcTypeHandle;
30+
import com.facebook.presto.plugin.jdbc.QueryBuilder;
31+
import com.facebook.presto.plugin.jdbc.ReadMapping;
2732
import com.facebook.presto.spi.ConnectorSession;
2833
import com.facebook.presto.spi.ConnectorTableMetadata;
2934
import com.facebook.presto.spi.PrestoException;
3035
import com.facebook.presto.spi.SchemaTableName;
3136
import com.google.common.collect.ImmutableSet;
3237
import com.mysql.cj.jdbc.JdbcStatement;
3338
import com.mysql.jdbc.Driver;
39+
import io.airlift.slice.Slice;
3440

3541
import javax.inject.Inject;
3642

@@ -41,21 +47,38 @@
4147
import java.sql.SQLException;
4248
import java.sql.SQLSyntaxErrorException;
4349
import java.util.Collection;
50+
import java.util.List;
51+
import java.util.Map;
4452
import java.util.Optional;
4553
import java.util.Properties;
4654

55+
56+
import static com.esri.core.geometry.ogc.OGCGeometry.fromBinary;
4757
import static com.facebook.presto.common.type.RealType.REAL;
58+
import static com.facebook.presto.common.type.StandardTypes.GEOMETRY;
4859
import static com.facebook.presto.common.type.TimeWithTimeZoneType.TIME_WITH_TIME_ZONE;
4960
import static com.facebook.presto.common.type.TimestampWithTimeZoneType.TIMESTAMP_WITH_TIME_ZONE;
5061
import static com.facebook.presto.common.type.VarbinaryType.VARBINARY;
62+
import static com.facebook.presto.common.type.VarcharType.VARCHAR;
5163
import static com.facebook.presto.common.type.Varchars.isVarcharType;
64+
import static com.facebook.presto.geospatial.GeometryUtils.wktFromJtsGeometry;
65+
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.serialize;
66+
import static com.facebook.presto.geospatial.serde.JtsGeometrySerde.deserialize;
5267
import static com.facebook.presto.plugin.jdbc.DriverConnectionFactory.basicConnectionProperties;
5368
import static com.facebook.presto.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
69+
import static com.facebook.presto.plugin.jdbc.ReadMapping.sliceReadMapping;
5470
import static com.facebook.presto.spi.StandardErrorCode.ALREADY_EXISTS;
71+
import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
5572
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
73+
import static com.google.common.collect.ImmutableMap.toImmutableMap;
5674
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
75+
import static io.airlift.slice.Slices.utf8Slice;
76+
import static io.airlift.slice.Slices.wrappedBuffer;
5777
import static java.lang.String.format;
5878
import static java.util.Locale.ENGLISH;
79+
import static java.util.Objects.requireNonNull;
80+
import static java.util.function.Function.identity;
81+
import static java.util.regex.Pattern.quote;
5982

6083
public class MySqlClient
6184
extends BaseJdbcClient
@@ -196,6 +219,66 @@ protected String toSqlType(Type type)
196219
return super.toSqlType(type);
197220
}
198221

222+
@Override
223+
public PreparedStatement buildSql(ConnectorSession session, Connection connection, JdbcSplit split, List<JdbcColumnHandle> columnHandles) throws SQLException
224+
{
225+
Map<String, String> columnExpressions = columnHandles.stream()
226+
.filter(handle -> handle.getJdbcTypeHandle().getJdbcTypeName().equalsIgnoreCase(GEOMETRY))
227+
.map(handle -> handle.getColumnName())
228+
.collect(toImmutableMap(
229+
identity(),
230+
columnName -> "ST_AsBinary(`" + columnName + "`)"));
231+
232+
return new QueryBuilder(identifierQuote).buildSql(
233+
this,
234+
session,
235+
connection,
236+
split.getCatalogName(),
237+
split.getSchemaName(),
238+
split.getTableName(),
239+
columnHandles,
240+
columnExpressions,
241+
split.getTupleDomain(),
242+
split.getAdditionalPredicate());
243+
}
244+
245+
@Override
246+
public Optional<ReadMapping> toPrestoType(ConnectorSession session, JdbcTypeHandle typeHandle)
247+
{
248+
String typeName = typeHandle.getJdbcTypeName();
249+
250+
if (typeName.equalsIgnoreCase(GEOMETRY)) {
251+
return Optional.of(geometryReadMapping());
252+
}
253+
254+
return super.toPrestoType(session, typeHandle);
255+
}
256+
257+
private ReadMapping geometryReadMapping()
258+
{
259+
return sliceReadMapping(VARCHAR,
260+
(resultSet, columnIndex) -> getAsText(stGeomFromBinary(wrappedBuffer(resultSet.getBytes(columnIndex)))));
261+
}
262+
263+
private static Slice getAsText(Slice input)
264+
{
265+
return utf8Slice(wktFromJtsGeometry(deserialize(input)));
266+
}
267+
268+
private static Slice stGeomFromBinary(Slice input)
269+
{
270+
requireNonNull(input, "input is null");
271+
OGCGeometry geometry;
272+
try {
273+
geometry = fromBinary(input.toByteBuffer().slice());
274+
}
275+
catch (IllegalArgumentException | IndexOutOfBoundsException e) {
276+
throw new PrestoException(INVALID_FUNCTION_ARGUMENT, "Invalid Well-Known Binary (WKB)", e);
277+
}
278+
geometry.setSpatialReference(null);
279+
return serialize(geometry);
280+
}
281+
199282
@Override
200283
public void createTable(ConnectorSession session, ConnectorTableMetadata tableMetadata)
201284
{

‎presto-mysql/src/test/java/com/facebook/presto/plugin/mysql/TestMySqlIntegrationSmokeTest.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static io.airlift.tpch.TpchTable.ORDERS;
4444
import static java.lang.String.format;
4545
import static java.util.concurrent.TimeUnit.SECONDS;
46+
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
4647
import static org.testng.Assert.assertFalse;
4748
import static org.testng.Assert.assertTrue;
4849

@@ -191,6 +192,40 @@ public void testMysqlTimestamp()
191192
assertUpdate("DROP TABLE test_timestamp2");
192193
}
193194

195+
@Test
196+
public void testMysqlGeometry()
197+
throws SQLException
198+
{
199+
execute("CREATE TABLE tpch.test_geometry (g GEOMETRY)");
200+
201+
execute("INSERT INTO tpch.test_geometry VALUES (ST_GeomFromText('POINT(1 2)'))");
202+
execute("INSERT INTO tpch.test_geometry VALUES (ST_GeomFromText('LINESTRING(0 0, 5 5, 10 10)'))");
203+
execute("INSERT INTO tpch.test_geometry VALUES (ST_GeomFromText('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'))");
204+
205+
assertQuery(
206+
"SELECT CAST(g AS VARCHAR) FROM test_geometry",
207+
"VALUES " +
208+
"CAST('POINT (1 2)' AS VARCHAR), " +
209+
"CAST('LINESTRING (0 0, 5 5, 10 10)' AS VARCHAR), " +
210+
"CAST('POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))' AS VARCHAR)");
211+
212+
assertUpdate("DROP TABLE tpch.test_geometry");
213+
}
214+
215+
@Test
216+
public void testInvalidGeometry()
217+
throws SQLException
218+
{
219+
execute("CREATE TABLE tpch.test_invalid_wkb (g GEOMETRY)");
220+
221+
execute("INSERT INTO tpch.test_invalid_wkb VALUES (ST_GeomFromText('POINT(1 2)'))");
222+
223+
assertThatThrownBy(() -> execute("UPDATE tpch.test_invalid_wkb SET g = X'0001020304'"))
224+
.hasMessageContaining("Cannot get geometry object from data");
225+
226+
execute("DROP TABLE tpch.test_invalid_wkb");
227+
}
228+
194229
@Test
195230
public void testCharTrailingSpace()
196231
throws Exception

0 commit comments

Comments
 (0)