Refactor ShardingSphereStatisticsCollector

features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollector.java

@@ -29,7 +29,7 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
-import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector;
+import org.apache.shardingsphere.infra.metadata.statistics.collector.dialect.shardingsphere.ShardingSphereTableStatisticsCollector;
 import org.apache.shardingsphere.infra.rule.attribute.datasource.aggregate.AggregatedDataSourceRuleAttribute;
 import org.apache.shardingsphere.sharding.metadata.data.dialect.DialectShardingStatisticsTableCollector;
 import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -47,12 +47,13 @@
 /**
  * Sharding statistics table data collector.
  */
-public final class ShardingStatisticsTableCollector implements ShardingSphereStatisticsCollector {
+public final class ShardingStatisticsTableCollector implements ShardingSphereTableStatisticsCollector {
 
     private static final String SHARDING_TABLE_STATISTICS = "sharding_table_statistics";
 
     @Override
-    public Optional<ShardingSphereTableData> collect(final String databaseName, final ShardingSphereTable table, final ShardingSphereMetaData metaData) throws SQLException {
+    public Optional<ShardingSphereTableData> collect(final String databaseName, final String schemaName,
+                                                     final ShardingSphereTable table, final ShardingSphereMetaData metaData) throws SQLException {
         ShardingSphereTableData result = new ShardingSphereTableData(SHARDING_TABLE_STATISTICS);
         DatabaseType protocolType = metaData.getAllDatabases().iterator().next().getProtocolType();
         DialectDatabaseMetaData dialectDatabaseMetaData = new DatabaseTypeRegistry(protocolType).getDialectDatabaseMetaData();
@@ -123,6 +124,6 @@ private void addTableRowsAndDataLength(final DatabaseType databaseType, final Da
 
     @Override
     public String getType() {
-        return SHARDING_TABLE_STATISTICS;
+        return "shardingsphere.sharding_table_statistics";
     }
 }

features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/data/ShardingStatisticsTableCollectorTest.java

@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
-import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector;
+import org.apache.shardingsphere.infra.metadata.statistics.collector.dialect.shardingsphere.ShardingSphereTableStatisticsCollector;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.sharding.rule.ShardingRule;
 import org.apache.shardingsphere.sharding.rule.ShardingTable;
@@ -57,11 +57,11 @@ class ShardingStatisticsTableCollectorTest {
 
     private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
 
-    private ShardingSphereStatisticsCollector statisticsCollector;
+    private ShardingSphereTableStatisticsCollector shardingSphereTableStatisticsCollector;
 
     @BeforeEach
     void setUp() {
-        statisticsCollector = TypedSPILoader.getService(ShardingSphereStatisticsCollector.class, "sharding_table_statistics");
+        shardingSphereTableStatisticsCollector = TypedSPILoader.getService(ShardingSphereTableStatisticsCollector.class, "shardingsphere.sharding_table_statistics");
     }
 
     @Test
@@ -71,7 +71,7 @@ void assertCollectWithoutShardingRule() throws SQLException {
         when(database.getProtocolType()).thenReturn(databaseType);
         ShardingSphereMetaData metaData = new ShardingSphereMetaData(
                 Collections.singleton(database), mock(ResourceMetaData.class), mock(RuleMetaData.class), new ConfigurationProperties(new Properties()));
-        Optional<ShardingSphereTableData> actual = statisticsCollector.collect("foo_db", mock(ShardingSphereTable.class), metaData);
+        Optional<ShardingSphereTableData> actual = shardingSphereTableStatisticsCollector.collect("foo_db", "foo_db", mock(ShardingSphereTable.class), metaData);
         assertFalse(actual.isPresent());
     }
 
@@ -85,7 +85,7 @@ void assertCollectWithShardingRule() throws SQLException {
         ShardingSphereDatabase database = new ShardingSphereDatabase(
                 "foo_db", databaseType, new ResourceMetaData(Collections.emptyMap(), storageUnits), new RuleMetaData(Collections.singleton(rule)), Collections.emptyList());
         ShardingSphereMetaData metaData = new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new ConfigurationProperties(new Properties()));
-        Optional<ShardingSphereTableData> actual = statisticsCollector.collect("foo_db", mock(ShardingSphereTable.class), metaData);
+        Optional<ShardingSphereTableData> actual = shardingSphereTableStatisticsCollector.collect("foo_db", "foo_db", mock(ShardingSphereTable.class), metaData);
         assertTrue(actual.isPresent());
         assertThat(actual.get().getName(), is("sharding_table_statistics"));
         List<ShardingSphereRowData> actualRows = new ArrayList<>(actual.get().getRows());

features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/data/dialect/type/MySQLShardingStatisticsTableCollectorTest.java

@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
-import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector;
+import org.apache.shardingsphere.infra.metadata.statistics.collector.dialect.shardingsphere.ShardingSphereTableStatisticsCollector;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.sharding.rule.ShardingRule;
 import org.apache.shardingsphere.sharding.rule.ShardingTable;
@@ -59,11 +59,11 @@ class MySQLShardingStatisticsTableCollectorTest {
 
     private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "MySQL");
 
-    private ShardingSphereStatisticsCollector statisticsCollector;
+    private ShardingSphereTableStatisticsCollector shardingSphereTableStatisticsCollector;
 
     @BeforeEach
     void setUp() {
-        statisticsCollector = TypedSPILoader.getService(ShardingSphereStatisticsCollector.class, "sharding_table_statistics");
+        shardingSphereTableStatisticsCollector = TypedSPILoader.getService(ShardingSphereTableStatisticsCollector.class, "shardingsphere.sharding_table_statistics");
     }
 
     @Test
@@ -76,7 +76,7 @@ void assertCollect() throws SQLException {
         ShardingSphereDatabase database = new ShardingSphereDatabase(
                 "foo_db", databaseType, new ResourceMetaData(Collections.emptyMap(), storageUnits), new RuleMetaData(Collections.singleton(rule)), Collections.emptyList());
         ShardingSphereMetaData metaData = new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new ConfigurationProperties(new Properties()));
-        Optional<ShardingSphereTableData> actual = statisticsCollector.collect("foo_db", mock(ShardingSphereTable.class), metaData);
+        Optional<ShardingSphereTableData> actual = shardingSphereTableStatisticsCollector.collect("foo_db", "foo_db", mock(ShardingSphereTable.class), metaData);
         assertTrue(actual.isPresent());
         assertThat(actual.get().getName(), is("sharding_table_statistics"));
         List<ShardingSphereRowData> actualRows = new ArrayList<>(actual.get().getRows());

features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/data/dialect/type/OpenGaussShardingStatisticsTableCollectorTest.java

@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
-import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector;
+import org.apache.shardingsphere.infra.metadata.statistics.collector.dialect.shardingsphere.ShardingSphereTableStatisticsCollector;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.sharding.rule.ShardingRule;
 import org.apache.shardingsphere.sharding.rule.ShardingTable;
@@ -60,11 +60,11 @@ class OpenGaussShardingStatisticsTableCollectorTest {
 
     private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "openGauss");
 
-    private ShardingSphereStatisticsCollector statisticsCollector;
+    private ShardingSphereTableStatisticsCollector shardingSphereTableStatisticsCollector;
 
     @BeforeEach
     void setUp() {
-        statisticsCollector = TypedSPILoader.getService(ShardingSphereStatisticsCollector.class, "sharding_table_statistics");
+        shardingSphereTableStatisticsCollector = TypedSPILoader.getService(ShardingSphereTableStatisticsCollector.class, "shardingsphere.sharding_table_statistics");
     }
 
     @Test
@@ -77,7 +77,7 @@ void assertCollectWithoutExistedTables() throws SQLException {
         ShardingSphereDatabase database = new ShardingSphereDatabase(
                 "foo_db", databaseType, new ResourceMetaData(Collections.emptyMap(), storageUnits), new RuleMetaData(Collections.singleton(rule)), Collections.emptyList());
         ShardingSphereMetaData metaData = new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new ConfigurationProperties(new Properties()));
-        Optional<ShardingSphereTableData> actual = statisticsCollector.collect("foo_db", mock(ShardingSphereTable.class), metaData);
+        Optional<ShardingSphereTableData> actual = shardingSphereTableStatisticsCollector.collect("foo_db", "foo_db", mock(ShardingSphereTable.class), metaData);
         assertTrue(actual.isPresent());
         assertThat(actual.get().getName(), is("sharding_table_statistics"));
         List<ShardingSphereRowData> actualRows = new ArrayList<>(actual.get().getRows());
@@ -96,7 +96,7 @@ void assertCollectWithExistedTables() throws SQLException {
         ShardingSphereDatabase database = new ShardingSphereDatabase(
                 "foo_db", databaseType, new ResourceMetaData(Collections.emptyMap(), storageUnits), new RuleMetaData(Collections.singleton(rule)), Collections.emptyList());
         ShardingSphereMetaData metaData = new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new ConfigurationProperties(new Properties()));
-        Optional<ShardingSphereTableData> actual = statisticsCollector.collect("foo_db", mock(ShardingSphereTable.class), metaData);
+        Optional<ShardingSphereTableData> actual = shardingSphereTableStatisticsCollector.collect("foo_db", "foo_db", mock(ShardingSphereTable.class), metaData);
         assertTrue(actual.isPresent());
         assertThat(actual.get().getName(), is("sharding_table_statistics"));
         List<ShardingSphereRowData> actualRows = new ArrayList<>(actual.get().getRows());

features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/data/dialect/type/PostgreSQLShardingStatisticsTableCollectorTest.java

@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereRowData;
 import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
-import org.apache.shardingsphere.infra.metadata.statistics.collector.ShardingSphereStatisticsCollector;
+import org.apache.shardingsphere.infra.metadata.statistics.collector.dialect.shardingsphere.ShardingSphereTableStatisticsCollector;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.sharding.rule.ShardingRule;
 import org.apache.shardingsphere.sharding.rule.ShardingTable;
@@ -59,11 +59,11 @@ class PostgreSQLShardingStatisticsTableCollectorTest {
 
     private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
 
-    private ShardingSphereStatisticsCollector statisticsCollector;
+    private ShardingSphereTableStatisticsCollector shardingSphereTableStatisticsCollector;
 
     @BeforeEach
     void setUp() {
-        statisticsCollector = TypedSPILoader.getService(ShardingSphereStatisticsCollector.class, "sharding_table_statistics");
+        shardingSphereTableStatisticsCollector = TypedSPILoader.getService(ShardingSphereTableStatisticsCollector.class, "shardingsphere.sharding_table_statistics");
     }
 
     @Test
@@ -76,7 +76,7 @@ void assertCollect() throws SQLException {
         ShardingSphereDatabase database = new ShardingSphereDatabase(
                 "foo_db", databaseType, new ResourceMetaData(Collections.emptyMap(), storageUnits), new RuleMetaData(Collections.singleton(rule)), Collections.emptyList());
         ShardingSphereMetaData metaData = new ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), new ConfigurationProperties(new Properties()));
-        Optional<ShardingSphereTableData> actual = statisticsCollector.collect("foo_db", mock(ShardingSphereTable.class), metaData);
+        Optional<ShardingSphereTableData> actual = shardingSphereTableStatisticsCollector.collect("foo_db", "foo_db", mock(ShardingSphereTable.class), metaData);
         assertTrue(actual.isPresent());
         assertThat(actual.get().getName(), is("sharding_table_statistics"));
         List<ShardingSphereRowData> actualRows = new ArrayList<>(actual.get().getRows());

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/ShardingSphereDatabaseData.java

@@ -20,6 +20,7 @@
 import com.cedarsoftware.util.CaseInsensitiveMap;
 import lombok.Getter;
 
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -28,7 +29,7 @@
 @Getter
 public final class ShardingSphereDatabaseData {
 
-    private final Map<String, ShardingSphereSchemaData> schemaData = new CaseInsensitiveMap<>();
+    private final Map<String, ShardingSphereSchemaData> schemaData = Collections.synchronizedMap(new CaseInsensitiveMap<>());
 
     /**
      * Judge whether to contains schema.

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/ShardingSphereSchemaData.java

@@ -20,6 +20,7 @@
 import com.cedarsoftware.util.CaseInsensitiveMap;
 import lombok.Getter;
 
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -28,7 +29,7 @@
 @Getter
 public final class ShardingSphereSchemaData {
 
-    private final Map<String, ShardingSphereTableData> tableData = new CaseInsensitiveMap<>();
+    private final Map<String, ShardingSphereTableData> tableData = Collections.synchronizedMap(new CaseInsensitiveMap<>());
 
     /**
      * Get ShardingSphere table meta data via table name.

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/ShardingSphereStatistics.java

@@ -20,6 +20,7 @@
 import com.cedarsoftware.util.CaseInsensitiveMap;
 import lombok.Getter;
 
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -28,7 +29,7 @@
 @Getter
 public final class ShardingSphereStatistics {
 
-    private final Map<String, ShardingSphereDatabaseData> databaseData = new CaseInsensitiveMap<>();
+    private final Map<String, ShardingSphereDatabaseData> databaseData = Collections.synchronizedMap(new CaseInsensitiveMap<>());
 
     /**
      * Get ShardingSphere database.

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/StatisticsCollectEngine.java

@@ -0,0 +1,52 @@
+/*
+ * 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.statistics.collector;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
+import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
+import org.apache.shardingsphere.infra.metadata.statistics.ShardingSphereTableData;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+
+import java.sql.SQLException;
+import java.util.Optional;
+
+/**
+ * Statistics collect engine.
+ */
+@RequiredArgsConstructor
+public final class StatisticsCollectEngine {
+
+    private final DatabaseType databaseType;
+
+    /**
+     * Collect.
+     *
+     * @param databaseName database name
+     * @param schemaName schema name
+     * @param table shardingsphere table
+     * @param metaData shardingsphere metadata
+     * @return shardingsphere table data
+     * @throws SQLException SQL exception
+     */
+    public Optional<ShardingSphereTableData> collect(final String databaseName, final String schemaName, final ShardingSphereTable table, final ShardingSphereMetaData metaData) throws SQLException {
+        Optional<StatisticsCollector> statisticsCollector = TypedSPILoader.findService(StatisticsCollector.class, databaseType.getType());
+        return statisticsCollector.isPresent() ? statisticsCollector.get().collect(databaseName, schemaName, table, metaData) : Optional.empty();
+    }
+}

infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/ShardingSphereStatisticsCollector.java → infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/StatisticsCollector.java

@@ -30,16 +30,17 @@
  * ShardingSphere statistics collector.
  */
 @SingletonSPI
-public interface ShardingSphereStatisticsCollector extends TypedSPI {
+public interface StatisticsCollector extends TypedSPI {
 
     /**
      * Collect statistics.
      *
      * @param databaseName database name
-     * @param table table
+     * @param schemaName schema name
+     * @param table shardingsphere table
      * @param metaData ShardingSphere meta data
      * @return ShardingSphere table data
      * @throws SQLException SQL exception
      */
-    Optional<ShardingSphereTableData> collect(String databaseName, ShardingSphereTable table, ShardingSphereMetaData metaData) throws SQLException;
+    Optional<ShardingSphereTableData> collect(String databaseName, String schemaName, ShardingSphereTable table, ShardingSphereMetaData metaData) throws SQLException;
 }