Allow using custom catalog store with TestingTrinoServer

hovaesco · Aug 27, 2024 · 0c5b0cf · 0c5b0cf
1 parent 2d55fdb
commit 0c5b0cf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java b/core/trino-main/src/main/java/io/trino/server/testing/TestingTrinoServer.java
@@ -276,7 +276,10 @@ private TestingTrinoServer(
 
         if (coordinator) {
             if (catalogMangerKind == CatalogMangerKind.DYNAMIC) {
-                serverProperties.put("catalog.store", "memory");
+                Optional<String> catalogStore = Optional.ofNullable(properties.get("catalog.store"));
+                if (catalogStore.isEmpty()) {
+                    serverProperties.put("catalog.store", "memory");
+                }
             }
             serverProperties.put("failure-detector.enabled", "false");
 

diff --git a/core/trino-main/src/test/java/io/trino/server/testing/TestTestingTrinoServer.java b/core/trino-main/src/test/java/io/trino/server/testing/TestTestingTrinoServer.java
@@ -16,6 +16,7 @@
 import com.google.inject.Key;
 import io.trino.connector.ConnectorServicesProvider;
 import io.trino.connector.CoordinatorDynamicCatalogManager;
+import io.trino.connector.FileCatalogStore;
 import io.trino.connector.InMemoryCatalogStore;
 import io.trino.connector.StaticCatalogManager;
 import io.trino.connector.WorkerDynamicCatalogManager;
@@ -63,4 +64,26 @@ void testSetCatalogManagementToStatic()
                     .isInstanceOf(StaticCatalogManager.class);
         }
     }
+
+    @Test
+    void testDefaultCatalogStore()
+            throws IOException
+    {
+        try (TestingTrinoServer server = TestingTrinoServer.builder().build()) {
+            assertThat(server.getInstance(Key.get(CatalogStore.class)))
+                    .isInstanceOf(InMemoryCatalogStore.class);
+        }
+    }
+
+    @Test
+    void testExplicitCatalogStore()
+            throws IOException
+    {
+        try (TestingTrinoServer server = TestingTrinoServer.builder()
+                .addProperty("catalog.store", "file")
+                .build()) {
+            assertThat(server.getInstance(Key.get(CatalogStore.class)))
+                    .isInstanceOf(FileCatalogStore.class);
+        }
+    }
 }