Use excluded table names to avoid duplicate load tables (#5062)

* Use excluded table names to avoid duplicate load tables * remove SchemaMetaData.getter * rename RuleTableMetaDataLoader to RuleMetaDataLoader
apache · Apr 3, 2020 · d205c5d · d205c5d
1 parent e98ce80
commit d205c5d
Show file tree

Hide file tree

Showing 17 changed files with 105 additions and 75 deletions.
diff --git a/...tadata/EncryptTableMetaDataDecorator.java → ...pt/metadata/EncryptMetaDataDecorator.java b/...tadata/EncryptTableMetaDataDecorator.java → ...pt/metadata/EncryptMetaDataDecorator.java
@@ -20,15 +20,15 @@
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
 import org.apache.shardingsphere.sql.parser.binder.metadata.column.ColumnMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
-import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataDecorator;
+import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataDecorator;
 
 import java.util.Collection;
 import java.util.LinkedList;
 
 /**
  * Table meta data decorator for encrypt.
  */
-public final class EncryptTableMetaDataDecorator implements RuleTableMetaDataDecorator<EncryptRule> {
+public final class EncryptMetaDataDecorator implements RuleMetaDataDecorator<EncryptRule> {
 
     @Override
     public TableMetaData decorate(final String tableName, final TableMetaData tableMetaData, final EncryptRule encryptRule) {

diff --git a/.../metadata/EncryptTableMetaDataLoader.java → ...crypt/metadata/EncryptMetaDataLoader.java b/.../metadata/EncryptTableMetaDataLoader.java → ...crypt/metadata/EncryptMetaDataLoader.java
@@ -18,11 +18,12 @@
 package org.apache.shardingsphere.encrypt.metadata;
 
 import org.apache.shardingsphere.encrypt.rule.EncryptRule;
+import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaDataLoader;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;
 import org.apache.shardingsphere.underlying.common.database.type.DatabaseType;
-import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataLoader;
+import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataLoader;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -32,20 +33,22 @@
 import java.util.Optional;
 
 /**
- * Table meta data loader for encrypt.
+ * Meta data loader for encrypt.
  */
-public final class EncryptTableMetaDataLoader implements RuleTableMetaDataLoader<EncryptRule> {
+public final class EncryptMetaDataLoader implements RuleMetaDataLoader<EncryptRule> {
 
     @Override
-    public Map<String, TableMetaData> load(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap, 
-                                           final EncryptRule encryptRule, final ConfigurationProperties properties) throws SQLException {
+    public SchemaMetaData load(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap,
+                               final EncryptRule encryptRule, final ConfigurationProperties properties, final Collection<String> excludedTableNames) throws SQLException {
         DataSource dataSource = dataSourceMap.values().iterator().next();
         Collection<String> encryptTableNames = encryptRule.getEncryptTableNames();
         Map<String, TableMetaData> result = new HashMap<>(encryptTableNames.size(), 1);
         for (String each : encryptTableNames) {
-            result.put(each, TableMetaDataLoader.load(dataSource, each, databaseType.getName()));
+            if (!excludedTableNames.contains(each)) {
+                result.put(each, TableMetaDataLoader.load(dataSource, each, databaseType.getName()));
+            }
         }
-        return result;
+        return new SchemaMetaData(result);
     }
 
     @Override

diff --git a/...tadata.schema.spi.RuleTableMetaDataLoader → ...metadata.schema.spi.RuleMetaDataDecorator b/...tadata.schema.spi.RuleTableMetaDataLoader → ...metadata.schema.spi.RuleMetaDataDecorator
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.core.metadata.ShardingTableMetaDataLoader
+org.apache.shardingsphere.encrypt.metadata.EncryptMetaDataDecorator
diff --git a/...tadata.schema.spi.RuleTableMetaDataLoader → ...on.metadata.schema.spi.RuleMetaDataLoader b/...tadata.schema.spi.RuleTableMetaDataLoader → ...on.metadata.schema.spi.RuleMetaDataLoader
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.encrypt.metadata.EncryptTableMetaDataLoader
+org.apache.shardingsphere.encrypt.metadata.EncryptMetaDataLoader
diff --git a/...adata/MasterSlaveTableMetaDataLoader.java → ...e/metadata/MasterSlaveMetaDataLoader.java b/...adata/MasterSlaveTableMetaDataLoader.java → ...e/metadata/MasterSlaveMetaDataLoader.java
@@ -18,30 +18,32 @@
 package org.apache.shardingsphere.masterslave.metadata;
 
 import org.apache.shardingsphere.core.rule.MasterSlaveRule;
+import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaDataLoader;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaDataLoader;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationProperties;
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationPropertyKey;
 import org.apache.shardingsphere.underlying.common.database.type.DatabaseType;
-import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataLoader;
+import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataLoader;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 
 /**
- * Table meta data loader for master slave.
+ * Meta data loader for master slave.
  */
-public final class MasterSlaveTableMetaDataLoader implements RuleTableMetaDataLoader<MasterSlaveRule> {
+public final class MasterSlaveMetaDataLoader implements RuleMetaDataLoader<MasterSlaveRule> {
 
     @Override
-    public Map<String, TableMetaData> load(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap, 
-                                           final MasterSlaveRule masterSlaveRule, final ConfigurationProperties properties) throws SQLException {
+    public SchemaMetaData load(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap,
+                               final MasterSlaveRule masterSlaveRule, final ConfigurationProperties properties, final Collection<String> excludedTableNames) throws SQLException {
         DataSource dataSource = dataSourceMap.values().iterator().next();
         int maxConnectionCount = properties.getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
-        return SchemaMetaDataLoader.load(dataSource, maxConnectionCount, databaseType.getName()).getTables();
+        return SchemaMetaDataLoader.load(dataSource, maxConnectionCount, databaseType.getName(), excludedTableNames);
     }
 
     @Override

diff --git a/...rvices/org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataLoader b/...rvices/org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataLoader
@@ -0,0 +1,19 @@
+
+#
+# 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.
+#
+
+org.apache.shardingsphere.masterslave.metadata.MasterSlaveMetaDataLoader
diff --git a/...s/org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataLoader b/...s/org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataLoader
diff --git a/...adata/ShardingTableMetaDataDecorator.java → ...e/metadata/ShardingMetaDataDecorator.java b/...adata/ShardingTableMetaDataDecorator.java → ...e/metadata/ShardingMetaDataDecorator.java
@@ -22,7 +22,7 @@
 import org.apache.shardingsphere.sql.parser.binder.metadata.column.ColumnMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.index.IndexMetaData;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
-import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataDecorator;
+import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataDecorator;
 import org.apache.shardingsphere.underlying.common.rule.DataNode;
 
 import java.util.Collection;
@@ -34,7 +34,7 @@
 /**
  * Table meta data decorator for sharding.
  */
-public final class ShardingTableMetaDataDecorator implements RuleTableMetaDataDecorator<ShardingRule> {
+public final class ShardingMetaDataDecorator implements RuleMetaDataDecorator<ShardingRule> {
 
     @Override
     public TableMetaData decorate(final String tableName, final TableMetaData tableMetaData, final ShardingRule shardingRule) {

diff --git a/...metadata/ShardingTableMetaDataLoader.java → ...core/metadata/ShardingMetaDataLoader.java b/...metadata/ShardingTableMetaDataLoader.java → ...core/metadata/ShardingMetaDataLoader.java
@@ -29,7 +29,7 @@
 import org.apache.shardingsphere.underlying.common.config.properties.ConfigurationPropertyKey;
 import org.apache.shardingsphere.underlying.common.database.type.DatabaseType;
 import org.apache.shardingsphere.underlying.common.exception.ShardingSphereException;
-import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleTableMetaDataLoader;
+import org.apache.shardingsphere.underlying.common.metadata.schema.spi.RuleMetaDataLoader;
 import org.apache.shardingsphere.underlying.common.rule.DataNode;
 
 import javax.sql.DataSource;
@@ -50,9 +50,9 @@
 import java.util.stream.Collectors;
 
 /**
- * Table meta data loader for sharding.
+ * Meta data loader for sharding.
  */
-public final class ShardingTableMetaDataLoader implements RuleTableMetaDataLoader<ShardingRule> {
+public final class ShardingMetaDataLoader implements RuleMetaDataLoader<ShardingRule> {
 
     private static final String LINE_SEPARATOR = System.getProperty("line.separator");
 
@@ -61,13 +61,15 @@ public final class ShardingTableMetaDataLoader implements RuleTableMetaDataLoade
     private static final int FUTURE_GET_TIME_OUT_SEC = 5;
 
     @Override
-    public Map<String, TableMetaData> load(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap,
-                              final ShardingRule shardingRule, final ConfigurationProperties properties) throws SQLException {
-        Map<String, TableMetaData> result = new HashMap<>(shardingRule.getTableRules().size(), 1);
+    public SchemaMetaData load(final DatabaseType databaseType, final Map<String, DataSource> dataSourceMap,
+                              final ShardingRule shardingRule, final ConfigurationProperties properties, final Collection<String> excludedTableNames) throws SQLException {
+        SchemaMetaData result = new SchemaMetaData(new HashMap<>(shardingRule.getTableRules().size(), 1));
         for (TableRule each : shardingRule.getTableRules()) {
-            load(databaseType, dataSourceMap, each.getLogicTable(), shardingRule, properties).ifPresent(tableMetaData -> result.put(each.getLogicTable(), tableMetaData));
+            if (!excludedTableNames.contains(each.getLogicTable())) {
+                load(databaseType, dataSourceMap, each.getLogicTable(), shardingRule, properties).ifPresent(tableMetaData -> result.put(each.getLogicTable(), tableMetaData));
+            }
         }
-        result.putAll(loadDefaultSchemaMetaData(databaseType, dataSourceMap, shardingRule, properties).getTables());
+        result.merge(loadDefaultSchemaMetaData(databaseType, dataSourceMap, shardingRule, properties));
         return result;
     }
 
@@ -132,7 +134,7 @@ private TableMetaData loadTableByDataNode(final DataNode dataNode, final Databas
     }
 
     private void checkUniformed(final String logicTableName, final Map<String, TableMetaData> actualTableMetaDataMap, final ShardingRule shardingRule) {
-        ShardingTableMetaDataDecorator decorator = new ShardingTableMetaDataDecorator();
+        ShardingMetaDataDecorator decorator = new ShardingMetaDataDecorator();
         TableMetaData sample = decorator.decorate(logicTableName, actualTableMetaDataMap.values().iterator().next(), shardingRule);
         Collection<TableMetaDataViolation> violations = actualTableMetaDataMap.entrySet().stream()
                 .filter(entry -> !sample.equals(decorator.decorate(logicTableName, entry.getValue(), shardingRule)))

diff --git a/...ata.schema.spi.RuleTableMetaDataDecorator → ...metadata.schema.spi.RuleMetaDataDecorator b/...ata.schema.spi.RuleTableMetaDataDecorator → ...metadata.schema.spi.RuleMetaDataDecorator
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.core.metadata.ShardingTableMetaDataDecorator
+org.apache.shardingsphere.core.metadata.ShardingMetaDataDecorator
diff --git a/...ata.schema.spi.RuleTableMetaDataDecorator → ...on.metadata.schema.spi.RuleMetaDataLoader b/...ata.schema.spi.RuleTableMetaDataDecorator → ...on.metadata.schema.spi.RuleMetaDataLoader
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.encrypt.metadata.EncryptTableMetaDataDecorator
+org.apache.shardingsphere.core.metadata.ShardingMetaDataLoader
diff --git a/...main/java/org/apache/shardingsphere/shardingproxy/backend/schema/impl/ShardingSchema.java b/...main/java/org/apache/shardingsphere/shardingproxy/backend/schema/impl/ShardingSchema.java
@@ -21,10 +21,10 @@
 import lombok.Getter;
 import org.apache.shardingsphere.api.config.sharding.ShardingRuleConfiguration;
 import org.apache.shardingsphere.core.log.ConfigurationLogger;
-import org.apache.shardingsphere.core.metadata.ShardingTableMetaDataDecorator;
+import org.apache.shardingsphere.core.metadata.ShardingMetaDataDecorator;
 import org.apache.shardingsphere.core.rule.MasterSlaveRule;
 import org.apache.shardingsphere.core.rule.ShardingRule;
-import org.apache.shardingsphere.encrypt.metadata.EncryptTableMetaDataDecorator;
+import org.apache.shardingsphere.encrypt.metadata.EncryptMetaDataDecorator;
 import org.apache.shardingsphere.orchestration.core.common.event.ShardingRuleChangedEvent;
 import org.apache.shardingsphere.orchestration.core.common.rule.OrchestrationMasterSlaveRule;
 import org.apache.shardingsphere.orchestration.core.common.rule.OrchestrationShardingRule;
@@ -198,9 +198,9 @@ private Optional<TableMetaData> loadTableMeta(final String tableName) throws SQL
                 LogicSchemas.getInstance().getDatabaseType(), getBackendDataSource().getDataSources(), tableName, ShardingProxyContext.getInstance().getProperties());
         if (tableMetaData.isPresent()) {
             TableMetaData result = tableMetaData.get();
-            result = new ShardingTableMetaDataDecorator().decorate(tableName, result, shardingRule);
+            result = new ShardingMetaDataDecorator().decorate(tableName, result, shardingRule);
             if (!shardingRule.getEncryptRule().getEncryptTableNames().isEmpty()) {
-                result = new EncryptTableMetaDataDecorator().decorate(tableName, result, shardingRule.getEncryptRule());
+                result = new EncryptMetaDataDecorator().decorate(tableName, result, shardingRule.getEncryptRule());
             }
             return Optional.of(result);
         }

diff --git a/...main/java/org/apache/shardingsphere/sql/parser/binder/metadata/schema/SchemaMetaData.java b/...main/java/org/apache/shardingsphere/sql/parser/binder/metadata/schema/SchemaMetaData.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.sql.parser.binder.metadata.schema;
 
-import lombok.Getter;
 import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
 
 import java.util.ArrayList;
@@ -31,7 +30,6 @@
 /**
  * Schema meta data.
  */
-@Getter
 public final class SchemaMetaData {
 
     private final Map<String, TableMetaData> tables;

diff --git a/...ava/org/apache/shardingsphere/sql/parser/binder/metadata/schema/SchemaMetaDataLoader.java b/...ava/org/apache/shardingsphere/sql/parser/binder/metadata/schema/SchemaMetaDataLoader.java
@@ -62,9 +62,24 @@ public final class SchemaMetaDataLoader {
      * @throws SQLException SQL exception
      */
     public static SchemaMetaData load(final DataSource dataSource, final int maxConnectionCount, final String databaseType) throws SQLException {
+        return load(dataSource, maxConnectionCount, databaseType, Collections.emptyList());
+    }
+
+    /**
+     * Load schema meta data.
+     *
+     * @param dataSource data source
+     * @param maxConnectionCount count of max connections permitted to use for this query
+     * @param databaseType database type
+     * @param excludedTableNames excluded table names
+     * @return schema meta data
+     * @throws SQLException SQL exception
+     */
+    public static SchemaMetaData load(final DataSource dataSource, final int maxConnectionCount, final String databaseType, final Collection<String> excludedTableNames) throws SQLException {
         List<String> tableNames;
         try (Connection connection = dataSource.getConnection()) {
             tableNames = loadAllTableNames(connection);
+            tableNames.removeAll(excludedTableNames);
         }
         log.info("Loading {} tables' meta data.", tableNames.size());
         if (0 == tableNames.size()) {