From fb482938d9245240648bbf84bc6c12d890a79935 Mon Sep 17 00:00:00 2001
From: Alagappan Maruthappan <amaruthappan@netflix.com>
Date: Wed, 1 Oct 2025 22:32:53 -0700
Subject: [PATCH] Fix query history search based on RoutedTo field

---
 .../trino/gateway/ha/domain/request/QueryHistoryRequest.java  | 4 ++--
 .../io/trino/gateway/ha/resource/GatewayWebAppResource.java   | 2 +-
 .../io/trino/gateway/ha/router/HaQueryHistoryManager.java     | 4 ++--
 .../test/java/io/trino/gateway/ha/TestObjectSerializable.java | 4 ++--
 webapp/src/components/history.tsx                             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/domain/request/QueryHistoryRequest.java b/gateway-ha/src/main/java/io/trino/gateway/ha/domain/request/QueryHistoryRequest.java
index b1755343c..e752c1f09 100644
--- a/gateway-ha/src/main/java/io/trino/gateway/ha/domain/request/QueryHistoryRequest.java
+++ b/gateway-ha/src/main/java/io/trino/gateway/ha/domain/request/QueryHistoryRequest.java
@@ -22,7 +22,7 @@
  * @param page page index
  * @param size page size
  * @param user Query histories of specified user. ADMIN role is optional, other roles are mandatory.
- * @param backendUrl Optional, you can query the history based on the backendUrl.
+ * @param externalUrl Optional, you can query the history based on the externalUrl.
  * @param queryId Optional, you can query the query history based on the queryId of Trino.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -30,7 +30,7 @@ public record QueryHistoryRequest(
         @JsonProperty("page") Integer page,
         @JsonProperty("size") Integer size,
         @JsonProperty("user") String user,
-        @JsonProperty("backendUrl") String backendUrl,
+        @JsonProperty("externalUrl") String externalUrl,
         @JsonProperty("queryId") String queryId,
         @JsonProperty("source") String source)
 {
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/resource/GatewayWebAppResource.java b/gateway-ha/src/main/java/io/trino/gateway/ha/resource/GatewayWebAppResource.java
index 0fe13645f..a0d83ad03 100644
--- a/gateway-ha/src/main/java/io/trino/gateway/ha/resource/GatewayWebAppResource.java
+++ b/gateway-ha/src/main/java/io/trino/gateway/ha/resource/GatewayWebAppResource.java
@@ -139,7 +139,7 @@ public Response findQueryHistory(QueryHistoryRequest query, @Context SecurityCon
                     query.page(),
                     query.size(),
                     securityContext.getUserPrincipal().getName(),
-                    query.backendUrl(),
+                    query.externalUrl(),
                     query.queryId(),
                     query.source()));
         }
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java
index 5a6dfad36..b7ea39001 100644
--- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java
+++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java
@@ -122,8 +122,8 @@ public TableData<QueryDetail> findQueryHistory(QueryHistoryRequest query)
         if (!Strings.isNullOrEmpty(query.user())) {
             condition += " and user_name = '" + query.user() + "'";
         }
-        if (!Strings.isNullOrEmpty(query.backendUrl())) {
-            condition += " and backend_url = '" + query.backendUrl() + "'";
+        if (!Strings.isNullOrEmpty(query.externalUrl())) {
+            condition += " and external_url = '" + query.externalUrl() + "'";
         }
         if (!Strings.isNullOrEmpty(query.queryId())) {
             condition += " and query_id = '" + query.queryId() + "'";
diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/TestObjectSerializable.java b/gateway-ha/src/test/java/io/trino/gateway/ha/TestObjectSerializable.java
index 87818afd1..5d012604e 100644
--- a/gateway-ha/src/test/java/io/trino/gateway/ha/TestObjectSerializable.java
+++ b/gateway-ha/src/test/java/io/trino/gateway/ha/TestObjectSerializable.java
@@ -123,9 +123,9 @@ void testQueryHistoryRequest()
             throws JsonProcessingException
     {
         assertThat(objectMapper.writeValueAsString(new QueryHistoryRequest(null, null, "user1", "url1", "query_id", "source")))
-                .contains(ImmutableList.of("\"page\":1", "\"size\":10", "user", "backendUrl", "queryId", "source"));
+                .contains(ImmutableList.of("\"page\":1", "\"size\":10", "user", "externalUrl", "queryId", "source"));
         assertThat(objectMapper.writeValueAsString(new QueryHistoryRequest(5, 6, "user1", "url1", "query_id", "source")))
-                .contains(ImmutableList.of("\"page\":5", "\"size\":6", "user", "backendUrl", "queryId", "source"));
+                .contains(ImmutableList.of("\"page\":5", "\"size\":6", "user", "externalUrl", "queryId", "source"));
     }
 
     @Test
diff --git a/webapp/src/components/history.tsx b/webapp/src/components/history.tsx
index fb89da100..efbd8addf 100644
--- a/webapp/src/components/history.tsx
+++ b/webapp/src/components/history.tsx
@@ -105,7 +105,7 @@ export function History() {
         <Form labelPosition="left"
           render={() => (
             <>
-              <Form.Select field="backendUrl" label='RoutedTo' style={{ width: 200 }} showClear placeholder={Locale.History.RoutedToTip}>
+              <Form.Select field="externalUrl" label='RoutedTo' style={{ width: 200 }} showClear placeholder={Locale.History.RoutedToTip}>
                 {backendData?.map(b => (
                   <Form.Select.Option key={b.externalUrl} value={b.externalUrl}>
                     <Tag color={'blue'} style={{ marginRight: '5px' }}>{backendMapping[b.externalUrl]}</Tag>