Serialize JSON directly from Pages

client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java

@@ -20,8 +20,8 @@
 import io.trino.client.Column;
 import io.trino.client.JsonCodec;
 import io.trino.client.QueryResults;
-import io.trino.client.RawQueryData;
 import io.trino.client.StatementStats;
+import io.trino.client.TypedQueryData;
 import io.trino.client.uri.PropertyName;
 import io.trino.client.uri.TrinoUri;
 import okhttp3.mockwebserver.MockResponse;
@@ -136,7 +136,7 @@ static String createResults(MockWebServer server)
                 null,
                 null,
                 ImmutableList.of(new Column("_col0", BIGINT, new ClientTypeSignature(BIGINT))),
-                RawQueryData.of(ImmutableList.of(ImmutableList.of(123))),
+                TypedQueryData.of(ImmutableList.of(ImmutableList.of(123))),
                 StatementStats.builder()
                         .setState("FINISHED")
                         .setProgressPercentage(OptionalDouble.empty())

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

@@ -83,8 +83,8 @@ public ResultRows toRows(List<Column> columns, QueryData data)
         }
 
         verify(columns != null && !columns.isEmpty(), "Columns must be set when decoding data");
-        if (data instanceof RawQueryData) {
-            RawQueryData rawData = (RawQueryData) data;
+        if (data instanceof TypedQueryData) {
+            TypedQueryData rawData = (TypedQueryData) data;
             if (rawData.isNull()) {
                 return NULL_ROWS; // for backward compatibility instead of null
             }

client/trino-client/src/main/java/io/trino/client/RawQueryData.java → client/trino-client/src/main/java/io/trino/client/TypedQueryData.java

@@ -24,12 +24,12 @@
  * Class represents QueryData of already typed values
  *
  */
-public class RawQueryData
+public class TypedQueryData
         implements QueryData
 {
     private final Iterable<List<Object>> iterable;
 
-    private RawQueryData(Iterable<List<Object>> values)
+    private TypedQueryData(Iterable<List<Object>> values)
     {
         this.iterable = values == null ? null : unmodifiableIterable(values);
     }
@@ -42,7 +42,7 @@ public Iterable<List<Object>> getIterable()
 
     public static QueryData of(@Nullable Iterable<List<Object>> values)
     {
-        return new RawQueryData(values);
+        return new TypedQueryData(values);
     }
 
     @Override

client/trino-client/src/test/java/io/trino/client/TestClientRedirect.java

@@ -161,7 +161,7 @@ private String newQueryResults(MockWebServer server)
                 Stream.of(new Column("id", INTEGER, new ClientTypeSignature("integer")),
                                 new Column("name", VARCHAR, new ClientTypeSignature("varchar")))
                         .collect(toList()),
-                RawQueryData.of(IntStream.range(0, numRecords)
+                TypedQueryData.of(IntStream.range(0, numRecords)
                         .mapToObj(index -> Stream.of((Object) index, "a").collect(toList()))
                         .collect(toList())),
                 StatementStats.builder()

client/trino-client/src/test/java/io/trino/client/TestRetry.java

@@ -140,7 +140,7 @@ private String newQueryResults(String state)
                 Stream.of(new Column("id", INTEGER, new ClientTypeSignature("integer")),
                                 new Column("name", VARCHAR, new ClientTypeSignature("varchar")))
                         .collect(toList()),
-                RawQueryData.of(IntStream.range(0, numRecords)
+                TypedQueryData.of(IntStream.range(0, numRecords)
                         .mapToObj(index -> Stream.of((Object) index, "a").collect(toList()))
                         .collect(toList())),
                 new StatementStats(state, state.equals("QUEUED"), true, OptionalDouble.of(0), OptionalDouble.of(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),

client/trino-jdbc/src/test/java/io/trino/jdbc/TestProgressMonitor.java

@@ -21,8 +21,8 @@
 import io.trino.client.ClientTypeSignature;
 import io.trino.client.Column;
 import io.trino.client.QueryResults;
-import io.trino.client.RawQueryData;
 import io.trino.client.StatementStats;
+import io.trino.client.TypedQueryData;
 import io.trino.server.protocol.spooling.QueryDataJacksonModule;
 import io.trino.spi.type.StandardTypes;
 import okhttp3.mockwebserver.MockResponse;
@@ -98,7 +98,7 @@ private String newQueryResults(Integer partialCancelId, Integer nextUriId, List<
                 partialCancelId == null ? null : server.url(format("/v1/statement/partialCancel/%s.%s", queryId, partialCancelId)).uri(),
                 nextUriId == null ? null : server.url(format("/v1/statement/%s/%s", queryId, nextUriId)).uri(),
                 responseColumns,
-                RawQueryData.of(data),
+                TypedQueryData.of(data),
                 new StatementStats(state, state.equals("QUEUED"), true, OptionalDouble.of(0), OptionalDouble.of(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, null),
                 null,
                 ImmutableList.of(),

core/trino-main/src/main/java/io/trino/dispatcher/QueuedStatementResource.java

@@ -27,8 +27,8 @@
 import io.opentelemetry.api.trace.Tracer;
 import io.trino.client.QueryError;
 import io.trino.client.QueryResults;
-import io.trino.client.RawQueryData;
 import io.trino.client.StatementStats;
+import io.trino.client.TypedQueryData;
 import io.trino.execution.ExecutionFailureInfo;
 import io.trino.execution.QueryManagerConfig;
 import io.trino.execution.QueryState;
@@ -281,7 +281,7 @@ private static QueryResults createQueryResults(
                 null,
                 nextUri,
                 null,
-                RawQueryData.of(null),
+                TypedQueryData.of(null),
                 StatementStats.builder()
                         .setState(state.toString())
                         .setQueued(state == QUEUED)

core/trino-main/src/main/java/io/trino/server/protocol/ExecutingStatementResource.java

@@ -31,7 +31,6 @@
 import io.trino.server.ServerConfig;
 import io.trino.server.protocol.spooling.QueryDataEncoder;
 import io.trino.server.protocol.spooling.QueryDataEncoders;
-import io.trino.server.protocol.spooling.RawQueryDataProducer;
 import io.trino.server.protocol.spooling.SpooledQueryDataProducer;
 import io.trino.server.security.ResourceSecurity;
 import io.trino.spi.QueryId;
@@ -207,7 +206,7 @@ protected Query getQuery(QueryId queryId, String slug, long token)
                 queryManager,
                 encoderFactory
                         .map(SpooledQueryDataProducer::createSpooledQueryDataProducer)
-                        .orElseGet(RawQueryDataProducer::new),
+                        .orElseGet(JsonBytesQueryDataProducer::new),
                 queryInfoUrlFactory.getQueryInfoUrl(queryId),
                 directExchangeClientSupplier,
                 exchangeManagerRegistry,