This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 6d8f4d82b05 Minor refactor for
SystemSchemaMetadata#getSchemaStreamsInternal and rename to SystemSchemaManager
(#30387)
6d8f4d82b05 is described below
commit 6d8f4d82b05fcca0489b8cb4cca6492e00ebb375
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Mar 4 17:43:36 2024 +0800
Minor refactor for SystemSchemaMetadata#getSchemaStreamsInternal and rename
to SystemSchemaManager (#30387)
* Minor refactor for SystemSchemaMetadata#getSchemaStreamsInternal and
rename to SystemSchemaManager
* remove useless blank line
---
.../from/impl/SimpleTableSegmentBinder.java | 4 +-
...chemaManager.java => GenericSchemaManager.java} | 4 +-
...chemaMetadata.java => SystemSchemaManager.java} | 31 ++++----
.../schema/builder/SystemSchemaBuilder.java | 3 +-
...agerTest.java => GenericSchemaManagerTest.java} | 12 +--
.../database/schema/SystemSchemaManagerTest.java | 87 +++++++++++++++++++++
.../schema/builder/SystemSchemaMetadataTest.java | 88 ----------------------
.../database/DatabaseMetaDataPersistService.java | 6 +-
.../NewDatabaseMetaDataPersistService.java | 6 +-
.../mode/manager/ContextManager.java | 4 +-
.../context/ConfigurationContextManager.java | 6 +-
.../metadata/watcher/MetaDataChangedWatcher.java | 4 +-
.../MySQLInformationSchemaExecutorFactory.java | 4 +-
.../admin/MySQLMySQLSchemaExecutorFactory.java | 4 +-
.../MySQLPerformanceSchemaExecutorFactory.java | 4 +-
.../admin/MySQLSysSchemaExecutorFactory.java | 4 +-
.../admin/OpenGaussAdminExecutorCreator.java | 6 +-
.../admin/PostgreSQLAdminExecutorCreator.java | 6 +-
18 files changed, 142 insertions(+), 141 deletions(-)
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java
index 5a6738feb02..d26516ab9c6 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/from/impl/SimpleTableSegmentBinder.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDataba
import org.apache.shardingsphere.infra.exception.TableNotExistsException;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.dialect.exception.syntax.database.NoDatabaseSelectedException;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
@@ -139,7 +139,7 @@ public final class SimpleTableSegmentBinder {
if ("dual".equalsIgnoreCase(tableName)) {
return;
}
- if (SystemSchemaMetadata.isSystemTable(schemaName, tableName)) {
+ if (SystemSchemaManager.isSystemTable(schemaName, tableName)) {
return;
}
ShardingSpherePreconditions.checkState(statementBinderContext.getMetaData().containsDatabase(databaseName)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaManager.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManager.java
similarity index 98%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaManager.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManager.java
index 24a5aabcc80..12d0a117dea 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaManager.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManager.java
@@ -28,10 +28,10 @@ import java.util.Map.Entry;
import java.util.stream.Collectors;
/**
- * Schema meta data manager.
+ * Generic schema manager.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SchemaManager {
+public final class GenericSchemaManager {
/**
* Get to be added tables by schemas.
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaMetadata.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManager.java
similarity index 87%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaMetadata.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManager.java
index 925763d8b44..fcba4ee9989 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaMetadata.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.database.schema.builder;
+package org.apache.shardingsphere.infra.metadata.database.schema;
import com.cedarsoftware.util.CaseInsensitiveMap;
import com.cedarsoftware.util.CaseInsensitiveSet;
@@ -36,11 +36,11 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
- * System schema metadata.
+ * System schema manager.
*/
@RequiredArgsConstructor
@Getter
-public final class SystemSchemaMetadata {
+public final class SystemSchemaManager {
private static final Map<String, Map<String, Collection<String>>>
DATABASE_TYPE_SCHEMA_TABLE_MAP;
@@ -124,26 +124,27 @@ public final class SystemSchemaMetadata {
}
/**
- * Get schema streams.
+ * Get all input streams.
*
* @param databaseType database type
* @param schema schema
* @return inputStream collection
*/
- public static Collection<InputStream> getSchemaStreams(final String
databaseType, final String schema) {
+ public static Collection<InputStream> getAllInputStreams(final String
databaseType, final String schema) {
Collection<InputStream> result = new LinkedList<>();
- getSchemaStreamsInternal(databaseType,
schema).ifPresent(result::addAll);
- getSchemaStreamsInternal(COMMON, schema).ifPresent(result::addAll);
+ result.addAll(getInputStreams(databaseType, schema));
+ result.addAll(getInputStreams(COMMON, schema));
return result;
}
- private static Optional<Collection<InputStream>>
getSchemaStreamsInternal(final String databaseType, final String schema) {
- return
Optional.ofNullable(DATABASE_TYPE_SCHEMA_RESOURCE_MAP.get(databaseType)).map(schemas
-> schemas.get(schema)).map(resources -> {
- Collection<InputStream> result = new LinkedList<>();
- for (String each : resources) {
-
result.add(SystemSchemaMetadata.class.getClassLoader().getResourceAsStream(each));
- }
- 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));
+ }
+ return result;
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
index 1a80efdb542..1a5d7ddaed8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
@@ -25,6 +25,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDa
import
org.apache.shardingsphere.infra.database.core.metadata.database.system.SystemDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import
org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereTable;
@@ -58,7 +59,7 @@ public final class SystemSchemaBuilder {
boolean isSystemSchemaMetaDataEnabled =
isSystemSchemaMetaDataEnabled(props.getProps());
YamlTableSwapper swapper = new YamlTableSwapper();
for (String each : getSystemSchemas(databaseName, databaseType,
systemDatabase)) {
- result.put(each.toLowerCase(), createSchema(each,
SystemSchemaMetadata.getSchemaStreams(databaseType.getType(), each), swapper,
isSystemSchemaMetaDataEnabled));
+ result.put(each.toLowerCase(), createSchema(each,
SystemSchemaManager.getAllInputStreams(databaseType.getType(), each), swapper,
isSystemSchemaMetaDataEnabled));
}
return result;
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaManagerTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java
similarity index 79%
rename from
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaManagerTest.java
rename to
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java
index f53c6a3c81a..a890a98a98e 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SchemaManagerTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/GenericSchemaManagerTest.java
@@ -28,7 +28,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class SchemaManagerTest {
+class GenericSchemaManagerTest {
@Test
void assertGetToBeAddedTablesBySchemas() {
@@ -36,7 +36,7 @@ class SchemaManagerTest {
new ShardingSphereSchema(Collections.singletonMap("foo_table",
new ShardingSphereTable("foo_table",
Collections.emptyList(), Collections.emptyList(),
Collections.emptyList())), Collections.emptyMap()));
Map<String, ShardingSphereSchema> currentSchemas =
Collections.singletonMap("foo_schema", new
ShardingSphereSchema(Collections.emptyMap(), Collections.emptyMap()));
- Map<String, ShardingSphereSchema> actual =
SchemaManager.getToBeAddedTablesBySchemas(reloadSchemas, currentSchemas);
+ Map<String, ShardingSphereSchema> actual =
GenericSchemaManager.getToBeAddedTablesBySchemas(reloadSchemas, currentSchemas);
assertThat(actual.size(), is(1));
assertThat(actual.get("foo_schema").getTables().size(), is(1));
assertTrue(actual.get("foo_schema").getTables().containsKey("foo_table"));
@@ -48,7 +48,7 @@ class SchemaManagerTest {
new ShardingSphereSchema(Collections.singletonMap("foo_table",
new ShardingSphereTable("foo_table",
Collections.emptyList(), Collections.emptyList(),
Collections.emptyList())), Collections.emptyMap()));
Map<String, ShardingSphereSchema> reloadSchemas =
Collections.singletonMap("foo_schema", new
ShardingSphereSchema(Collections.emptyMap(), Collections.emptyMap()));
- Map<String, ShardingSphereSchema> actual =
SchemaManager.getToBeDeletedTablesBySchemas(reloadSchemas, currentSchemas);
+ Map<String, ShardingSphereSchema> actual =
GenericSchemaManager.getToBeDeletedTablesBySchemas(reloadSchemas,
currentSchemas);
assertThat(actual.size(), is(1));
assertThat(actual.get("foo_schema").getTables().size(), is(1));
assertTrue(actual.get("foo_schema").getTables().containsKey("foo_table"));
@@ -56,21 +56,21 @@ class SchemaManagerTest {
@Test
void assertGetToBeAddedTables() {
- Map<String, ShardingSphereTable> actual =
SchemaManager.getToBeAddedTables(Collections.singletonMap("foo_table", new
ShardingSphereTable()), Collections.emptyMap());
+ Map<String, ShardingSphereTable> actual =
GenericSchemaManager.getToBeAddedTables(Collections.singletonMap("foo_table",
new ShardingSphereTable()), Collections.emptyMap());
assertThat(actual.size(), is(1));
assertTrue(actual.containsKey("foo_table"));
}
@Test
void assertGetToBeDeletedTables() {
- Map<String, ShardingSphereTable> actual =
SchemaManager.getToBeDeletedTables(Collections.emptyMap(),
Collections.singletonMap("foo_table", new ShardingSphereTable()));
+ Map<String, ShardingSphereTable> actual =
GenericSchemaManager.getToBeDeletedTables(Collections.emptyMap(),
Collections.singletonMap("foo_table", new ShardingSphereTable()));
assertThat(actual.size(), is(1));
assertTrue(actual.containsKey("foo_table"));
}
@Test
void assertGetToBeDeletedSchemaNames() {
- Map<String, ShardingSphereSchema> actual =
SchemaManager.getToBeDeletedSchemaNames(Collections.emptyMap(),
Collections.singletonMap("foo_schema", new ShardingSphereSchema()));
+ Map<String, ShardingSphereSchema> actual =
GenericSchemaManager.getToBeDeletedSchemaNames(Collections.emptyMap(),
Collections.singletonMap("foo_schema", new ShardingSphereSchema()));
assertThat(actual.size(), is(1));
assertTrue(actual.containsKey("foo_schema"));
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
new file mode 100644
index 00000000000..918b139a84d
--- /dev/null
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Collection;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class SystemSchemaManagerTest {
+
+ @Test
+ void assertValueOfSchemaPathSuccess() {
+ Collection<String> actualInformationSchema =
SystemSchemaManager.getTables("MySQL", "information_schema");
+ assertThat(actualInformationSchema.size(), is(61));
+ Collection<String> actualMySQLSchema =
SystemSchemaManager.getTables("MySQL", "mysql");
+ assertThat(actualMySQLSchema.size(), is(31));
+ Collection<String> actualPerformanceSchema =
SystemSchemaManager.getTables("MySQL", "performance_schema");
+ assertThat(actualPerformanceSchema.size(), is(87));
+ Collection<String> actualSysSchema =
SystemSchemaManager.getTables("MySQL", "sys");
+ assertThat(actualSysSchema.size(), is(54));
+ Collection<String> actualShardingSphereSchema =
SystemSchemaManager.getTables("MySQL", "shardingsphere");
+ assertThat(actualShardingSphereSchema.size(), is(2));
+ Collection<String> actualPgInformationSchema =
SystemSchemaManager.getTables("PostgreSQL", "information_schema");
+ assertThat(actualPgInformationSchema.size(), is(69));
+ Collection<String> actualPgCatalog =
SystemSchemaManager.getTables("PostgreSQL", "pg_catalog");
+ assertThat(actualPgCatalog.size(), is(134));
+ Collection<String> actualOgInformationSchema =
SystemSchemaManager.getTables("openGauss", "information_schema");
+ assertThat(actualOgInformationSchema.size(), is(66));
+ Collection<String> actualOgPgCatalog =
SystemSchemaManager.getTables("openGauss", "pg_catalog");
+ assertThat(actualOgPgCatalog.size(), is(240));
+ }
+
+ @Test
+ void assertIsisSystemTable() {
+ assertTrue(SystemSchemaManager.isSystemTable("information_schema",
"columns"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_database"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_tables"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_aggregate"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog", "pg_am"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog", "pg_amop"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_amproc"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_attrdef"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_attribute"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_auth_members"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_authid"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_available_extension_versions"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_available_extensions"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_backend_memory_contexts"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog", "pg_cast"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_range"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_replication_origin"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_rewrite"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_seclabel"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_sequence"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_roles"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_user_mapping"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_stat_database_conflicts"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_stat_gssapi"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_stat_progress_analyze"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_stat_progress_basebackup"));
+ assertTrue(SystemSchemaManager.isSystemTable("pg_catalog",
"pg_stat_progress_cluster"));
+ assertFalse(SystemSchemaManager.isSystemTable("sharding_db",
"t_order"));
+ assertTrue(SystemSchemaManager.isSystemTable("shardingsphere",
"cluster_information"));
+ assertTrue(SystemSchemaManager.isSystemTable("shardingsphere",
"sharding_table_statistics"));
+ assertFalse(SystemSchemaManager.isSystemTable("shardingsphere",
"nonexistent"));
+ }
+}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaMetadataTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaMetadataTest.java
deleted file mode 100644
index 91fe9f559c4..00000000000
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaMetadataTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.builder;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.Collection;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class SystemSchemaMetadataTest {
-
- @Test
- void assertValueOfSchemaPathSuccess() {
- Collection<String> actualInformationSchema =
SystemSchemaMetadata.getTables("MySQL", "information_schema");
- assertThat(actualInformationSchema.size(), is(61));
- Collection<String> actualMySQLSchema =
SystemSchemaMetadata.getTables("MySQL", "mysql");
- assertThat(actualMySQLSchema.size(), is(31));
- Collection<String> actualPerformanceSchema =
SystemSchemaMetadata.getTables("MySQL", "performance_schema");
- assertThat(actualPerformanceSchema.size(), is(87));
- Collection<String> actualSysSchema =
SystemSchemaMetadata.getTables("MySQL", "sys");
- assertThat(actualSysSchema.size(), is(54));
- Collection<String> actualShardingSphereSchema =
SystemSchemaMetadata.getTables("MySQL", "shardingsphere");
- assertThat(actualShardingSphereSchema.size(), is(2));
- Collection<String> actualPgInformationSchema =
SystemSchemaMetadata.getTables("PostgreSQL", "information_schema");
- assertThat(actualPgInformationSchema.size(), is(69));
- Collection<String> actualPgCatalog =
SystemSchemaMetadata.getTables("PostgreSQL", "pg_catalog");
- assertThat(actualPgCatalog.size(), is(134));
- Collection<String> actualOgInformationSchema =
SystemSchemaMetadata.getTables("openGauss", "information_schema");
- assertThat(actualOgInformationSchema.size(), is(66));
- Collection<String> actualOgPgCatalog =
SystemSchemaMetadata.getTables("openGauss", "pg_catalog");
- assertThat(actualOgPgCatalog.size(), is(240));
-
- }
-
- @Test
- void assertIsisSystemTable() {
- assertTrue(SystemSchemaMetadata.isSystemTable("information_schema",
"columns"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_database"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_tables"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_aggregate"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog", "pg_am"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_amop"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_amproc"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_attrdef"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_attribute"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_auth_members"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_authid"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_available_extension_versions"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_available_extensions"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_backend_memory_contexts"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_cast"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_range"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_replication_origin"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_rewrite"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_seclabel"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_sequence"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_roles"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_user_mapping"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_stat_database_conflicts"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_stat_gssapi"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_stat_progress_analyze"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_stat_progress_basebackup"));
- assertTrue(SystemSchemaMetadata.isSystemTable("pg_catalog",
"pg_stat_progress_cluster"));
- assertFalse(SystemSchemaMetadata.isSystemTable("sharding_db",
"t_order"));
- assertTrue(SystemSchemaMetadata.isSystemTable("shardingsphere",
"cluster_information"));
- assertTrue(SystemSchemaMetadata.isSystemTable("shardingsphere",
"sharding_table_statistics"));
- assertFalse(SystemSchemaMetadata.isSystemTable("shardingsphere",
"nonexistent"));
- }
-}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
index 2e30ecf8dac..fee8f38f049 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/DatabaseMetaDataPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.metadata.persist.service.database;
import lombok.Getter;
-import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
+import
org.apache.shardingsphere.infra.metadata.database.schema.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
@@ -113,8 +113,8 @@ public final class DatabaseMetaDataPersistService
implements DatabaseMetaDataBas
addSchema(databaseName, schemaName);
}
Map<String, ShardingSphereTable> currentTables =
tableMetaDataPersistService.load(databaseName, schemaName);
- tableMetaDataPersistService.persist(databaseName, schemaName,
SchemaManager.getToBeAddedTables(schema.getTables(), currentTables));
- SchemaManager.getToBeDeletedTables(schema.getTables(),
currentTables).forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
+ tableMetaDataPersistService.persist(databaseName, schemaName,
GenericSchemaManager.getToBeAddedTables(schema.getTables(), currentTables));
+ GenericSchemaManager.getToBeDeletedTables(schema.getTables(),
currentTables).forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
/**
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/NewDatabaseMetaDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/NewDatabaseMetaDataPersistService.java
index f366e3d18a5..168d349a91c 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/NewDatabaseMetaDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/database/NewDatabaseMetaDataPersistService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.metadata.persist.service.database;
import lombok.Getter;
-import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
+import
org.apache.shardingsphere.infra.metadata.database.schema.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.metadata.persist.node.DatabaseMetaDataNode;
@@ -118,8 +118,8 @@ public final class NewDatabaseMetaDataPersistService
implements DatabaseMetaData
}
Map<String, ShardingSphereTable> currentTables =
tableMetaDataPersistService.load(databaseName, schemaName);
metaDataVersionPersistService.switchActiveVersion(tableMetaDataPersistService
- .persistSchemaMetaData(databaseName, schemaName,
SchemaManager.getToBeAddedTables(schema.getTables(), currentTables)));
- SchemaManager.getToBeDeletedTables(schema.getTables(),
currentTables).forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
+ .persistSchemaMetaData(databaseName, schemaName,
GenericSchemaManager.getToBeAddedTables(schema.getTables(), currentTables)));
+ GenericSchemaManager.getToBeDeletedTables(schema.getTables(),
currentTables).forEach((key, value) ->
tableMetaDataPersistService.delete(databaseName, schemaName, key));
}
/**
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index a8127e7a653..357e632fa27 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -33,7 +33,7 @@ import
org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
+import
org.apache.shardingsphere.infra.metadata.database.schema.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilder;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
@@ -189,7 +189,7 @@ public final class ContextManager implements AutoCloseable {
* @param currentDatabase current database
*/
public void deletedSchemaNames(final String databaseName, final
ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase
currentDatabase) {
- SchemaManager.getToBeDeletedSchemaNames(reloadDatabase.getSchemas(),
currentDatabase.getSchemas()).keySet()
+
GenericSchemaManager.getToBeDeletedSchemaNames(reloadDatabase.getSchemas(),
currentDatabase.getSchemas()).keySet()
.forEach(each ->
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().dropSchema(databaseName,
each));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
index 31544fa19a6..422f680a433 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/context/ConfigurationContextManager.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaDa
import
org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.SchemaManager;
+import
org.apache.shardingsphere.infra.metadata.database.schema.GenericSchemaManager;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import
org.apache.shardingsphere.infra.rule.builder.database.DatabaseRulesBuilder;
@@ -264,8 +264,8 @@ public final class ConfigurationContextManager {
* @param currentDatabase current database
*/
public void alterSchemaMetaData(final String databaseName, final
ShardingSphereDatabase reloadDatabase, final ShardingSphereDatabase
currentDatabase) {
- Map<String, ShardingSphereSchema> toBeAlterSchemas =
SchemaManager.getToBeDeletedTablesBySchemas(reloadDatabase.getSchemas(),
currentDatabase.getSchemas());
- Map<String, ShardingSphereSchema> toBeAddedSchemas =
SchemaManager.getToBeAddedTablesBySchemas(reloadDatabase.getSchemas(),
currentDatabase.getSchemas());
+ Map<String, ShardingSphereSchema> toBeAlterSchemas =
GenericSchemaManager.getToBeDeletedTablesBySchemas(reloadDatabase.getSchemas(),
currentDatabase.getSchemas());
+ Map<String, ShardingSphereSchema> toBeAddedSchemas =
GenericSchemaManager.getToBeAddedTablesBySchemas(reloadDatabase.getSchemas(),
currentDatabase.getSchemas());
toBeAddedSchemas.forEach((key, value) ->
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().persist(databaseName,
key, value));
toBeAlterSchemas.forEach((key, value) ->
metaDataContexts.get().getPersistService().getDatabaseMetaDataService().delete(databaseName,
key, value));
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
index 0ba578ac58b..aac6e9cef3e 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/metadata/watcher/MetaDataChangedWatcher.java
@@ -21,7 +21,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import org.apache.shardingsphere.infra.rule.event.GovernanceEvent;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.config.pojo.rule.YamlRuleConfiguration;
@@ -108,7 +108,7 @@ public final class MetaDataChangedWatcher implements
GovernanceWatcher<Governanc
}
Optional<String> tableName =
DatabaseMetaDataNode.getTableName(event.getKey());
Optional<String> viewName =
DatabaseMetaDataNode.getViewName(event.getKey());
- return tableName.isPresent() &&
!SystemSchemaMetadata.isSystemTable(databaseName.get(), tableName.get()) ||
viewName.isPresent();
+ return tableName.isPresent() &&
!SystemSchemaManager.isSystemTable(databaseName.get(), tableName.get()) ||
viewName.isPresent();
}
private Optional<GovernanceEvent> createDatabaseChangedEvent(final
DataChangedEvent event) {
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLInformationSchemaExecutorFactory.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLInformationSchemaExecutorFactory.java
index 580a8216a24..12ee35c62df 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLInformationSchemaExecutorFactory.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLInformationSchemaExecutorFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.information.SelectInformationSchemataExecutor;
@@ -53,7 +53,7 @@ public final class MySQLInformationSchemaExecutorFactory {
if (SCHEMATA_TABLE.equalsIgnoreCase(tableName)) {
return Optional.of(new
SelectInformationSchemataExecutor(sqlStatement, sql, parameters));
}
- if (SystemSchemaMetadata.isSystemTable("mysql", "information_schema",
tableName)) {
+ if (SystemSchemaManager.isSystemTable("mysql", "information_schema",
tableName)) {
return Optional.of(new DefaultDatabaseMetaDataExecutor(sql,
parameters));
}
return Optional.empty();
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLMySQLSchemaExecutorFactory.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLMySQLSchemaExecutorFactory.java
index c550cf0a6c1..f6adb4b2f80 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLMySQLSchemaExecutorFactory.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLMySQLSchemaExecutorFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -47,7 +47,7 @@ public final class MySQLMySQLSchemaExecutorFactory {
return Optional.empty();
}
String tableName = ((SimpleTableSegment)
sqlStatement.getFrom()).getTableName().getIdentifier().getValue();
- if (SystemSchemaMetadata.isSystemTable("mysql", "mysql", tableName)) {
+ if (SystemSchemaManager.isSystemTable("mysql", "mysql", tableName)) {
return Optional.of(new DefaultDatabaseMetaDataExecutor(sql,
parameters));
}
return Optional.empty();
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLPerformanceSchemaExecutorFactory.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLPerformanceSchemaExecutorFactory.java
index 8baaa1308e4..6ecbe360982 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLPerformanceSchemaExecutorFactory.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLPerformanceSchemaExecutorFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -47,7 +47,7 @@ public final class MySQLPerformanceSchemaExecutorFactory {
return Optional.empty();
}
String tableName = ((SimpleTableSegment)
sqlStatement.getFrom()).getTableName().getIdentifier().getValue();
- if (SystemSchemaMetadata.isSystemTable("mysql", "performance_schema",
tableName)) {
+ if (SystemSchemaManager.isSystemTable("mysql", "performance_schema",
tableName)) {
return Optional.of(new DefaultDatabaseMetaDataExecutor(sql,
parameters));
}
return Optional.empty();
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLSysSchemaExecutorFactory.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLSysSchemaExecutorFactory.java
index 14104aa8af3..fc474ec4a4f 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLSysSchemaExecutorFactory.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLSysSchemaExecutorFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
@@ -47,7 +47,7 @@ public final class MySQLSysSchemaExecutorFactory {
return Optional.empty();
}
String tableName = ((SimpleTableSegment)
sqlStatement.getFrom()).getTableName().getIdentifier().getValue();
- if (SystemSchemaMetadata.isSystemTable("mysql", "sys", tableName)) {
+ if (SystemSchemaManager.isSystemTable("mysql", "sys", tableName)) {
return Optional.of(new DefaultDatabaseMetaDataExecutor(sql,
parameters));
}
return Optional.empty();
diff --git
a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
index e9c1c8d9ab7..978e871309e 100644
---
a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
+++
b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.opengauss.handler.admin;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutorCreator;
@@ -95,8 +95,8 @@ public final class OpenGaussAdminExecutorCreator implements
DatabaseAdminExecuto
private boolean isPassThroughSystemCatalogQuery(final SQLStatementContext
sqlStatementContext) {
Collection<String> tableNames =
sqlStatementContext.getTablesContext().getTableNames();
- return !tableNames.isEmpty() &&
(SystemSchemaMetadata.isSystemTable("opengauss", "information_schema",
tableNames)
- || SystemSchemaMetadata.isSystemTable("opengauss",
"pg_catalog", tableNames));
+ return !tableNames.isEmpty() &&
(SystemSchemaManager.isSystemTable("opengauss", "information_schema",
tableNames)
+ || SystemSchemaManager.isSystemTable("opengauss",
"pg_catalog", tableNames));
}
@Override
diff --git
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreator.java
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreator.java
index 2999534c34b..11278007c7a 100644
---
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreator.java
+++
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.postgresql.handler.admin;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.SystemSchemaMetadata;
+import
org.apache.shardingsphere.infra.metadata.database.schema.SystemSchemaManager;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.AbstractDatabaseMetaDataExecutor.DefaultDatabaseMetaDataExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutor;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminExecutorCreator;
@@ -70,8 +70,8 @@ public final class PostgreSQLAdminExecutorCreator implements
DatabaseAdminExecut
if (!selectedTableNames.isEmpty() &&
KERNEL_SUPPORTED_TABLES.containsAll(selectedTableNames)) {
return Optional.empty();
}
- if (!selectedTableNames.isEmpty() &&
(SystemSchemaMetadata.isSystemTable("postgresql", "information_schema",
selectedTableNames)
- || SystemSchemaMetadata.isSystemTable("postgresql",
"pg_catalog", selectedTableNames))) {
+ if (!selectedTableNames.isEmpty() &&
(SystemSchemaManager.isSystemTable("postgresql", "information_schema",
selectedTableNames)
+ || SystemSchemaManager.isSystemTable("postgresql",
"pg_catalog", selectedTableNames))) {
return Optional.of(new DefaultDatabaseMetaDataExecutor(sql,
parameters));
}
}
