This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 ad7a6202ff0 Refactor IndexReviseEngine (#38888)
ad7a6202ff0 is described below
commit ad7a6202ff0a9dbfba2e51272930e3babc8d8dc2
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jun 23 01:18:08 2026 +0800
Refactor IndexReviseEngine (#38888)
---
.../reviser/index/ShardingIndexReviserTest.java | 2 +-
.../schema/reviser/index/IndexReviseEngine.java | 26 ----------------------
.../reviser/index/IndexReviseEngineTest.java | 10 ++++++---
3 files changed, 8 insertions(+), 30 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviserTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviserTest.java
index c4855749aae..11b597d1063 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviserTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/metadata/reviser/index/ShardingIndexReviserTest.java
@@ -83,7 +83,7 @@ class ShardingIndexReviserTest {
ShardingIndexReviser indexReviser = new
ShardingIndexReviser(mockShardingTable());
when(reviseEntry.getIndexReviser(rule,
"tbl_0")).thenReturn(Optional.of(indexReviser));
Collection<IndexMetaData> actual = new IndexReviseEngine<>(rule,
reviseEntry).revise("tbl_0",
Collections.singleton(truncatedActualIndexMetaData),
- Arrays.asList(tableMetaData("tbl_0",
truncatedActualIndexMetaData), tableMetaData("tbl_1",
legacyActualIndexMetaData)));
+ Arrays.asList(tableMetaData("tbl_0",
truncatedActualIndexMetaData), tableMetaData("tbl_1",
legacyActualIndexMetaData)), Collections.emptyList());
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next().getName(), is(logicIndexName));
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
index a1ace5193f8..a645b5a8805 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngine.java
@@ -24,7 +24,6 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaData
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import java.util.Collection;
-import java.util.Collections;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -40,31 +39,6 @@ public final class IndexReviseEngine<T extends
ShardingSphereRule> {
private final MetaDataReviseEntry<T> reviseEntry;
- /**
- * Revise index meta data.
- *
- * @param tableName table name
- * @param originalMetaDataList original index meta data list
- * @return revised index meta data
- */
- public Collection<IndexMetaData> revise(final String tableName, final
Collection<IndexMetaData> originalMetaDataList) {
- return revise(tableName, originalMetaDataList,
- Collections.singleton(new TableMetaData(tableName,
Collections.emptyList(), originalMetaDataList, Collections.emptyList())));
- }
-
- /**
- * Revise index meta data.
- *
- * @param tableName table name
- * @param originalMetaDataList original index meta data list
- * @param originalTableMetaDataList original table meta data list
- * @return revised index meta data
- */
- public Collection<IndexMetaData> revise(final String tableName, final
Collection<IndexMetaData> originalMetaDataList,
- final Collection<TableMetaData>
originalTableMetaDataList) {
- return revise(tableName, originalMetaDataList,
originalTableMetaDataList, Collections.emptyList());
- }
-
/**
* Revise index meta data.
*
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngineTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngineTest.java
index 2e57cb89dc4..f04c58687b7 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngineTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/index/IndexReviseEngineTest.java
@@ -52,7 +52,9 @@ class IndexReviseEngineTest {
@Test
void assertReviseWithoutIndexReviser() {
when(metaDataReviseEntry.getIndexReviser(any(),
eq("foo_tbl"))).thenReturn(Optional.empty());
- Collection<IndexMetaData> actual = indexReviseEngine.revise("foo_tbl",
Collections.singleton(new IndexMetaData("foo_idx")));
+ Collection<IndexMetaData> originalMetaDataList =
Collections.singleton(new IndexMetaData("foo_idx"));
+ Collection<IndexMetaData> actual = indexReviseEngine.revise("foo_tbl",
+ originalMetaDataList, Collections.singleton(new
TableMetaData("foo_tbl", Collections.emptyList(), originalMetaDataList,
Collections.emptyList())), Collections.emptyList());
assertThat(actual.size(), is(1));
assertIndexMetaData(actual.iterator().next(), new
IndexMetaData("foo_idx"));
}
@@ -62,7 +64,9 @@ class IndexReviseEngineTest {
IndexReviser reviser = mock(IndexReviser.class);
when(reviser.revise(eq("foo_tbl"), any(), any(), anyCollection(),
any())).thenReturn(Optional.of(new IndexMetaData("foo_idx")));
when(metaDataReviseEntry.getIndexReviser(any(),
eq("foo_tbl"))).thenReturn(Optional.of(reviser));
- Collection<IndexMetaData> actual = indexReviseEngine.revise("foo_tbl",
Arrays.asList(new IndexMetaData("idx_0"), new IndexMetaData("idx_1")));
+ Collection<IndexMetaData> originalMetaDataList = Arrays.asList(new
IndexMetaData("idx_0"), new IndexMetaData("idx_1"));
+ Collection<IndexMetaData> actual = indexReviseEngine.revise("foo_tbl",
+ originalMetaDataList, Collections.singleton(new
TableMetaData("foo_tbl", Collections.emptyList(), originalMetaDataList,
Collections.emptyList())), Collections.emptyList());
assertThat(actual.size(), is(2));
assertIndexMetaData(actual.iterator().next(), new
IndexMetaData("foo_idx"));
assertIndexMetaData(actual.iterator().next(), new
IndexMetaData("foo_idx"));
@@ -75,7 +79,7 @@ class IndexReviseEngineTest {
Collection<TableMetaData> originalTables = Collections.singleton(new
TableMetaData("foo_tbl", Collections.emptyList(), originalIndexes,
Collections.emptyList()));
when(reviser.revise(eq("foo_tbl"), any(), eq(originalTables),
anyCollection(), any())).thenReturn(Optional.of(new IndexMetaData("foo_idx")));
when(metaDataReviseEntry.getIndexReviser(any(),
eq("foo_tbl"))).thenReturn(Optional.of(reviser));
- Collection<IndexMetaData> actual = indexReviseEngine.revise("foo_tbl",
originalIndexes, originalTables);
+ Collection<IndexMetaData> actual = indexReviseEngine.revise("foo_tbl",
originalIndexes, originalTables, Collections.emptyList());
assertThat(actual.size(), is(2));
assertIndexMetaData(actual.iterator().next(), new
IndexMetaData("foo_idx"));
assertIndexMetaData(actual.iterator().next(), new
IndexMetaData("foo_idx"));
