This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 6840b5dc4a [MINOR] improvement(core): use version reference for
version of current database script (#6914)
6840b5dc4a is described below
commit 6840b5dc4aa9d4929000bea2960f9cc47831440b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Apr 14 12:19:44 2025 +0800
[MINOR] improvement(core): use version reference for version of current
database script (#6914)
### What changes were proposed in this pull request?
use version reference for version of current database script
### Why are the changes needed?
when updating the script version, we only need to modify the ref now
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
CI pass
Co-authored-by: mchades <[email protected]>
---
.../apache/gravitino/config/ConfigConstants.java | 3 +++
.../storage/relational/database/H2Database.java | 8 +++++++-
.../storage/relational/TestJDBCBackend.java | 22 ----------------------
.../relational/service/TestFilesetMetaService.java | 3 ++-
.../gravitino/integration/test/util/BaseIT.java | 5 +++--
5 files changed, 15 insertions(+), 26 deletions(-)
diff --git
a/core/src/main/java/org/apache/gravitino/config/ConfigConstants.java
b/core/src/main/java/org/apache/gravitino/config/ConfigConstants.java
index 7b63b3c859..904c2af3e5 100644
--- a/core/src/main/java/org/apache/gravitino/config/ConfigConstants.java
+++ b/core/src/main/java/org/apache/gravitino/config/ConfigConstants.java
@@ -73,4 +73,7 @@ public final class ConfigConstants {
/** The version number for the 0.9.0 release. */
public static final String VERSION_0_9_0 = "0.9.0";
+
+ /** The current version of backend storage initialization script. */
+ public static final String CURRENT_SCRIPT_VERSION = VERSION_0_8_0;
}
diff --git
a/core/src/main/java/org/apache/gravitino/storage/relational/database/H2Database.java
b/core/src/main/java/org/apache/gravitino/storage/relational/database/H2Database.java
index bf3b55ad2c..da6e7a6356 100644
---
a/core/src/main/java/org/apache/gravitino/storage/relational/database/H2Database.java
+++
b/core/src/main/java/org/apache/gravitino/storage/relational/database/H2Database.java
@@ -30,6 +30,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.gravitino.Config;
import org.apache.gravitino.Configs;
+import org.apache.gravitino.config.ConfigConstants;
import org.apache.gravitino.storage.relational.JDBCDatabase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +59,12 @@ public class H2Database implements JDBCDatabase {
Statement statement = connection.createStatement()) {
String sqlContent =
FileUtils.readFileToString(
- new File(gravitinoHome + "/scripts/h2/schema-0.8.0-h2.sql"),
StandardCharsets.UTF_8);
+ new File(
+ gravitinoHome
+ + "/scripts/h2/schema-"
+ + ConfigConstants.CURRENT_SCRIPT_VERSION
+ + "-h2.sql"),
+ StandardCharsets.UTF_8);
statement.execute(sqlContent);
} catch (Exception e) {
diff --git
a/core/src/test/java/org/apache/gravitino/storage/relational/TestJDBCBackend.java
b/core/src/test/java/org/apache/gravitino/storage/relational/TestJDBCBackend.java
index 332c082e77..9f8ce8427d 100644
---
a/core/src/test/java/org/apache/gravitino/storage/relational/TestJDBCBackend.java
+++
b/core/src/test/java/org/apache/gravitino/storage/relational/TestJDBCBackend.java
@@ -40,7 +40,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.sql.Connection;
@@ -52,9 +51,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.UUID;
-import org.apache.commons.io.IOUtils;
import org.apache.gravitino.Catalog;
import org.apache.gravitino.Config;
import org.apache.gravitino.Configs;
@@ -159,25 +156,6 @@ public class TestJDBCBackend {
truncateAllTables();
}
- private static void prepareJdbcTable() {
- // Read the ddl sql to create table
- String scriptPath = "h2/schema-0.8.0-h2.sql";
- try (SqlSession sqlSession =
-
SqlSessionFactoryHelper.getInstance().getSqlSessionFactory().openSession(true);
- Connection connection = sqlSession.getConnection();
- Statement statement = connection.createStatement()) {
- StringBuilder ddlBuilder = new StringBuilder();
- IOUtils.readLines(
- Objects.requireNonNull(
-
TestJDBCBackend.class.getClassLoader().getResourceAsStream(scriptPath)),
- StandardCharsets.UTF_8)
- .forEach(line -> ddlBuilder.append(line).append("\n"));
- statement.execute(ddlBuilder.toString());
- } catch (Exception e) {
- throw new IllegalStateException("Create tables failed", e);
- }
- }
-
private static void truncateAllTables() {
try (SqlSession sqlSession =
SqlSessionFactoryHelper.getInstance().getSqlSessionFactory().openSession(true))
{
diff --git
a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
index 96ac1a5667..ac25fb939e 100644
---
a/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
+++
b/core/src/test/java/org/apache/gravitino/storage/relational/service/TestFilesetMetaService.java
@@ -93,7 +93,8 @@ public class TestFilesetMetaService {
new File(
gravitinoHome
+ String.format(
- "/scripts/mysql/schema-%s-mysql.sql",
ConfigConstants.VERSION_0_8_0)),
+ "/scripts/mysql/schema-%s-mysql.sql",
+ ConfigConstants.CURRENT_SCRIPT_VERSION)),
"UTF-8");
String[] initMySQLBackendSqls =
Arrays.stream(mysqlContent.split(";"))
diff --git
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java
index 27e8abf5a2..04d9bdff32 100644
---
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java
+++
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/BaseIT.java
@@ -196,7 +196,7 @@ public class BaseIT {
gravitinoHome
+ String.format(
"/scripts/postgresql/schema-%s-postgresql.sql",
- ConfigConstants.VERSION_0_8_0)),
+ ConfigConstants.CURRENT_SCRIPT_VERSION)),
"UTF-8");
String[] initPGBackendSqls =
@@ -241,7 +241,8 @@ public class BaseIT {
new File(
gravitinoHome
+ String.format(
- "/scripts/mysql/schema-%s-mysql.sql",
ConfigConstants.VERSION_0_8_0)),
+ "/scripts/mysql/schema-%s-mysql.sql",
+ ConfigConstants.CURRENT_SCRIPT_VERSION)),
"UTF-8");
String[] initMySQLBackendSqls =
