Skip to content

Commit 4c8031e

Browse files
committed
address comments
1 parent d0866bb commit 4c8031e

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
*/
1414
package io.trino.gateway.ha.router;
1515

16+
<<<<<<< HEAD
17+
=======
18+
import com.google.inject.AbstractModule;
19+
import com.google.inject.Guice;
20+
import com.google.inject.Injector;
21+
>>>>>>> c13a8db (address comments)
1622
import io.trino.gateway.ha.HaGatewayTestUtils;
1723
import io.trino.gateway.ha.config.DataStoreConfiguration;
1824
import io.trino.gateway.ha.persistence.DefaultJdbcPropertiesProvider;
@@ -48,8 +54,26 @@ void setUp()
4854
HaGatewayTestUtils.seedRequiredData(tempH2DbDir.getAbsolutePath());
4955
DataStoreConfiguration db = new DataStoreConfiguration(jdbcUrl, "sa",
5056
"sa", "org.h2.Driver", 4, false);
57+
<<<<<<< HEAD
5158
Jdbi jdbi = Jdbi.create(jdbcUrl, "sa", "sa");
5259
JdbcConnectionManager connectionManager = new JdbcConnectionManager(jdbi, db, new DefaultJdbcPropertiesProvider());
60+
=======
61+
HaGatewayConfiguration configuration = new HaGatewayConfiguration();
62+
configuration.setDataStore(db);
63+
AbstractModule testConfigModule = new AbstractModule() {
64+
@Override
65+
protected void configure()
66+
{
67+
bind(HaGatewayConfiguration.class)
68+
.toInstance(configuration);
69+
}
70+
};
71+
Injector injector = Guice.createInjector(
72+
testConfigModule,
73+
new RouterBaseModule());
74+
75+
JdbcConnectionManager connectionManager = injector.getInstance(JdbcConnectionManager.class);
76+
>>>>>>> c13a8db (address comments)
5377
super.resourceGroupManager = new HaResourceGroupsManager(connectionManager);
5478
}
5579

0 commit comments

Comments
 (0)