This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e10cfb75914 Refactor impls of DialectSystemDatabase (#37072)
e10cfb75914 is described below
commit e10cfb75914a6d8566eb9b54b7031fd1113faf1a
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Nov 12 00:11:03 2025 +0800
Refactor impls of DialectSystemDatabase (#37072)
* Refactor impls of DialectSystemDatabase
* Refactor impls of DialectSystemDatabase
* Refactor impls of DialectSystemDatabase
---
.../metadata/database/system/FirebirdSystemDatabase.java | 3 +--
.../metadata/database/system/FirebirdSystemDatabaseTest.java | 11 +++++------
.../mysql/metadata/database/system/MySQLSystemDatabase.java | 4 ++--
.../metadata/database/system/MySQLSystemDatabaseTest.java | 4 ++--
.../metadata/database/system/OpenGaussSystemDatabase.java | 5 ++---
.../metadata/database/system/OpenGaussSystemDatabaseTest.java | 5 ++---
.../metadata/database/system/PostgreSQLSystemDatabase.java | 3 +--
.../database/system/PostgreSQLSystemDatabaseTest.java | 3 +--
8 files changed, 16 insertions(+), 22 deletions(-)
diff --git
a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
index 832b93d3b22..bcad4fae1a6 100644
---
a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
+++
b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.database.connector.core.metadata.database.syste
import java.util.AbstractMap;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -31,7 +30,7 @@ import java.util.Set;
*/
public final class FirebirdSystemDatabase implements DialectSystemDatabase {
- private static final Collection<String> SYSTEM_SCHEMAS = new
HashSet<>(Collections.singletonList("system_tables"));
+ private static final Collection<String> SYSTEM_SCHEMAS =
Collections.singleton("system_tables");
private static final Map<String, Collection<String>>
SYSTEM_DATABASE_SCHEMA_MAP = new AbstractMap<String, Collection<String>>() {
diff --git
a/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java
b/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java
index 6df84950601..4efc1c6d550 100644
---
a/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java
+++
b/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
import java.util.Collections;
-import java.util.HashSet;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,15 +32,15 @@ class FirebirdSystemDatabaseTest {
private final DialectSystemDatabase systemDatabase =
DatabaseTypedSPILoader.getService(DialectSystemDatabase.class,
TypedSPILoader.getService(DatabaseType.class, "Firebird"));
- @Test
- void assertGetSystemSchemas() {
- assertThat(systemDatabase.getSystemSchemas(), is(new
HashSet<>(Collections.singletonList("system_tables"))));
- }
-
@Test
void assertGetSystemSchemasByDatabaseName() {
assertThat(systemDatabase.getSystemDatabaseSchemaMap().get("sharding_db"),
is(Collections.singleton("system_tables")));
assertThat(systemDatabase.getSystemDatabaseSchemaMap().get("logic_db"),
is(Collections.singleton("system_tables")));
assertThat(systemDatabase.getSystemDatabaseSchemaMap().get("firebird"),
is(Collections.singleton("system_tables")));
}
+
+ @Test
+ void assertGetSystemSchemas() {
+ assertThat(systemDatabase.getSystemSchemas(),
is(Collections.singleton("system_tables")));
+ }
}
diff --git
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabase.java
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabase.java
index 02839b8e82c..4dea28d60f9 100644
---
a/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabase.java
+++
b/database/connector/dialect/mysql/src/main/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabase.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.database.connector.core.metadata.database.syste
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
/**
@@ -29,7 +29,7 @@ import java.util.Map;
*/
public final class MySQLSystemDatabase implements DialectSystemDatabase {
- private static final Map<String, Collection<String>>
SYSTEM_DATABASE_SCHEMA_MAP = new HashMap<>();
+ private static final Map<String, Collection<String>>
SYSTEM_DATABASE_SCHEMA_MAP = new LinkedHashMap<>();
static {
SYSTEM_DATABASE_SCHEMA_MAP.put("information_schema",
Collections.singleton("information_schema"));
diff --git
a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabaseTest.java
b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabaseTest.java
index ed2caa7a442..210e7669a58 100644
---
a/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabaseTest.java
+++
b/database/connector/dialect/mysql/src/test/java/org/apache/shardingsphere/database/connector/mysql/metadata/database/system/MySQLSystemDatabaseTest.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -45,6 +45,6 @@ class MySQLSystemDatabaseTest {
@Test
void assertGetSystemSchemas() {
- assertThat(systemDatabase.getSystemSchemas(), is(new
HashSet<>(Arrays.asList("information_schema", "performance_schema", "mysql",
"sys", "shardingsphere"))));
+ assertThat(systemDatabase.getSystemSchemas(), is(new
LinkedHashSet<>(Arrays.asList("information_schema", "performance_schema",
"mysql", "sys", "shardingsphere"))));
}
}
diff --git
a/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabase.java
b/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabase.java
index a4952b0e844..07548b3013d 100644
---
a/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabase.java
+++
b/database/connector/dialect/opengauss/src/main/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabase.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.database.connector.core.metadata.database.syste
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
/**
@@ -32,8 +31,8 @@ public final class OpenGaussSystemDatabase implements
DialectSystemDatabase {
private static final Map<String, Collection<String>>
SYSTEM_DATABASE_SCHEMA_MAP = new HashMap<>();
- private static final Collection<String> SYSTEM_SCHEMAS = new
HashSet<>(Arrays.asList("information_schema", "pg_catalog",
- "blockchain", "cstore", "db4ai", "dbe_perf", "dbe_pldebugger",
"gaussdb", "oracle", "pkg_service", "snapshot", "sqladvisor",
"dbe_pldeveloper", "pg_toast", "pkg_util", "shardingsphere"));
+ private static final Collection<String> SYSTEM_SCHEMAS =
Arrays.asList("information_schema", "pg_catalog",
+ "blockchain", "cstore", "db4ai", "dbe_perf", "dbe_pldebugger",
"gaussdb", "oracle", "pkg_service", "snapshot", "sqladvisor",
"dbe_pldeveloper", "pg_toast", "pkg_util", "shardingsphere");
static {
SYSTEM_DATABASE_SCHEMA_MAP.put("postgres", SYSTEM_SCHEMAS);
diff --git
a/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabaseTest.java
b/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabaseTest.java
index 50497d9a9de..84308b530f7 100644
---
a/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabaseTest.java
+++
b/database/connector/dialect/opengauss/src/test/java/org/apache/shardingsphere/database/connector/opengauss/metadata/database/system/OpenGaussSystemDatabaseTest.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
-import java.util.HashSet;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -41,7 +40,7 @@ class OpenGaussSystemDatabaseTest {
@Test
void assertGetSystemSchemas() {
- assertThat(systemDatabase.getSystemSchemas(), is(new
HashSet<>(Arrays.asList("information_schema", "pg_catalog", "blockchain",
- "cstore", "db4ai", "dbe_perf", "dbe_pldebugger", "gaussdb",
"oracle", "pkg_service", "snapshot", "sqladvisor", "dbe_pldeveloper",
"pg_toast", "pkg_util", "shardingsphere"))));
+ assertThat(systemDatabase.getSystemSchemas(),
is(Arrays.asList("information_schema", "pg_catalog", "blockchain",
+ "cstore", "db4ai", "dbe_perf", "dbe_pldebugger", "gaussdb",
"oracle", "pkg_service", "snapshot", "sqladvisor", "dbe_pldeveloper",
"pg_toast", "pkg_util", "shardingsphere")));
}
}
diff --git
a/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabase.java
b/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabase.java
index f787d142a98..e90c2d1991e 100644
---
a/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabase.java
+++
b/database/connector/dialect/postgresql/src/main/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabase.java
@@ -22,7 +22,6 @@ import
org.apache.shardingsphere.database.connector.core.metadata.database.syste
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
/**
@@ -32,7 +31,7 @@ public final class PostgreSQLSystemDatabase implements
DialectSystemDatabase {
private static final Map<String, Collection<String>>
SYSTEM_DATABASE_SCHEMA_MAP = new HashMap<>();
- private static final Collection<String> SYSTEM_SCHEMAS = new
HashSet<>(Arrays.asList("information_schema", "pg_catalog", "shardingsphere"));
+ private static final Collection<String> SYSTEM_SCHEMAS =
Arrays.asList("information_schema", "pg_catalog", "shardingsphere");
static {
SYSTEM_DATABASE_SCHEMA_MAP.put("postgres", SYSTEM_SCHEMAS);
diff --git
a/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabaseTest.java
b/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabaseTest.java
index 6d0433ed34d..3953c132fca 100644
---
a/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabaseTest.java
+++
b/database/connector/dialect/postgresql/src/test/java/org/apache/shardingsphere/database/connector/postgresql/metadata/database/system/PostgreSQLSystemDatabaseTest.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
-import java.util.HashSet;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -41,6 +40,6 @@ class PostgreSQLSystemDatabaseTest {
@Test
void assertGetSystemSchemas() {
- assertThat(systemDatabase.getSystemSchemas(), is(new
HashSet<>(Arrays.asList("information_schema", "pg_catalog",
"shardingsphere"))));
+ assertThat(systemDatabase.getSystemSchemas(),
is(Arrays.asList("information_schema", "pg_catalog", "shardingsphere")));
}
}
