Use ThreadLocalRecyclerPool for Jackson

trinodb · Apr 3, 2024 · 031d0df · 031d0df
1 parent cadf38e
commit 031d0df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonUtils.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/util/JsonUtils.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.core.util.JsonRecyclerPools;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.MapperFeature;
@@ -158,12 +159,14 @@ public static JsonFactory jsonFactory()
     // due to the limits introduced by Jackson 2.15
     public static JsonFactoryBuilder jsonFactoryBuilder()
     {
+        // https://github.com/FasterXML/jackson-core/issues/1256
         return new JsonFactoryBuilder()
                 .streamReadConstraints(StreamReadConstraints.builder()
                         .maxStringLength(Integer.MAX_VALUE)
                         .maxNestingDepth(Integer.MAX_VALUE)
                         .maxNumberLength(Integer.MAX_VALUE)
-                        .build());
+                        .build())
+                .recyclerPool(JsonRecyclerPools.threadLocalPool());
     }
 
     private interface ParserConstructor<I>

diff --git a/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestJsonUtils.java b/lib/trino-plugin-toolkit/src/test/java/io/trino/plugin/base/util/TestJsonUtils.java
@@ -15,6 +15,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.core.util.JsonRecyclerPools;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.Test;
 
@@ -81,6 +82,13 @@ public void testFactoryHasNoReadConstraints()
         assertReadConstraints(jsonFactoryBuilder().build().streamReadConstraints());
     }
 
+    @Test
+    public void testFactoryHasThreadLocalRecycler()
+    {
+        assertThat(jsonFactory()._getRecyclerPool()).isEqualTo(JsonRecyclerPools.threadLocalPool());
+        assertThat(jsonFactoryBuilder().build()._getRecyclerPool()).isEqualTo(JsonRecyclerPools.threadLocalPool());
+    }
+
     @Test
     public void testBuilderHasNoReadConstraints()
     {