diff --git a/docs/installation.md b/docs/installation.md index a84e4d811..51b171b35 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -70,7 +70,7 @@ Trino Gateway requires a MySQL or PostgreSQL database. Use the following scripts to initialize the database: -* [gateway-ha-persistence.sql](../gateway-ha/src/main/resources/gateway-ha-persistence.sql) for MySQL +* [gateway-ha-persistence-mysql.sql](../gateway-ha/src/main/resources/gateway-ha-persistence-mysql.sql) for MySQL * [gateway-ha-persistence-postgres.sql](../gateway-ha/src/main/resources/gateway-ha-persistence-postgres.sql) for PostgreSQL The files are also included in the JAR file. 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 6f58bcd57..772626797 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 @@ -24,7 +24,7 @@ import static io.trino.gateway.ha.router.ResourceGroupsManager.ExactSelectorsDetail; @CompositePK({"environment", "source", "query_type"}) -@Table("exact_match_source_selectors") // located in gateway-ha-persistence.sql +@Table("exact_match_source_selectors") // located in gateway-ha-persistence-*.sql @Cached public class ExactMatchSourceSelectors extends Model diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ResourceGroups.java b/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ResourceGroups.java index c27ad439b..27f2963a6 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ResourceGroups.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/ResourceGroups.java @@ -28,7 +28,7 @@ @BelongsTo(parent = ResourceGroups.class, foreignKeyName = "parent") @HasMany(child = ResourceGroups.class, foreignKeyName = "parent") @IdName("resource_group_id") -@Table("resource_groups") // located in gateway-ha-persistence.sql +@Table("resource_groups") // located in gateway-ha-persistence-*.sql @Cached public class ResourceGroups extends Model diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/Selectors.java b/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/Selectors.java index ae3fba2cd..71b56aad5 100644 --- a/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/Selectors.java +++ b/gateway-ha/src/main/java/io/trino/gateway/ha/persistence/dao/Selectors.java @@ -26,7 +26,7 @@ @BelongsTo(parent = ResourceGroups.class, foreignKeyName = "resource_group_id") @IdName("resource_group_id") -@Table("selectors") // located in gateway-ha-persistence.sql +@Table("selectors") // located in gateway-ha-persistence-*.sql @Cached public class Selectors extends Model diff --git a/gateway-ha/src/main/resources/gateway-ha-persistence.sql b/gateway-ha/src/main/resources/gateway-ha-persistence-mysql.sql similarity index 100% rename from gateway-ha/src/main/resources/gateway-ha-persistence.sql rename to gateway-ha/src/main/resources/gateway-ha-persistence-mysql.sql diff --git a/gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java b/gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java index c5f27e60d..3b8a2d375 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java +++ b/gateway-ha/src/test/java/io/trino/gateway/TrinoGatewayRunner.java @@ -51,8 +51,8 @@ public static void main(String[] args) mysql.withUsername("root"); mysql.withPassword("root123"); mysql.withDatabaseName("trinogateway"); - mysql.withCopyFileToContainer(forClasspathResource("gateway-ha-persistence.sql"), "/docker-entrypoint-initdb.d/1-gateway-ha-persistence.sql"); - mysql.withCopyFileToContainer(forClasspathResource("add_backends.sql"), "/docker-entrypoint-initdb.d/2-add_backends.sql"); + mysql.withCopyFileToContainer(forClasspathResource("gateway-ha-persistence-mysql.sql"), "/docker-entrypoint-initdb.d/1-gateway-ha-persistence-mysql.sql"); + mysql.withCopyFileToContainer(forClasspathResource("add_backends_mysql.sql"), "/docker-entrypoint-initdb.d/2-add_backends_mysql.sql"); mysql.setPortBindings(List.of("3306:3306")); mysql.start(); diff --git a/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java b/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java index 4ba1534d8..9daa55053 100644 --- a/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java +++ b/gateway-ha/src/test/java/io/trino/gateway/ha/HaGatewayTestUtils.java @@ -53,7 +53,7 @@ public static void seedRequiredData(TestConfig testConfig) Jdbi jdbi = Jdbi.create(jdbcUrl, "sa", "sa"); JdbcConnectionManager connectionManager = new JdbcConnectionManager(jdbi, db); connectionManager.open(); - Base.exec(HaGatewayTestUtils.getResourceFileContent("gateway-ha-persistence.sql")); + Base.exec(HaGatewayTestUtils.getResourceFileContent("gateway-ha-persistence-mysql.sql")); connectionManager.close(); } diff --git a/gateway-ha/src/test/resources/add_backends.sql b/gateway-ha/src/test/resources/add_backends_mysql.sql similarity index 100% rename from gateway-ha/src/test/resources/add_backends.sql rename to gateway-ha/src/test/resources/add_backends_mysql.sql