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 87f6cb70207 Add DialectSystemSchemaManager (#36992)
87f6cb70207 is described below
commit 87f6cb70207442bca6a8fcbf0d8971c672517497
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Nov 3 14:50:23 2025 +0800
Add DialectSystemSchemaManager (#36992)
* Refactor SystemSchemaManager
* Add DialectSystemSchemaManager
* Add DialectSystemSchemaManager
---
.../schema/manager/DialectSystemSchemaManager.java | 108 +++++++++++++++++++++
.../schema/manager/SystemSchemaManager.java | 73 +++++---------
2 files changed, 132 insertions(+), 49 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/DialectSystemSchemaManager.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/DialectSystemSchemaManager.java
new file mode 100644
index 00000000000..9c051e70787
--- /dev/null
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/DialectSystemSchemaManager.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.infra.metadata.database.schema.manager;
+
+import com.cedarsoftware.util.CaseInsensitiveMap;
+import com.cedarsoftware.util.CaseInsensitiveSet;
+
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Dialect system schema manager.
+ */
+public final class DialectSystemSchemaManager {
+
+ private final Map<String, Collection<String>> schemaAndTableMap = new
CaseInsensitiveMap<>();
+
+ private final Map<String, Collection<String>> schemaAndResourceMap = new
CaseInsensitiveMap<>();
+
+ /**
+ * Put the table.
+ *
+ * @param schemaName schema name
+ * @param tableName table name
+ */
+ public void putTable(final String schemaName, final String tableName) {
+ schemaAndTableMap.computeIfAbsent(schemaName, key -> new
CaseInsensitiveSet<>()).add(tableName);
+ }
+
+ /**
+ * Put resource.
+ *
+ * @param schemaName schema name
+ * @param resourcePath resource path
+ */
+ public void putResource(final String schemaName, final String
resourcePath) {
+ schemaAndResourceMap.computeIfAbsent(schemaName, key -> new
CaseInsensitiveSet<>()).add(resourcePath);
+ }
+
+ /**
+ * Judge whether the current table is system table.
+ *
+ * @param schemaName schema name
+ * @param tableName table name
+ * @return is system table or not
+ */
+ public boolean isSystemTable(final String schemaName, final String
tableName) {
+ return null == schemaName
+ ? schemaAndTableMap.values().stream().anyMatch(each ->
each.contains(tableName))
+ : schemaAndTableMap.getOrDefault(schemaName,
Collections.emptyList()).contains(tableName);
+ }
+
+ /**
+ * Judge whether the current table is system table.
+ *
+ * @param schemaName schema name
+ * @param tableNames table names
+ * @return is system table or not
+ */
+ public boolean isSystemTable(final String schemaName, final
Collection<String> tableNames) {
+ Collection<String> tables = schemaAndTableMap.getOrDefault(schemaName,
Collections.emptyList());
+ for (String each : tableNames) {
+ if (!tables.contains(each)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Get tables.
+ *
+ * @param schemaName schema
+ * @return got tables
+ */
+ public Collection<String> getTables(final String schemaName) {
+ return schemaAndTableMap.getOrDefault(schemaName,
Collections.emptyList());
+ }
+
+ /**
+ * Get all input streams.
+ *
+ * @param schemaName schema name
+ * @return input streams
+ */
+ public Collection<InputStream> getAllInputStreams(final String schemaName)
{
+ return schemaAndResourceMap.getOrDefault(schemaName,
Collections.emptyList())
+ .stream().map(each ->
DialectSystemSchemaManager.class.getClassLoader().getResourceAsStream(each)).collect(Collectors.toList());
+ }
+}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
index c8ea76be5be..93400399bd3 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/manager/SystemSchemaManager.java
@@ -18,20 +18,16 @@
package org.apache.shardingsphere.infra.metadata.database.schema.manager;
import com.cedarsoftware.util.CaseInsensitiveMap;
-import com.cedarsoftware.util.CaseInsensitiveSet;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import
org.apache.shardingsphere.infra.util.directory.ClasspathResourceDirectoryReader;
import java.io.InputStream;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -41,9 +37,7 @@ import java.util.stream.Stream;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SystemSchemaManager {
- private static final Map<String, Map<String, Collection<String>>>
DATABASE_TYPE_SCHEMA_TABLE_MAP;
-
- private static final Map<String, Map<String, Collection<String>>>
DATABASE_TYPE_SCHEMA_RESOURCE_MAP;
+ private static final Map<String, DialectSystemSchemaManager>
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP;
private static final String COMMON = "common";
@@ -52,12 +46,19 @@ public final class SystemSchemaManager {
try (Stream<String> resourceNameStream =
ClasspathResourceDirectoryReader.read("schema")) {
resourceNames = resourceNameStream.filter(each ->
each.endsWith(".yaml")).collect(Collectors.toList());
}
- DATABASE_TYPE_SCHEMA_TABLE_MAP =
resourceNames.stream().map(resourceName -> resourceName.split("/")).filter(each
-> each.length == 4)
- .collect(Collectors.groupingBy(path -> path[1],
CaseInsensitiveMap::new, Collectors.groupingBy(path -> path[2],
CaseInsensitiveMap::new,
- Collectors.mapping(path ->
StringUtils.removeEnd(path[3], ".yaml"),
Collectors.toCollection(CaseInsensitiveSet::new)))));
- DATABASE_TYPE_SCHEMA_RESOURCE_MAP =
resourceNames.stream().map(resourceName -> resourceName.split("/")).filter(each
-> each.length == 4)
- .collect(Collectors.groupingBy(path -> path[1],
CaseInsensitiveMap::new, Collectors.groupingBy(path -> path[2],
CaseInsensitiveMap::new,
- Collectors.mapping(path -> String.join("/", path),
Collectors.toCollection(CaseInsensitiveSet::new)))));
+ DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP = new
CaseInsensitiveMap<>();
+ for (String each : resourceNames) {
+ String[] pathParts = each.split("/");
+ if (4 == pathParts.length) {
+ String databaseType = pathParts[1];
+ String schemaName = pathParts[2];
+ String tableName = Strings.CS.removeEnd(pathParts[3], ".yaml");
+ String resourcePath = String.join("/", pathParts);
+ DialectSystemSchemaManager dialectSystemSchemaManager =
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.computeIfAbsent(databaseType, key
-> new DialectSystemSchemaManager());
+ dialectSystemSchemaManager.putTable(schemaName, tableName);
+ dialectSystemSchemaManager.putResource(schemaName,
resourcePath);
+ }
+ }
}
/**
@@ -68,12 +69,7 @@ public final class SystemSchemaManager {
* @return is system table or not
*/
public static boolean isSystemTable(final String schema, final String
tableName) {
- for (Entry<String, Map<String, Collection<String>>> entry :
DATABASE_TYPE_SCHEMA_TABLE_MAP.entrySet()) {
- if (Optional.ofNullable(entry.getValue().get(schema)).map(tables
-> tables.contains(tableName)).orElse(false)) {
- return true;
- }
- }
- return false;
+ return
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.entrySet().stream().anyMatch(entry
-> entry.getValue().getTables(schema).contains(tableName));
}
/**
@@ -85,12 +81,8 @@ public final class SystemSchemaManager {
* @return is system table or not
*/
public static boolean isSystemTable(final String databaseType, final
String schema, final String tableName) {
- Map<String, Collection<String>> schemaTableMap =
DATABASE_TYPE_SCHEMA_TABLE_MAP.getOrDefault(databaseType,
Collections.emptyMap());
- Map<String, Collection<String>> commonTableMap =
DATABASE_TYPE_SCHEMA_TABLE_MAP.getOrDefault(COMMON, Collections.emptyMap());
- if (null == schema) {
- return schemaTableMap.values().stream().anyMatch(each ->
each.contains(tableName)) || commonTableMap.values().stream().anyMatch(each ->
each.contains(tableName));
- }
- return schemaTableMap.getOrDefault(schema,
Collections.emptyList()).contains(tableName) ||
commonTableMap.getOrDefault(schema,
Collections.emptyList()).contains(tableName);
+ return
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.containsKey(databaseType) &&
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(databaseType).isSystemTable(schema,
tableName)
+ ||
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.containsKey(COMMON) &&
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(COMMON).isSystemTable(schema,
tableName);
}
/**
@@ -102,14 +94,8 @@ public final class SystemSchemaManager {
* @return is system table or not
*/
public static boolean isSystemTable(final String databaseType, final
String schema, final Collection<String> tableNames) {
- Collection<String> databaseTypeTables =
Optional.ofNullable(DATABASE_TYPE_SCHEMA_TABLE_MAP.get(databaseType)).map(schemas
-> schemas.get(schema)).orElse(Collections.emptyList());
- Collection<String> commonTables =
Optional.ofNullable(DATABASE_TYPE_SCHEMA_TABLE_MAP.get(COMMON)).map(schemas ->
schemas.get(schema)).orElse(Collections.emptyList());
- for (String each : tableNames) {
- if (!databaseTypeTables.contains(each) &&
!commonTables.contains(each)) {
- return false;
- }
- }
- return true;
+ return
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.containsKey(databaseType) &&
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(databaseType).isSystemTable(schema,
tableNames)
+ ||
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.containsKey(COMMON) &&
DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(COMMON).isSystemTable(schema,
tableNames);
}
/**
@@ -121,8 +107,8 @@ public final class SystemSchemaManager {
*/
public static Collection<String> getTables(final String databaseType,
final String schema) {
Collection<String> result = new LinkedList<>();
-
Optional.ofNullable(DATABASE_TYPE_SCHEMA_TABLE_MAP.get(databaseType)).map(schemas
-> schemas.get(schema)).ifPresent(result::addAll);
-
Optional.ofNullable(DATABASE_TYPE_SCHEMA_TABLE_MAP.get(COMMON)).map(schemas ->
schemas.get(schema)).ifPresent(result::addAll);
+
result.addAll(DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(databaseType).getTables(schema));
+
result.addAll(DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(COMMON).getTables(schema));
return result;
}
@@ -135,19 +121,8 @@ public final class SystemSchemaManager {
*/
public static Collection<InputStream> getAllInputStreams(final String
databaseType, final String schema) {
Collection<InputStream> result = new LinkedList<>();
- result.addAll(getInputStreams(databaseType, schema));
- result.addAll(getInputStreams(COMMON, schema));
- return result;
- }
-
- private static Collection<InputStream> getInputStreams(final String
databaseType, final String schema) {
- if (!DATABASE_TYPE_SCHEMA_RESOURCE_MAP.containsKey(databaseType) ||
!DATABASE_TYPE_SCHEMA_RESOURCE_MAP.get(databaseType).containsKey(schema)) {
- return Collections.emptyList();
- }
- Collection<InputStream> result = new LinkedList<>();
- for (String each :
DATABASE_TYPE_SCHEMA_RESOURCE_MAP.get(databaseType).get(schema)) {
-
result.add(SystemSchemaManager.class.getClassLoader().getResourceAsStream(each));
- }
+
result.addAll(DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(databaseType).getAllInputStreams(schema));
+
result.addAll(DATABASE_TYPE_AND_SYSTEM_SCHEMA_MANAGER_MAP.get(COMMON).getAllInputStreams(schema));
return result;
}
}
