From 8fd4d4dddc1c3e04abf12e1ead07e16645b054ec Mon Sep 17 00:00:00 2001 From: Yuya Ebihara Date: Sat, 3 Feb 2024 09:17:39 +0900 Subject: [PATCH] Remove unused code --- .../dao/ExactMatchSourceSelectors.java | 16 -------------- .../router/TrinoQueueLengthRoutingTable.java | 12 ---------- .../ha/security/AuthorizationManager.java | 11 ---------- .../gateway/proxyserver/ProxyHandler.java | 22 ------------------- .../gateway/proxyserver/ProxyServer.java | 6 ----- .../gateway/ha/security/TestLbFilter.java | 3 --- 6 files changed, 70 deletions(-) diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ExactMatchSourceSelectors.java b/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ExactMatchSourceSelectors.java index 8403c03bd..6f58bcd57 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ExactMatchSourceSelectors.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ExactMatchSourceSelectors.java @@ -75,20 +75,4 @@ public static void create( model.insert(); } - - /** - * Update existing exactMatchSourceSelector. - */ - public static void update( - ExactMatchSourceSelectors model, ExactSelectorsDetail exactSelectorsDetail) - { - model.set(resourceGroupId, exactSelectorsDetail.getResourceGroupId()); - model.set(updateTime, exactSelectorsDetail.getUpdateTime()); - - model.set(source, exactSelectorsDetail.getSource()); - model.set(environment, exactSelectorsDetail.getEnvironment()); - model.set(queryType, exactSelectorsDetail.getQueryType()); - - model.saveIt(); - } } diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueueLengthRoutingTable.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueueLengthRoutingTable.java index 32a2b0d1e..f37d84b68 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueueLengthRoutingTable.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoQueueLengthRoutingTable.java @@ -292,18 +292,6 @@ public Map getInternalWeightedRoutingTable(String routingGroup) return routingTable; } - /** - * A convienience method to get a peak into the state of the routing manager. - */ - public Map getInternalClusterQueueLength(String routingGroup) - { - if (!clusterQueueLengthMap.containsKey(routingGroup)) { - return null; - } - - return clusterQueueLengthMap.get(routingGroup); - } - /** * Find the cluster with least user queue else fall back to overall cluster weight based routing. */ diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/security/AuthorizationManager.java b/gateway-ha/src/main/java/io/trino/gateway/ha/security/AuthorizationManager.java index fbcdea610..ae89c862a 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/security/AuthorizationManager.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/security/AuthorizationManager.java @@ -37,17 +37,6 @@ public AuthorizationManager(AuthorizationConfiguration configuration, } } - /** - * Searches in LDAP for what groups a user is member of. - * - * @param sub claim - * @return an optional membersOf for the input user - */ - public Optional searchMemberOf(String sub) - { - return Optional.empty(); - } - public Optional getPrivileges(String username) { //check the preset users diff --git a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyHandler.java b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyHandler.java index a1242aace..c0635b586 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyHandler.java +++ b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyHandler.java @@ -16,7 +16,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.eclipse.jetty.client.api.Request; -import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.util.Callback; import org.slf4j.Logger; @@ -28,7 +27,6 @@ import java.io.InputStreamReader; import java.nio.charset.Charset; import java.util.Arrays; -import java.util.Collection; import java.util.Enumeration; import java.util.zip.GZIPInputStream; @@ -83,26 +81,6 @@ protected void debugLogHeaders(HttpServletRequest request) } } - protected void debugLogHeaders(HttpServletResponse response) - { - if (log.isDebugEnabled()) { - log.debug("-------HttpServletResponse headers---------"); - Collection headers = response.getHeaderNames(); - for (String header : headers) { - log.debug(header + "->" + response.getHeader(header)); - } - } - } - - protected void debugLogHeaders(Request proxyRequest) - { - if (log.isDebugEnabled()) { - log.debug("-------Request proxyRequest headers---------"); - HttpFields httpFields = proxyRequest.getHeaders(); - log.debug(httpFields.toString()); - } - } - protected boolean isGZipEncoding(HttpServletResponse response) { String contentEncoding = response.getHeader(HttpHeader.CONTENT_ENCODING.toString()); diff --git a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServer.java b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServer.java index 1b3af532b..a984256a2 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServer.java +++ b/gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyServer.java @@ -14,7 +14,6 @@ package io.trino.gateway.proxyserver; import jakarta.servlet.DispatcherType; -import jakarta.servlet.Filter; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.proxy.ConnectHandler; import org.eclipse.jetty.server.HttpConfiguration; @@ -130,11 +129,6 @@ private void setupContext(ProxyServerConfiguration config) this.context.addFilter(RequestFilter.class, "/*", EnumSet.allOf(DispatcherType.class)); } - public void addFilter(Class filterClass, String pathSpec) - { - this.context.addFilter(filterClass, pathSpec, EnumSet.allOf(DispatcherType.class)); - } - public void start() { try { diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java index 437c3e11f..365e560c2 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java +++ b/gateway-ha/src/test/java/io/trino/gateway/ha/security/TestLbFilter.java @@ -61,9 +61,6 @@ public void setup() // Set authorization manager with membership authorizationManager = Mockito.mock(AuthorizationManager.class); - Mockito - .when(authorizationManager.searchMemberOf(USER)) - .thenReturn(MEMBER_OF); Mockito .when(authorizationManager.getPrivileges(USER)) .thenReturn(MEMBER_OF);