Do not use ObjectMapper directly

It doesn't have the configuration that we need

Author: wendigo

core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonInputFunctions.java

@@ -13,6 +13,8 @@
  */
 package io.trino.operator.scalar.json;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,6 +31,7 @@
 
 import static io.trino.json.JsonInputErrorNode.JSON_ERROR;
 import static io.trino.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static java.nio.charset.StandardCharsets.UTF_16LE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -56,7 +59,13 @@ public final class JsonInputFunctions
     public static final String VARBINARY_UTF16_TO_JSON = "$varbinary_utf16_to_json";
     public static final String VARBINARY_UTF32_TO_JSON = "$varbinary_utf32_to_json";
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
+    static {
+        // Changes factory. Necessary for JsonParser.readValueAsTree to work.
+        new ObjectMapper(JSON_FACTORY);
+    }
+
     private static final Charset UTF_32LE = Charset.forName("UTF-32LE");
 
     private JsonInputFunctions() {}
@@ -102,8 +111,8 @@ public static JsonNode varbinaryUtf32ToJson(@SqlType(StandardTypes.VARBINARY) Sl
 
     private static JsonNode toJson(Reader reader, boolean failOnError)
     {
-        try {
-            return MAPPER.readTree(reader);
+        try (JsonParser parser = JSON_FACTORY.createParser(reader)) {
+            return parser.readValueAsTree();
         }
         catch (JsonProcessingException e) {
             if (failOnError) {

core/trino-main/src/main/java/io/trino/operator/scalar/json/JsonOutputFunctions.java

@@ -14,6 +14,7 @@
 package io.trino.operator.scalar.json;
 
 import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.util.ByteArrayBuilder;
@@ -40,6 +41,7 @@
 import static io.trino.sql.tree.JsonQuery.EmptyOrErrorBehavior.EMPTY_OBJECT;
 import static io.trino.sql.tree.JsonQuery.EmptyOrErrorBehavior.ERROR;
 import static io.trino.sql.tree.JsonQuery.EmptyOrErrorBehavior.NULL;
+import static io.trino.util.JsonUtil.createJsonFactory;
 import static java.util.Objects.requireNonNull;
 
 /**
@@ -60,7 +62,13 @@ public final class JsonOutputFunctions
     public static final String JSON_TO_VARBINARY_UTF16 = "$json_to_varbinary_utf16";
     public static final String JSON_TO_VARBINARY_UTF32 = "$json_to_varbinary_utf32";
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
+    static {
+        // Changes factory. Necessary for JsonParser.readValueAsTree to work.
+        new ObjectMapper(JSON_FACTORY);
+    }
+
     private static final EncodingSpecificConstants UTF_8 = new EncodingSpecificConstants(
             JsonEncoding.UTF8,
             StandardCharsets.UTF_8,
@@ -126,8 +134,8 @@ private static Slice serialize(JsonNode json, EncodingSpecificConstants constant
         }
 
         ByteArrayBuilder builder = new ByteArrayBuilder();
-        try (JsonGenerator generator = MAPPER.createGenerator(builder, constants.jsonEncoding)) {
-            MAPPER.writeTree(generator, json);
+        try (JsonGenerator generator = JSON_FACTORY.createGenerator(builder, constants.jsonEncoding)) {
+            generator.writeTree(json);
         }
         catch (JsonProcessingException e) {
             if (errorBehavior == NULL.ordinal()) {

core/trino-main/src/main/java/io/trino/type/Json2016Type.java

@@ -13,7 +13,10 @@
  */
 package io.trino.type;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.util.ByteArrayBuilder;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.airlift.slice.Slice;
@@ -28,14 +31,23 @@
 import io.trino.spi.type.StandardTypes;
 import io.trino.spi.type.TypeSignature;
 
-import static io.airlift.slice.Slices.utf8Slice;
+import java.io.IOException;
+
+import static io.airlift.slice.Slices.wrappedBuffer;
 import static io.trino.json.JsonInputErrorNode.JSON_ERROR;
+import static io.trino.util.JsonUtil.createJsonFactory;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 public class Json2016Type
         extends AbstractVariableWidthType
 {
     public static final Json2016Type JSON_2016 = new Json2016Type();
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final JsonFactory JSON_FACTORY = createJsonFactory();
+
+    static {
+        // Changes factory. Necessary for JsonParser.readValueAsTree to work.
+        new ObjectMapper(JSON_FACTORY);
+    }
 
     public Json2016Type()
     {
@@ -61,30 +73,32 @@ public Object getObject(Block block, int position)
         if (json.equals(JSON_ERROR.toString())) {
             return JSON_ERROR;
         }
-        try {
-            return MAPPER.readTree(json);
+        try (JsonParser parser = JSON_FACTORY.createParser(json)) {
+            return parser.readValueAsTree();
         }
-        catch (JsonProcessingException e) {
+        catch (IOException e) {
             throw new JsonInputConversionException(e);
         }
     }
 
     @Override
     public void writeObject(BlockBuilder blockBuilder, Object value)
     {
-        String json;
+        byte[] json;
         if (value == JSON_ERROR) {
-            json = JSON_ERROR.toString();
+            json = JSON_ERROR.toString().getBytes(UTF_8);
         }
         else {
-            try {
-                json = MAPPER.writeValueAsString(value);
+            ByteArrayBuilder builder = new ByteArrayBuilder();
+            try (JsonGenerator generator = JSON_FACTORY.createGenerator(builder)) {
+                generator.writeObject(value);
             }
-            catch (JsonProcessingException e) {
+            catch (IOException e) {
                 throw new JsonOutputConversionException(e);
             }
+            json = builder.toByteArray();
         }
-        Slice bytes = utf8Slice(json);
+        Slice bytes = wrappedBuffer(json);
         ((VariableWidthBlockBuilder) blockBuilder).writeEntry(bytes);
     }
 }