You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/11/09 07:16:37 UTC
[shardingsphere] branch master updated: #7318,
remove table addressing (#8089)
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 633a8ac #7318, remove table addressing (#8089)
633a8ac is described below
commit 633a8ac889d5f91c288b8c330ae7b2a6d4194dac
Author: Zhang Yonglun <zh...@apache.org>
AuthorDate: Mon Nov 9 15:09:07 2020 +0800
#7318, remove table addressing (#8089)
---
.../HATableAddressingMetaDataDecorator.java | 58 ----------------------
...ema.loader.spi.TableAddressingMetaDataDecorator | 18 -------
2 files changed, 76 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/metadata/HATableAddressingMetaDataDecorator.java b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/metadata/HATableAddressingMetaDataDecorator.java
deleted file mode 100644
index a84fccd..0000000
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/java/org/apache/shardingsphere/ha/metadata/HATableAddressingMetaDataDecorator.java
+++ /dev/null
@@ -1,58 +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.ha.metadata;
-
-import org.apache.shardingsphere.ha.rule.HARule;
-import org.apache.shardingsphere.infra.metadata.schema.model.addressing.TableAddressingMetaData;
-import org.apache.shardingsphere.infra.metadata.schema.loader.spi.TableAddressingMetaDataDecorator;
-import org.apache.shardingsphere.ha.constant.HAOrder;
-import org.apache.shardingsphere.ha.rule.HADataSourceRule;
-
-import java.util.Collection;
-import java.util.Map.Entry;
-
-/**
- * Table addressing meta data decorator of HA.
- */
-public final class HATableAddressingMetaDataDecorator implements TableAddressingMetaDataDecorator<HARule> {
-
- @Override
- public void decorate(final HARule rule, final TableAddressingMetaData metaData) {
- for (String each : rule.getAllLogicDataSourceNames()) {
- rule.findDataSourceRule(each).ifPresent(dataSourceRule -> decorate(dataSourceRule, metaData));
- }
- }
-
- private void decorate(final HADataSourceRule dataSourceRule, final TableAddressingMetaData metaData) {
- for (Entry<String, Collection<String>> entry : metaData.getTableDataSourceNamesMapper().entrySet()) {
- entry.getValue().remove(dataSourceRule.getPrimaryDataSourceName());
- entry.getValue().removeAll(dataSourceRule.getReplicaDataSourceNames());
- entry.getValue().add(dataSourceRule.getName());
- }
- }
-
- @Override
- public int getOrder() {
- return HAOrder.ORDER;
- }
-
- @Override
- public Class<HARule> getTypeClass() {
- return HARule.class;
- }
-}
diff --git a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.schema.loader.spi.TableAddressingMetaDataDecorator b/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.schema.loader.spi.TableAddressingMetaDataDecorator
deleted file mode 100644
index 63ab491..0000000
--- a/shardingsphere-features/shardingsphere-ha/shardingsphere-ha-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.metadata.schema.loader.spi.TableAddressingMetaDataDecorator
+++ /dev/null
@@ -1,18 +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.
-#
-
-org.apache.shardingsphere.ha.metadata.HATableAddressingMetaDataDecorator