This is an automated email from the ASF dual-hosted git repository. zhonghongsheng 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 82c75225ed9 Refactor SingleTableRule (#18585) 82c75225ed9 is described below commit 82c75225ed90e16bfc334d39c50e34603d1ead9a Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sat Jun 25 18:41:04 2022 +0800 Refactor SingleTableRule (#18585) * Deprecate CountInstanceRulesHandler * Refactor SingleTableRule --- .../shardingsphere/infra/distsql/constant/ExportableConstants.java | 2 -- .../org/apache/shardingsphere/singletable/rule/SingleTableRule.java | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/constant/ExportableConstants.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/constant/ExportableConstants.java index 174462e3d38..35911796612 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/constant/ExportableConstants.java +++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/distsql/constant/ExportableConstants.java @@ -31,6 +31,4 @@ public final class ExportableConstants { public static final String EXPORT_DYNAMIC_READWRITE_SPLITTING_RULE = "dynamic_readwrite_splitting_rules"; public static final String EXPORT_STATIC_READWRITE_SPLITTING_RULE = "static_readwrite_splitting_rules"; - - public static final String EXPORT_SINGLE_TABLES = "single_tables"; } diff --git a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java index 9f06820edf1..f62238da652 100644 --- a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java +++ b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/rule/SingleTableRule.java @@ -21,7 +21,6 @@ import lombok.Getter; import org.apache.shardingsphere.infra.config.props.ConfigurationProperties; import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine; import org.apache.shardingsphere.infra.datanode.DataNode; -import org.apache.shardingsphere.infra.distsql.constant.ExportableConstants; import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable; import org.apache.shardingsphere.infra.route.context.RouteContext; import org.apache.shardingsphere.infra.route.context.RouteUnit; @@ -270,7 +269,7 @@ public final class SingleTableRule implements DatabaseRule, DataNodeContainedRul @Override public Map<String, Object> getExportData() { - return Collections.singletonMap(ExportableConstants.EXPORT_SINGLE_TABLES, tableNames.keySet()); + return Collections.singletonMap("single_tables", tableNames.keySet()); } @Override