rebase to master

apache · Jul 23, 2023 · db64bd9 · db64bd9
1 parent 9b6fac7
commit db64bd9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/submarine-server/server-core/pom.xml b/submarine-server/server-core/pom.xml
@@ -520,6 +520,19 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-core</artifactId>
+      <version>7.15.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.194</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/SubmarineServer.java
@@ -20,6 +20,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.PropertyConfigurator;
+import org.apache.submarine.server.database.initialization.DatabaseMetadataService;
 import org.apache.submarine.server.database.utils.MyBatisUtil;
 import org.apache.submarine.server.rest.provider.YamlEntityProvider;
 import org.apache.submarine.server.security.SecurityFactory;
@@ -136,8 +137,11 @@ protected void configure() {
     // setupClusterServer();
 
     setupWebSocketServer(webApp, conf, sharedServiceLocator);
-    startServer();
 
+    // init database metadata
+    new DatabaseMetadataService().initDatabaseMetadata();
+
+    startServer();
   }
 
   @Inject