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 2023/02/06 06:36:53 UTC
[shardingsphere] branch master updated: Add IndexReviseEngine (#24018)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 016196f0da2 Add IndexReviseEngine (#24018)
016196f0da2 is described below
commit 016196f0da21aae01ea89f0a6ed789d058aeaef4
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Feb 6 14:36:42 2023 +0800
Add IndexReviseEngine (#24018)
* Add IndexReviseEngine
* Revise javadoc
---
.../decorator/reviser/index/IndexReviseEngine.java | 55 ++++++++++++++++++++++
.../decorator/reviser/index/IndexReviser.java | 7 +--
.../metadata/SingleSchemaMetaDataDecorator.java | 4 +-
.../metadata/reviser/SingleIndexReviser.java | 7 +--
4 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/index/IndexReviseEngine.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/index/IndexReviseEngine.java
new file mode 100644
index 00000000000..545d42fdd5b
--- /dev/null
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/index/IndexReviseEngine.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.index;
+
+import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Index revise engine.
+ */
+public final class IndexReviseEngine {
+
+ /**
+ * Revise index meta data.
+ *
+ * @param tableName table name
+ * @param originalMetaDataList original index meta data list
+ * @param revisers index revisers
+ * @return revised index meta data
+ */
+ public Collection<IndexMetaData> revise(final String tableName, final Collection<IndexMetaData> originalMetaDataList, final Collection<IndexReviser> revisers) {
+ return originalMetaDataList.stream().map(each -> revise(tableName, each, revisers)).filter(Optional::isPresent).map(Optional::get).collect(Collectors.toCollection(LinkedHashSet::new));
+ }
+
+ private Optional<IndexMetaData> revise(final String tableName, final IndexMetaData originalMetaData, final Collection<IndexReviser> revisers) {
+ IndexMetaData result = originalMetaData;
+ for (IndexReviser each : revisers) {
+ Optional<IndexMetaData> 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/index/IndexReviser.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/index/IndexReviser.java
index 357318109aa..bead54b588d 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/index/IndexReviser.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/decorator/reviser/index/IndexReviser.java
@@ -18,7 +18,8 @@
package org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.index;
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.TableMetaData;
+
+import java.util.Optional;
/**
* Index reviser.
@@ -28,9 +29,9 @@ public interface IndexReviser {
/**
* Revise index meta data.
*
- * @param tableMetaData table meta data
+ * @param tableName table name
* @param originalMetaData original index meta data
* @return revised index meta data
*/
- IndexMetaData revise(TableMetaData tableMetaData, IndexMetaData originalMetaData);
+ Optional<IndexMetaData> revise(String tableName, IndexMetaData 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 f10fc75099a..6eb0ba4f207 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,6 +18,7 @@
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.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;
@@ -29,6 +30,7 @@ import org.apache.shardingsphere.single.metadata.reviser.SingleIndexReviser;
import org.apache.shardingsphere.single.rule.SingleRule;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.Map;
@@ -58,7 +60,7 @@ public final class SingleSchemaMetaDataDecorator implements RuleBasedSchemaMetaD
}
private Collection<IndexMetaData> getIndex(final TableMetaData tableMetaData) {
- return tableMetaData.getIndexes().stream().map(each -> new SingleIndexReviser().revise(tableMetaData, each)).collect(Collectors.toList());
+ return new IndexReviseEngine().revise(tableMetaData.getName(), tableMetaData.getIndexes(), Collections.singleton(new SingleIndexReviser()));
}
private Collection<ConstraintMetaData> getConstraint(final TableMetaData tableMetaData) {
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleIndexReviser.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleIndexReviser.java
index c3f4c1c89c2..e24f00f0f61 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleIndexReviser.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/metadata/reviser/SingleIndexReviser.java
@@ -19,16 +19,17 @@ package org.apache.shardingsphere.single.metadata.reviser;
import org.apache.shardingsphere.infra.metadata.database.schema.decorator.reviser.index.IndexReviser;
import org.apache.shardingsphere.infra.metadata.database.schema.loader.model.IndexMetaData;
-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 index reviser.
*/
public final class SingleIndexReviser implements IndexReviser {
@Override
- public IndexMetaData revise(final TableMetaData tableMetaData, final IndexMetaData originalMetaData) {
- return new IndexMetaData(IndexMetaDataUtil.getLogicIndexName(originalMetaData.getName(), tableMetaData.getName()));
+ public Optional<IndexMetaData> revise(final String tableName, final IndexMetaData originalMetaData) {
+ return Optional.of(new IndexMetaData(IndexMetaDataUtil.getLogicIndexName(originalMetaData.getName(), tableName)));
}
}