Remove unused methods for routers

Author: vishalya

gateway-ha/src/main/java/io/trino/gateway/ha/router/QueryCountBasedRouter.java

@@ -243,20 +243,7 @@ private void updateLocalStats(LocalStats stats, String user)
         stats.runningQueryCount(stats.runningQueryCount() + 1);
     }
 
-    private synchronized Optional<String> getBackendForRoutingGroup(String routingGroup, String user)
-    {
-        Optional<LocalStats> cluster = getClusterToRoute(user, routingGroup);
-        cluster.ifPresent(c -> updateLocalStats(c, user));
-        return cluster.map(c -> c.proxyTo());
-    }
-
-    @Override
-    public String provideDefaultCluster(String user)
-    {
-        return getBackendForRoutingGroup(defaultRoutingGroup, user).orElseThrow(() -> new RouterException("did not find any cluster for the default routing group: " + defaultRoutingGroup));
-    }
-
-    public Optional<ProxyBackendConfiguration> getBackendConfigurationForRoutingGroup(String routingGroup, String user)
+    public synchronized Optional<ProxyBackendConfiguration> getBackendConfigurationForRoutingGroup(String routingGroup, String user)
     {
         Optional<LocalStats> localStats = getClusterToRoute(user, routingGroup);
         localStats.ifPresent(stats -> updateLocalStats(stats, user));
@@ -271,13 +258,6 @@ public ProxyBackendConfiguration provideBackendConfiguration(String routingGroup
                         .orElseThrow(() -> new RouterException("did not find any cluster for the default routing group: " + defaultRoutingGroup)));
     }
 
-    @Override
-    public String provideClusterForRoutingGroup(String routingGroup, String user)
-    {
-        return getBackendForRoutingGroup(routingGroup, user)
-                .orElse(provideDefaultCluster(user));
-    }
-
     @Override
     public synchronized void updateBackEndStats(List<ClusterStats> stats)
     {

gateway-ha/src/main/java/io/trino/gateway/ha/router/RoutingManager.java

@@ -136,11 +136,6 @@ private ProxyBackendConfiguration provideDefaultBackendConfiguration()
         return backends.get(backendId);
     }
 
-    public String provideDefaultCluster(String user)
-    {
-        return provideDefaultBackendConfiguration().getProxyTo();
-    }
-
     /**
      * Performs routing to a given cluster group. This falls back to a default backend, if no scheduled
      * backend is found.
@@ -157,11 +152,6 @@ public ProxyBackendConfiguration provideBackendConfiguration(String routingGroup
         return backends.get(backendId);
     }
 
-    public String provideClusterForRoutingGroup(String routingGroup, String user)
-    {
-        return provideBackendConfiguration(routingGroup, user).getProxyTo();
-    }
-
     /**
      * Performs cache look up, if a backend not found, it checks with all backends and tries to find
      * out which backend has info about given query id.

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestQueryCountBasedRouter.java

@@ -16,6 +16,7 @@
 import com.google.common.collect.ImmutableList;
 import io.trino.gateway.ha.clustermonitor.ClusterStats;
 import io.trino.gateway.ha.clustermonitor.TrinoStatus;
+import io.trino.gateway.ha.config.ProxyBackendConfiguration;
 import io.trino.gateway.ha.config.RoutingConfiguration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +40,7 @@ final class TestQueryCountBasedRouter
     static final int SAME_QUERY_COUNT = 5;
     QueryCountBasedRouter queryCountBasedRouter;
     ImmutableList<ClusterStats> clusters;
+    RoutingConfiguration routingConfiguration = new RoutingConfiguration();
 
     TestQueryCountBasedRouter()
     {
@@ -156,7 +158,6 @@ public void init()
                 .addAll(getClusterStatsList("etl"))
                 .build();
 
-        RoutingConfiguration routingConfiguration = new RoutingConfiguration();
         queryCountBasedRouter = new QueryCountBasedRouter(null, null, routingConfiguration);
         queryCountBasedRouter.updateBackEndStats(clusters);
     }
@@ -166,7 +167,8 @@ void testUserWithSameNoOfQueuedQueries()
     {
         // The user u1 has same number of queries queued on each cluster
         // The query needs to be routed to cluster with least number of queries running
-        String proxyTo = queryCountBasedRouter.provideClusterForRoutingGroup("etl", "u1");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration("etl", "u1");
+        String proxyTo = proxyConfig.getProxyTo();
 
         assertThat(proxyTo).isEqualTo(BACKEND_URL_3);
         assertThat(proxyTo).isNotEqualTo(BACKEND_URL_UNHEALTHY);
@@ -181,7 +183,8 @@ void testUserWithSameNoOfQueuedQueries()
         assertThat(c3Stats.userQueuedCount().getOrDefault("u1", 0))
                 .isEqualTo(6);
 
-        proxyTo = queryCountBasedRouter.provideClusterForRoutingGroup("etl", "u1");
+        proxyConfig = queryCountBasedRouter.provideBackendConfiguration("etl", "u1");
+        proxyTo = proxyConfig.getProxyTo();
 
         assertThat(proxyTo).isEqualTo(BACKEND_URL_1);
         assertThat(proxyTo).isNotEqualTo(BACKEND_URL_UNHEALTHY);
@@ -192,31 +195,39 @@ void testUserWithDifferentQueueLengthUser1()
     {
         // The user u2 has different number of queries queued on each cluster
         // The query needs to be routed to cluster with least number of queued for that user
-        String proxyTo = queryCountBasedRouter.provideDefaultCluster("u2");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration(routingConfiguration.getDefaultRoutingGroup(), "u2");
+        String proxyTo = proxyConfig.getProxyTo();
+
         assertThat(BACKEND_URL_2).isEqualTo(proxyTo);
         assertThat(BACKEND_URL_UNHEALTHY).isNotEqualTo(proxyTo);
     }
 
     @Test
     void testUserWithDifferentQueueLengthUser2()
     {
-        String proxyTo = queryCountBasedRouter.provideDefaultCluster("u3");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration(routingConfiguration.getDefaultRoutingGroup(), "u3");
+        String proxyTo = proxyConfig.getProxyTo();
+
         assertThat(BACKEND_URL_1).isEqualTo(proxyTo);
         assertThat(BACKEND_URL_UNHEALTHY).isNotEqualTo(proxyTo);
     }
 
     @Test
     void testUserWithNoQueuedQueries()
     {
-        String proxyTo = queryCountBasedRouter.provideDefaultCluster("u101");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration(routingConfiguration.getDefaultRoutingGroup(), "u101");
+        String proxyTo = proxyConfig.getProxyTo();
+
         assertThat(BACKEND_URL_3).isEqualTo(proxyTo);
     }
 
     @Test
     void testAdhocRoutingGroupFailOver()
     {
         // The ETL routing group doesn't exist
-        String proxyTo = queryCountBasedRouter.provideClusterForRoutingGroup("NonExisting", "u1");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration("NonExisting", "u1");
+        String proxyTo = proxyConfig.getProxyTo();
+
         assertThat(BACKEND_URL_3).isEqualTo(proxyTo);
         assertThat(BACKEND_URL_UNHEALTHY).isNotEqualTo(proxyTo);
     }
@@ -231,7 +242,9 @@ void testClusterWithLeastQueueCount()
                 .build();
         queryCountBasedRouter.updateBackEndStats(clusters);
 
-        String proxyTo = queryCountBasedRouter.provideClusterForRoutingGroup("NonExisting", "u1");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration("NonExisting", "u1");
+        String proxyTo = proxyConfig.getProxyTo();
+
         assertThat(BACKEND_URL_4).isEqualTo(proxyTo);
         assertThat(BACKEND_URL_UNHEALTHY).isNotEqualTo(proxyTo);
     }
@@ -248,7 +261,9 @@ void testClusterWithLeastRunningCount()
 
         queryCountBasedRouter.updateBackEndStats(clusters);
 
-        String proxyTo = queryCountBasedRouter.provideClusterForRoutingGroup("NonExisting", "u1");
+        ProxyBackendConfiguration proxyConfig = queryCountBasedRouter.provideBackendConfiguration("NonExisting", "u1");
+        String proxyTo = proxyConfig.getProxyTo();
+
         assertThat(BACKEND_URL_5).isEqualTo(proxyTo);
         assertThat(BACKEND_URL_UNHEALTHY).isNotEqualTo(proxyTo);
     }

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingManagerNotFound.java

@@ -40,7 +40,7 @@ public TestRoutingManagerNotFound()
     void testNonExistentRoutingGroupThrowsNotFoundException()
     {
         // When requesting a non-existent routing group, an IllegalStateException should be thrown
-        assertThatThrownBy(() -> routingManager.provideClusterForRoutingGroup("non_existent_group", "user"))
+        assertThatThrownBy(() -> routingManager.provideBackendConfiguration("non_existent_group", "user"))
                 .isInstanceOf(IllegalStateException.class)
                 .hasMessageContaining("Number of active backends found zero");
     }

gateway-ha/src/test/java/io/trino/gateway/ha/router/TestStochasticRoutingManager.java

@@ -69,7 +69,7 @@ void testAddMockBackends()
             haRoutingManager.updateBackEndHealth(backend, TrinoStatus.UNHEALTHY);
         }
 
-        assertThat(haRoutingManager.provideClusterForRoutingGroup(groupName, ""))
+        assertThat(haRoutingManager.provideBackendConfiguration(groupName, "").getProxyTo())
                 .isEqualTo("test_group0.trino.example.com");
     }
 }