add jdbc mapping for postgres json #11913
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,18 +18,42 @@ | |
| import com.facebook.presto.plugin.jdbc.DriverConnectionFactory; | ||
| import com.facebook.presto.plugin.jdbc.JdbcConnectorId; | ||
| import com.facebook.presto.plugin.jdbc.JdbcOutputTableHandle; | ||
| import com.facebook.presto.plugin.jdbc.JdbcTypeHandle; | ||
| import com.facebook.presto.plugin.jdbc.ReadMapping; | ||
| import com.facebook.presto.spi.ConnectorSession; | ||
| import com.facebook.presto.spi.PrestoException; | ||
| import com.facebook.presto.spi.type.Type; | ||
| import com.fasterxml.jackson.core.JsonFactory; | ||
| import com.fasterxml.jackson.core.JsonParser; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import io.airlift.json.ObjectMapperProvider; | ||
| import io.airlift.slice.DynamicSliceOutput; | ||
| import io.airlift.slice.Slice; | ||
| import io.airlift.slice.SliceOutput; | ||
| import org.postgresql.Driver; | ||
|
|
||
| import javax.inject.Inject; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.io.OutputStream; | ||
| import java.sql.Connection; | ||
| import java.sql.DatabaseMetaData; | ||
| import java.sql.PreparedStatement; | ||
| import java.sql.ResultSet; | ||
| import java.sql.SQLException; | ||
| import java.sql.Types; | ||
| import java.util.Optional; | ||
|
|
||
| import static com.facebook.presto.plugin.jdbc.ReadMapping.sliceReadMapping; | ||
| import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT; | ||
| import static com.facebook.presto.spi.type.JsonType.JSON; | ||
| import static com.facebook.presto.spi.type.VarbinaryType.VARBINARY; | ||
| import static com.fasterxml.jackson.core.JsonFactory.Feature.CANONICALIZE_FIELD_NAMES; | ||
| import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS; | ||
| import static io.airlift.slice.Slices.utf8Slice; | ||
| import static java.lang.String.format; | ||
| import static java.nio.charset.StandardCharsets.UTF_8; | ||
|
|
||
| public class PostgreSqlClient | ||
| extends BaseJdbcClient | ||
|
|
@@ -87,7 +111,58 @@ protected String toSqlType(Type type) | |
| if (VARBINARY.equals(type)) { | ||
| return "bytea"; | ||
| } | ||
| if (JSON.equals(type)) { | ||
| return "jsonb"; | ||
| } | ||
|
|
||
| return super.toSqlType(type); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<ReadMapping> toPrestoType(ConnectorSession session, JdbcTypeHandle typeHandle) | ||
| { | ||
| if (typeHandle.getJdbcType() == Types.OTHER) { | ||
| switch (typeHandle.getJdbcTypeName()) { | ||
| case "jsonb": | ||
| case "json": | ||
| return Optional.of(jsonReadMapping()); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Will predicate-pushdown work correctly with json? We definitely need some tests for that.
Contributor
Author
There was a problem hiding this comment. Can you please elaborate about this and add some references to similar tests ? |
||
| } | ||
|
|
||
| return super.toPrestoType(session, typeHandle); | ||
| } | ||
|
|
||
| private static ReadMapping jsonReadMapping() | ||
| { | ||
| return sliceReadMapping(JSON, (resultSet, columnIndex) -> jsonParse(utf8Slice(resultSet.getString(columnIndex)))); | ||
| } | ||
|
||
|
|
||
| private static final JsonFactory JSON_FACTORY = new JsonFactory() | ||
| .disable(CANONICALIZE_FIELD_NAMES); | ||
|
|
||
| private static final ObjectMapper SORTED_MAPPER = new ObjectMapperProvider().get().configure(ORDER_MAP_ENTRIES_BY_KEYS, true); | ||
|
|
||
| public static Slice jsonParse(Slice slice) | ||
| { | ||
| try (JsonParser parser = createJsonParser(JSON_FACTORY, slice)) { | ||
| byte[] in = slice.getBytes(); | ||
| SliceOutput dynamicSliceOutput = new DynamicSliceOutput(in.length); | ||
| SORTED_MAPPER.writeValue((OutputStream) dynamicSliceOutput, SORTED_MAPPER.readValue(parser, Object.class)); | ||
| // nextToken() returns null if the input is parsed correctly, | ||
| // but will throw an exception if there are trailing characters. | ||
| parser.nextToken(); | ||
| return dynamicSliceOutput.slice(); | ||
| } | ||
| catch (Exception e) { | ||
| throw new PrestoException(INVALID_FUNCTION_ARGUMENT, format("Cannot convert '%s' to JSON", slice.toStringUtf8())); | ||
| } | ||
| } | ||
|
|
||
| public static JsonParser createJsonParser(JsonFactory factory, Slice json) | ||
| throws IOException | ||
| { | ||
| // Jackson tries to detect the character encoding automatically when using InputStream | ||
| // so we pass an InputStreamReader instead. | ||
| return factory.createParser(new InputStreamReader(json.getInput(), UTF_8)); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need the type instance to be in the SPI. Instead, compare like this: