Output succinct data sizes only when getting pretty query JSON

Author: wendigo

core/trino-main/src/main/java/io/trino/server/ui/UiQueryResource.java

@@ -70,14 +70,16 @@
 public class UiQueryResource
 {
     private final JsonCodec<QueryInfo> queryInfoCodec;
+    private final JsonCodec<QueryInfo> prettyQueryInfoCodec;
     private final DispatchManager dispatchManager;
     private final AccessControl accessControl;
     private final HttpRequestSessionContextFactory sessionContextFactory;
 
     @Inject
     public UiQueryResource(ObjectMapper objectMapper, DispatchManager dispatchManager, AccessControl accessControl, HttpRequestSessionContextFactory sessionContextFactory)
     {
-        this.queryInfoCodec = buildQueryInfoCodec(objectMapper);
+        this.queryInfoCodec = buildQueryInfoCodec(objectMapper, false);
+        this.prettyQueryInfoCodec = buildQueryInfoCodec(objectMapper, true);
         this.dispatchManager = requireNonNull(dispatchManager, "dispatchManager is null");
         this.accessControl = requireNonNull(accessControl, "accessControl is null");
         this.sessionContextFactory = requireNonNull(sessionContextFactory, "sessionContextFactory is null");
@@ -110,6 +112,11 @@ public Response getQueryInfo(@PathParam("queryId") QueryId queryId, @Context Htt
         if (queryInfo.isPresent()) {
             try {
                 checkCanViewQueryOwnedBy(sessionContextFactory.extractAuthorizedIdentity(servletRequest, httpHeaders), queryInfo.get().getSession().toIdentity(), accessControl);
+
+                if (servletRequest.getQueryString().contains("pretty")) {
+                    // Use pretty JSON codec that reduces noise
+                    return Response.ok(prettyQueryInfoCodec.toJson(queryInfo.get()), APPLICATION_JSON_TYPE).build();
+                }
                 return Response.ok(queryInfoCodec.toJson(queryInfo.get()), APPLICATION_JSON_TYPE).build();
             }
             catch (AccessDeniedException e) {
@@ -159,13 +166,15 @@ private Response failQuery(QueryId queryId, TrinoException queryException, HttpS
         }
     }
 
-    private JsonCodec<QueryInfo> buildQueryInfoCodec(ObjectMapper objectMapper)
+    private JsonCodec<QueryInfo> buildQueryInfoCodec(ObjectMapper objectMapper, boolean pretty)
     {
-        // Enable succinct DataSize serialization for QueryInfo to make it more human friendly
-        ContextAttributes attrs = ContextAttributes.getEmpty()
-                .withSharedAttribute(SUCCINCT_DATA_SIZE_ENABLED, Boolean.TRUE);
-
         JsonCodecFactory jsonCodecFactory = new JsonCodecFactory(() -> {
+            // Enable succinct DataSize serialization for QueryInfo to make it more human friendly
+            ContextAttributes attrs = ContextAttributes.getEmpty();
+            if (pretty) {
+                attrs = attrs.withSharedAttribute(SUCCINCT_DATA_SIZE_ENABLED, Boolean.TRUE);
+            }
+
             ObjectMapper mapper = objectMapper
                     .copy()
                     .setDefaultAttributes(attrs);
@@ -177,7 +186,11 @@ private JsonCodec<QueryInfo> buildQueryInfoCodec(ObjectMapper objectMapper)
             // Do not output @type property for OperatorInfo
             mapper.addMixIn(OperatorInfo.class, DropTypeInfo.class);
             return mapper;
-        }).prettyPrint();
+        });
+
+        if (pretty) {
+            jsonCodecFactory = jsonCodecFactory.prettyPrint();
+        }
 
         return jsonCodecFactory.jsonCodec(QueryInfo.class);
     }