Open query text in a separate window

Author: prakhar10

gateway-ha/src/main/java/io/trino/gateway/ha/handler/ProxyUtils.java

@@ -39,7 +39,6 @@ public final class ProxyUtils
     public static final String AUTHORIZATION = "Authorization";
 
     private static final Logger log = Logger.get(ProxyUtils.class);
-    public static final int QUERY_TEXT_LENGTH_FOR_HISTORY = 200;
     /**
      * This regular expression matches query ids as they appear in the path of a URL. The query id must be preceded
      * by a "/". A query id is defined as three groups of digits separated by underscores, with a final group

gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyRequestHandler.java

@@ -63,7 +63,6 @@
 import static io.airlift.http.client.Request.Builder.preparePut;
 import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
 import static io.airlift.jaxrs.AsyncResponseHandler.bindAsyncResponse;
-import static io.trino.gateway.ha.handler.ProxyUtils.QUERY_TEXT_LENGTH_FOR_HISTORY;
 import static io.trino.gateway.ha.handler.ProxyUtils.SOURCE_HEADER;
 import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN_TYPE;
 import static jakarta.ws.rs.core.Response.Status.BAD_GATEWAY;
@@ -307,10 +306,7 @@ public static QueryHistoryManager.QueryDetail getQueryDetailsFromRequest(Request
         queryDetail.setSource(request.getHeader(SOURCE_HEADER));
 
         String queryText = new String(((StaticBodyGenerator) request.getBodyGenerator()).getBody(), UTF_8);
-        queryDetail.setQueryText(
-                queryText.length() > QUERY_TEXT_LENGTH_FOR_HISTORY
-                        ? queryText.substring(0, QUERY_TEXT_LENGTH_FOR_HISTORY) + "..."
-                        : queryText);
+        queryDetail.setQueryText(queryText);
         return queryDetail;
     }
 

gateway-ha/src/main/resources/mysql/V4__update_query_text_column_type.sql

@@ -0,0 +1,2 @@
+ALTER TABLE query_history
+    MODIFY query_text LONGTEXT;

gateway-ha/src/main/resources/oracle/V4__update_query_text_column_type.sql

@@ -0,0 +1,4 @@
+ALTER TABLE query_history ADD (query_text_clob CLOB);
+UPDATE query_history SET query_text_clob = query_text;
+ALTER TABLE query_history DROP COLUMN query_text;
+ALTER TABLE query_history RENAME COLUMN query_text_clob TO query_text;

gateway-ha/src/main/resources/postgresql/V4__update_query_text_column_type.sql

@@ -0,0 +1,2 @@
+ALTER TABLE query_history
+ALTER COLUMN query_text TYPE text;

gateway-ha/src/test/java/io/trino/gateway/proxyserver/TestProxyRequestHandler.java

@@ -14,6 +14,7 @@
 package io.trino.gateway.proxyserver;
 
 import io.trino.gateway.ha.HaGatewayLauncher;
+import io.trino.gateway.ha.router.QueryHistoryManager;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -30,12 +31,19 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import java.io.File;
+import java.net.URI;
+import java.util.Optional;
 
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
 import static com.google.common.net.MediaType.JSON_UTF_8;
+import static io.airlift.http.client.Request.Builder.preparePost;
+import static io.airlift.http.client.StaticBodyGenerator.createStaticBodyGenerator;
 import static io.trino.gateway.ha.HaGatewayTestUtils.buildGatewayConfig;
 import static io.trino.gateway.ha.HaGatewayTestUtils.prepareMockBackend;
 import static io.trino.gateway.ha.HaGatewayTestUtils.setUpBackend;
+import static io.trino.gateway.ha.handler.HttpUtils.V1_STATEMENT_PATH;
+import static io.trino.gateway.ha.handler.ProxyUtils.SOURCE_HEADER;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
@@ -116,4 +124,38 @@ void testPutRequestHandler()
             assertThat(response.code()).isEqualTo(NOT_FOUND);
         }
     }
+
+    @Test
+    void testGetQueryDetailsFromRequest()
+    {
+        // A sample query longer than 200 characters to test against truncation.
+        String longQuery = """
+        SELECT
+            c.customer_name,
+            c.customer_region,
+            COUNT(o.order_id) AS total_orders,
+            SUM(o.order_value) AS total_revenue
+        FROM
+            hive.sales_data.customers AS c
+        JOIN
+            hive.sales_data.orders AS o
+                ON c.customer_id = o.customer_id
+        WHERE
+            o.order_date >= date '2023-01-01'""";
+
+        io.airlift.http.client.Request request = preparePost()
+                .setUri(URI.create("http://localhost:" + routerPort + V1_STATEMENT_PATH))
+                .addHeader(SOURCE_HEADER, "trino-cli")
+                .setBodyGenerator(createStaticBodyGenerator(longQuery, UTF_8))
+                .build();
+
+        Optional<String> username = Optional.of("test_user");
+
+        QueryHistoryManager.QueryDetail queryDetail = ProxyRequestHandler.getQueryDetailsFromRequest(request, username);
+
+        assertThat(queryDetail.getQueryText()).isEqualTo(longQuery).hasSizeGreaterThan(200);
+        assertThat(queryDetail.getUser()).isEqualTo(username.get());
+        assertThat(queryDetail.getSource()).isEqualTo("trino-cli");
+        assertThat(queryDetail.getBackendUrl()).isEqualTo("http://localhost:" + routerPort);
+    }
 }

webapp/package.json

@@ -10,10 +10,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@douyinfe/semi-icons": "^2.47.1",
-    "@douyinfe/semi-icons-lab": "^2.47.1",
-    "@douyinfe/semi-illustrations": "^2.47.1",
-    "@douyinfe/semi-ui": "^2.47.1",
+    "@douyinfe/semi-icons": "^2.62.0",
+    "@douyinfe/semi-icons-lab": "^2.62.0",
+    "@douyinfe/semi-illustrations": "^2.62.0",
+    "@douyinfe/semi-ui": "^2.62.0",
     "echarts": "^5.4.3",
     "js-cookie": "^3.0.5",
     "moment": "^2.29.4",