add enmu DatastoreBackend, add javadoc

Author: felicity3786

gateway-ha/src/main/java/io/trino/gateway/ha/config/DataStoreBackend.java

@@ -0,0 +1,21 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.gateway.ha.config;
+
+public enum DataStoreBackend {
+    ORACLE,
+    MYSQL,
+    POSTGRES,
+    H2
+}

gateway-ha/src/main/java/io/trino/gateway/ha/config/DataStoreConfiguration.java

@@ -13,6 +13,8 @@
  */
 package io.trino.gateway.ha.config;
 
+import java.util.Locale;
+
 public class DataStoreConfiguration
 {
     private String jdbcUrl;
@@ -21,6 +23,7 @@ public class DataStoreConfiguration
     private String driver;
     private Integer queryHistoryHoursRetention = 4;
     private boolean runMigrationsEnabled = true;
+    private DataStoreBackend dataStoreBackendType;
 
     // TODO: Refactor to decouple DataStoreConfiguration from a specific
     //  database implementation after adopting the Airlift configuration framework (https://github.com/trinodb/trino-gateway/issues/378)
@@ -107,4 +110,34 @@ public void setMysqlConfiguration(MysqlConfiguration mysqlConfig)
     {
         this.mysqlConfiguration = mysqlConfig;
     }
+
+    public DataStoreBackend getDataStoreBackendType()
+    {
+        if (dataStoreBackendType != null) {
+            return dataStoreBackendType;
+        }
+
+        if (jdbcUrl != null) {
+            String url = jdbcUrl.toLowerCase(Locale.ROOT);
+            if (url.startsWith("jdbc:oracle:")) {
+                return DataStoreBackend.ORACLE;
+            }
+            if (url.startsWith("jdbc:mysql:")) {
+                return DataStoreBackend.MYSQL;
+            }
+            if (url.startsWith("jdbc:postgresql:")) {
+                return DataStoreBackend.POSTGRES;
+            }
+            if (url.startsWith("jdbc:h2:")) {
+                return DataStoreBackend.H2;
+            }
+        }
+
+        throw new IllegalStateException("Cannot infer DataStoreBackend from jdbcUrl: " + jdbcUrl);
+    }
+
+    public void setDataStoreBackendType(DataStoreBackend backendType)
+    {
+        this.dataStoreBackendType = backendType;
+    }
 }

gateway-ha/src/main/java/io/trino/gateway/ha/config/HaGatewayConfiguration.java

@@ -43,7 +43,6 @@ public class HaGatewayConfiguration
     private List<String> statementPaths = ImmutableList.of(V1_STATEMENT_PATH);
     private boolean includeClusterHostInResponse;
     private ProxyResponseConfiguration proxyResponseConfiguration = new ProxyResponseConfiguration();
-    private boolean oracleBackend;
 
     private RequestAnalyzerConfig requestAnalyzerConfig = new RequestAnalyzerConfig();
 
@@ -298,14 +297,4 @@ public HaGatewayConfigurationException(String message)
             super(message);
         }
     }
-
-    public boolean isOracleBackend()
-    {
-        return oracleBackend;
-    }
-
-    public void setOracleBackend(boolean oracleBackend)
-    {
-        this.oracleBackend = oracleBackend;
-    }
 }

gateway-ha/src/main/java/io/trino/gateway/ha/persistence/BasicJdbcPropertiesProvider.java

@@ -17,6 +17,16 @@
 
 import java.util.Properties;
 
+/**
+ * Default JDBC properties provider used as a fallback when no database-specific
+ * {@link JdbcPropertiesProvider} supports the given {@link DataStoreConfiguration}.
+ *
+ * <p>This provider simply sets the basic "user" and "password" properties
+ * and should always be the last provider in the list of available providers.
+ *
+ * <p>If a more specific provider (e.g., for MySQL, Oracle, etc.) supports the configuration,
+ * it should be preferred over this basic fallback.
+ */
 public class BasicJdbcPropertiesProvider
         implements JdbcPropertiesProvider
 {

gateway-ha/src/main/java/io/trino/gateway/ha/persistence/JdbcConnectionManager.java

@@ -68,6 +68,11 @@ public Jdbi getJdbi(@Nullable String routingGroupDatabase)
                 .registerRowMapper(new RecordAndAnnotatedConstructorMapper());
     }
 
+    public DataStoreConfiguration getConfiguration()
+    {
+        return configuration;
+    }
+
     private String buildJdbcUrl(@Nullable String routingGroupDatabase)
     {
         String jdbcUrl = configuration.getJdbcUrl();

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

@@ -15,7 +15,8 @@
 
 import com.google.common.base.Strings;
 import com.google.inject.Inject;
-import io.trino.gateway.ha.config.HaGatewayConfiguration;
+import io.trino.gateway.ha.config.DataStoreBackend;
+import io.trino.gateway.ha.config.DataStoreConfiguration;
 import io.trino.gateway.ha.domain.TableData;
 import io.trino.gateway.ha.domain.request.QueryHistoryRequest;
 import io.trino.gateway.ha.domain.response.DistributionResponse;
@@ -40,13 +41,14 @@ public class HaQueryHistoryManager
     private static final int FIRST_PAGE_NO = 1;
 
     private final QueryHistoryDao dao;
-    private final boolean isOracleBackend;
+    private final DataStoreBackend backend;
 
     @Inject
-    public HaQueryHistoryManager(Jdbi jdbi, HaGatewayConfiguration configuration)
+    public HaQueryHistoryManager(Jdbi jdbi, DataStoreConfiguration configuration)
     {
+        requireNonNull(configuration, "DataStoreConfiguration is null");
         dao = requireNonNull(jdbi, "jdbi is null").onDemand(QueryHistoryDao.class);
-        this.isOracleBackend = configuration.isOracleBackend();
+        this.backend = configuration.getDataStoreBackendType();
     }
 
     @Override
@@ -72,10 +74,10 @@ public List<QueryDetail> fetchQueryHistory(Optional<String> user)
     {
         List<QueryHistory> histories;
         if (user.isPresent()) {
-            histories = dao.findRecentQueriesByUserName(user.orElseThrow(), isOracleBackend);
+            histories = dao.findRecentQueriesByUserName(user.orElseThrow(), backend == DataStoreBackend.ORACLE);
         }
         else {
-            histories = dao.findRecentQueries(isOracleBackend);
+            histories = dao.findRecentQueries(backend == DataStoreBackend.ORACLE);
         }
         return upcast(histories);
     }

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

@@ -14,7 +14,6 @@
 package io.trino.gateway.ha.router;
 
 import io.trino.gateway.ha.config.DataStoreConfiguration;
-import io.trino.gateway.ha.config.HaGatewayConfiguration;
 import io.trino.gateway.ha.domain.response.DistributionResponse;
 import io.trino.gateway.ha.persistence.FlywayMigration;
 import io.trino.gateway.ha.persistence.JdbcConnectionManager;
@@ -51,9 +50,7 @@ void setUp()
                 true);
         FlywayMigration.migrate(config);
         JdbcConnectionManager jdbcConnectionManager = createTestingJdbcConnectionManager(container, config);
-        HaGatewayConfiguration haGatewayConfiguration = new HaGatewayConfiguration();
-        haGatewayConfiguration.setOracleBackend(container.getJdbcUrl().startsWith("jdbc:oracle"));
-        queryHistoryManager = new HaQueryHistoryManager(jdbcConnectionManager.getJdbi(), haGatewayConfiguration);
+        queryHistoryManager = new HaQueryHistoryManager(jdbcConnectionManager.getJdbi(), config);
     }
 
     @AfterAll

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

@@ -14,7 +14,6 @@
 package io.trino.gateway.ha.router;
 
 import io.trino.gateway.ha.clustermonitor.TrinoStatus;
-import io.trino.gateway.ha.config.HaGatewayConfiguration;
 import io.trino.gateway.ha.config.ProxyBackendConfiguration;
 import io.trino.gateway.ha.persistence.JdbcConnectionManager;
 import org.junit.jupiter.api.BeforeAll;
@@ -37,7 +36,7 @@ void setUp()
     {
         JdbcConnectionManager connectionManager = createTestingJdbcConnectionManager();
         backendManager = new HaGatewayManager(connectionManager.getJdbi());
-        historyManager = new HaQueryHistoryManager(connectionManager.getJdbi(), new HaGatewayConfiguration());
+        historyManager = new HaQueryHistoryManager(connectionManager.getJdbi(), connectionManager.getConfiguration());
         haRoutingManager = new StochasticRoutingManager(backendManager, historyManager);
     }