This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 b715c5e8d24 Add ConstraintReviseEngine (#24019)
b715c5e8d24 is described below
commit b715c5e8d2444a2251f881ed9099a52daa39160e
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Feb 6 15:02:11 2023 +0800
Add ConstraintReviseEngine (#24019)
---
.../reviser/constraint/ConstraintReviseEngine.java | 55 ++++++++++++++++++++++
.../reviser/constraint/ConstraintReviser.java | 7 +--
.../metadata/SingleSchemaMetaDataDecorator.java | 17 ++-----
.../metadata/reviser/SingleConstraintReviser.java | 9 ++--
4 files changed, 68 insertions(+), 20 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviseEngine.java
new file mode 100644
index 00000000000..ff0720c52f8
--- /dev/null
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviseEngine.java
@@ -0,0 +1,55 @@
+/*
+ * 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.decorator.reviser.constraint;
+
+import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Constraint revise engine.
+ */
+public final class ConstraintReviseEngine {
+
+ /**
+ * Revise constraint meta data.
+ *
+ * @param tableName table name
+ * @param originalMetaDataList original constraint meta data list
+ * @param revisers constraint revisers
+ * @return revised constraint meta data
+ */
+ public Collection<ConstraintMetaData> revise(final String tableName, final
Collection<ConstraintMetaData> originalMetaDataList, final
Collection<ConstraintReviser> revisers) {
+ return originalMetaDataList.stream().map(each -> revise(tableName,
each,
revisers)).filter(Optional::isPresent).map(Optional::get).collect(Collectors.toCollection(LinkedHashSet::new));
+ }
+
+ private Optional<ConstraintMetaData> revise(final String tableName, final
ConstraintMetaData originalMetaData, final Collection<ConstraintReviser>
revisers) {
+ ConstraintMetaData result = originalMetaData;
+ for (ConstraintReviser each : revisers) {
+ Optional<ConstraintMetaData> revisedMetaData =
each.revise(tableName, result);
+ if (!revisedMetaData.isPresent()) {
+ return Optional.empty();
+ }
+ result = revisedMetaData.get();
+ }
+ return Optional.of(result);
+ }
+}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviser.java
index db76ee6ae67..f01fedf2fe9 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviser.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/constraint/ConstraintReviser.java
@@ -18,7 +18,8 @@
package
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.constraint;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+
+import java.util.Optional;
/**
* Constraint reviser.
@@ -28,9 +29,9 @@ public interface ConstraintReviser {
/**
* Revise constraint meta data.
*
- * @param tableMetaData table meta data
+ * @param tableName table name
* @param originalMetaData original constraint meta data
* @return revised constraint meta data
*/
- ConstraintMetaData revise(TableMetaData tableMetaData, ConstraintMetaData
originalMetaData);
+ Optional<ConstraintMetaData> revise(String tableName, ConstraintMetaData
originalMetaData);
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/SingleSchemaMetaDataDecorator.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/SingleSchemaMetaDataDecorator.java
index 6eb0ba4f207..11fe8632ab0 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/SingleSchemaMetaDataDecorator.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/SingleSchemaMetaDataDecorator.java
@@ -18,10 +18,10 @@
package org.apache.shardingsphere.single.metadata;
import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
+import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.column.ColumnReviseEngine;
+import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.constraint.ConstraintReviseEngine;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.index.IndexReviseEngine;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.spi.RuleBasedSchemaMetaDataDecorator;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.SchemaMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
import org.apache.shardingsphere.single.constant.SingleOrder;
@@ -35,7 +35,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.stream.Collectors;
/**
* Schema meta data decorator for single.
@@ -56,15 +55,9 @@ public final class SingleSchemaMetaDataDecorator implements
RuleBasedSchemaMetaD
}
private TableMetaData decorate(final String tableName, final TableMetaData
tableMetaData) {
- return new TableMetaData(tableName, tableMetaData.getColumns(),
getIndex(tableMetaData), getConstraint(tableMetaData));
- }
-
- private Collection<IndexMetaData> getIndex(final TableMetaData
tableMetaData) {
- return new IndexReviseEngine().revise(tableMetaData.getName(),
tableMetaData.getIndexes(), Collections.singleton(new SingleIndexReviser()));
- }
-
- private Collection<ConstraintMetaData> getConstraint(final TableMetaData
tableMetaData) {
- return tableMetaData.getConstrains().stream().map(each -> new
SingleConstraintReviser().revise(tableMetaData,
each)).collect(Collectors.toList());
+ return new TableMetaData(tableName, new
ColumnReviseEngine().revise(tableMetaData.getColumns(),
Collections.emptyList()),
+ new IndexReviseEngine().revise(tableMetaData.getName(),
tableMetaData.getIndexes(), Collections.singleton(new SingleIndexReviser())),
+ new ConstraintReviseEngine().revise(tableMetaData.getName(),
tableMetaData.getConstrains(), Collections.singleton(new
SingleConstraintReviser())));
}
@Override
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleConstraintReviser.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleConstraintReviser.java
index 503fa6e9569..aaa7f75525e 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleConstraintReviser.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleConstraintReviser.java
@@ -19,18 +19,17 @@ package org.apache.shardingsphere.single.metadata.reviser;
import
org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.constraint.ConstraintReviser;
import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.ConstraintMetaData;
-import
org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.util.IndexMetaDataUtil;
+import java.util.Optional;
+
/**
* Single constraint reviser.
*/
public final class SingleConstraintReviser implements ConstraintReviser {
@Override
- public ConstraintMetaData revise(final TableMetaData tableMetaData, final
ConstraintMetaData originalMetaData) {
- return new ConstraintMetaData(
-
IndexMetaDataUtil.getLogicIndexName(originalMetaData.getName(),
tableMetaData.getName()), originalMetaData.getReferencedTableName());
-
+ public Optional<ConstraintMetaData> revise(final String tableName, final
ConstraintMetaData originalMetaData) {
+ return Optional.of(new
ConstraintMetaData(IndexMetaDataUtil.getLogicIndexName(originalMetaData.getName(),
tableName), originalMetaData.getReferencedTableName()));
}
}
