Clean up buffer when MaterializedInputStream is closed

client/trino-client/src/main/java/io/trino/client/JsonResponse.java

@@ -113,18 +113,21 @@ public static <T> JsonResponse<T> execute(TrinoJsonCodec<T> codec, Call.Factory
         try (Response response = client.newCall(request).execute()) {
             ResponseBody responseBody = requireNonNull(response.body());
             if (isJson(responseBody.contentType())) {
-                T value = null;
-                IllegalArgumentException exception = null;
                 MaterializingInputStream stream = new MaterializingInputStream(responseBody.byteStream(), 32 * 1024);
                 try (InputStream ignored = stream) {
                     // Parse from input stream, response is either of unknown size or too large to materialize. Raw response body
                     // will not be available if parsing fails
-                    value = codec.fromJson(stream);
+                    T value = codec.fromJson(stream);
+                    return new JsonResponse<>(response.code(), response.headers(), stream.getHeadString(), value, null);
                 }
                 catch (JsonProcessingException e) {
-                    exception = new IllegalArgumentException(format("Unable to create %s from JSON response:\n[%s]", codec.getType(), stream.getHeadString()), e);
+                    return new JsonResponse<>(
+                            response.code(),
+                            response.headers(),
+                            stream.getHeadString(),
+                            null,
+                            new IllegalArgumentException(format("Unable to create %s from JSON response:\n[%s]", codec.getType(), stream.getHeadString()), e));
                 }
-                return new JsonResponse<>(response.code(), response.headers(), stream.getHeadString(), value, exception);
             }
             return new JsonResponse<>(response.code(), response.headers(), responseBody.string());
         }

client/trino-client/src/main/java/io/trino/client/MaterializingInputStream.java

@@ -23,7 +23,7 @@
 class MaterializingInputStream
         extends FilterInputStream
 {
-    private final byte[] head;
+    private byte[] head;
     private int remaining;
     private int currentOffset;
 
@@ -77,6 +77,9 @@ public int read(byte[] buffer)
 
     public String getHeadString()
     {
+        if (head == null) {
+            return "<empty>";
+        }
         return new String(head, 0, currentOffset) + (remaining > 0 ? format("... [" + bytesOmitted(remaining) + "]", remaining) : "");
     }
 
@@ -87,4 +90,12 @@ private String bytesOmitted(long bytes)
         }
         return format("%d more bytes", bytes);
     }
+
+    @Override
+    public void close()
+            throws IOException
+    {
+        super.close();
+        head = null;
+    }
 }

client/trino-client/src/main/java/io/trino/client/TrinoJsonCodec.java

@@ -60,6 +60,7 @@ public class TrinoJsonCodec<T>
                 .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)
                 .disable(MapperFeature.INFER_PROPERTY_MUTATORS)
                 .disable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
+                .disable(StreamReadFeature.AUTO_CLOSE_SOURCE)
                 .addModule(new Jdk8Module())
                 .addModule(new QueryDataClientJacksonModule())
                 .build();