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 71814406e3e Remove useless codes on ColumnReviseEngine (#33999)
71814406e3e is described below
commit 71814406e3e5ece6c1a2ce256d91ec71d8643ed3
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Dec 10 23:13:42 2024 +0800
Remove useless codes on ColumnReviseEngine (#33999)
---
.../database/schema/reviser/MetaDataReviseEngine.java | 10 ++--------
.../database/schema/reviser/column/ColumnReviseEngine.java | 6 ------
.../schema/reviser/schema/SchemaMetaDataReviseEngine.java | 12 +++---------
.../schema/reviser/table/TableMetaDataReviseEngine.java | 8 +-------
.../reviser/schema/SchemaMetaDataReviseEngineTest.java | 6 ++----
.../schema/reviser/table/TableMetadataReviseEngineTest.java | 12 ++----------
6 files changed, 10 insertions(+), 44 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
index 6ddf574a133..798922e32b8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEngine.java
@@ -18,14 +18,11 @@
package org.apache.shardingsphere.infra.metadata.database.schema.reviser;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
-import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
+import
org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.schema.SchemaMetaDataReviseEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import javax.sql.DataSource;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -49,10 +46,7 @@ public final class MetaDataReviseEngine {
public Map<String, SchemaMetaData> revise(final Map<String,
SchemaMetaData> schemaMetaDataMap, final GenericSchemaBuilderMaterial material)
{
Map<String, SchemaMetaData> result = new
LinkedHashMap<>(schemaMetaDataMap.size(), 1F);
for (Entry<String, SchemaMetaData> entry :
schemaMetaDataMap.entrySet()) {
- // TODO establish a corresponding relationship between tables and
data sources
- DatabaseType databaseType =
material.getStorageUnits().values().stream().map(StorageUnit::getStorageType).findFirst().orElse(null);
- DataSource dataSource =
material.getStorageUnits().values().stream().map(StorageUnit::getDataSource).findFirst().orElse(null);
- result.put(entry.getKey(), new SchemaMetaDataReviseEngine(rules,
material.getProps(), databaseType, dataSource).revise(entry.getValue()));
+ result.put(entry.getKey(), new SchemaMetaDataReviseEngine(rules,
material.getProps()).revise(entry.getValue()));
}
return result;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
index ba7355f7743..dc744ef076b 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnReviseEngine.java
@@ -19,11 +19,9 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import javax.sql.DataSource;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Optional;
@@ -38,10 +36,6 @@ public final class ColumnReviseEngine<T extends
ShardingSphereRule> {
private final T rule;
- private final DatabaseType databaseType;
-
- private final DataSource dataSource;
-
private final MetaDataReviseEntry<T> reviseEntry;
/**
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
index cacecc6145b..03bf9842152 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngine.java
@@ -19,15 +19,13 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.schema;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.table.TableMetaDataReviseEngine;
-import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
+import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
+import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.table.TableMetaDataReviseEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.spi.type.ordered.OrderedSPILoader;
-import javax.sql.DataSource;
import java.util.Collection;
import java.util.Map.Entry;
import java.util.Optional;
@@ -43,10 +41,6 @@ public final class SchemaMetaDataReviseEngine {
private final ConfigurationProperties props;
- private final DatabaseType databaseType;
-
- private final DataSource dataSource;
-
/**
* Revise schema meta data.
*
@@ -63,7 +57,7 @@ public final class SchemaMetaDataReviseEngine {
}
private <T extends ShardingSphereRule> SchemaMetaData revise(final
SchemaMetaData originalMetaData, final T rule, final MetaDataReviseEntry<T>
reviseEntry) {
- TableMetaDataReviseEngine<T> tableMetaDataReviseEngine = new
TableMetaDataReviseEngine<>(rule, databaseType, dataSource, reviseEntry);
+ TableMetaDataReviseEngine<T> tableMetaDataReviseEngine = new
TableMetaDataReviseEngine<>(rule, reviseEntry);
Optional<? extends SchemaTableAggregationReviser<T>>
aggregationReviser = reviseEntry.getSchemaTableAggregationReviser(props);
if (!aggregationReviser.isPresent()) {
return new SchemaMetaData(originalMetaData.getName(),
originalMetaData.getTables().stream().map(tableMetaDataReviseEngine::revise).collect(Collectors.toList()));
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
index f29c355b44b..3822599555e 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetaDataReviseEngine.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.metadata.database.schema.reviser.table;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnReviseEngine;
@@ -26,7 +25,6 @@ import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.constrai
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.index.IndexReviseEngine;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import javax.sql.DataSource;
import java.util.Optional;
/**
@@ -39,10 +37,6 @@ public final class TableMetaDataReviseEngine<T extends
ShardingSphereRule> {
private final T rule;
- private final DatabaseType databaseType;
-
- private final DataSource dataSource;
-
private final MetaDataReviseEntry<T> reviseEntry;
/**
@@ -54,7 +48,7 @@ public final class TableMetaDataReviseEngine<T extends
ShardingSphereRule> {
public TableMetaData revise(final TableMetaData originalMetaData) {
Optional<? extends TableNameReviser<T>> tableNameReviser =
reviseEntry.getTableNameReviser();
String revisedTableName = tableNameReviser.map(optional ->
optional.revise(originalMetaData.getName(),
rule)).orElse(originalMetaData.getName());
- return new TableMetaData(revisedTableName, new
ColumnReviseEngine<>(rule, databaseType, dataSource,
reviseEntry).revise(originalMetaData.getName(), originalMetaData.getColumns()),
+ return new TableMetaData(revisedTableName, new
ColumnReviseEngine<>(rule, reviseEntry).revise(originalMetaData.getName(),
originalMetaData.getColumns()),
new IndexReviseEngine<>(rule,
reviseEntry).revise(originalMetaData.getName(), originalMetaData.getIndexes()),
new ConstraintReviseEngine<>(rule,
reviseEntry).revise(originalMetaData.getName(),
originalMetaData.getConstraints()), originalMetaData.getType());
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
index f1b0d8c0b11..b9b2f4e6efc 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/schema/SchemaMetaDataReviseEngineTest.java
@@ -23,11 +23,9 @@ import
org.apache.shardingsphere.infra.database.core.metadata.data.model.Constra
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.SchemaMetaData;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.rule.builder.fixture.FixtureGlobalRule;
import org.junit.jupiter.api.Test;
-import javax.sql.DataSource;
import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
@@ -45,7 +43,7 @@ class SchemaMetaDataReviseEngineTest {
void assertReviseWithoutMetaDataReviseEntry() {
SchemaMetaData schemaMetaData = new SchemaMetaData("expected",
Collections.singleton(mock(TableMetaData.class)));
SchemaMetaData actual = new SchemaMetaDataReviseEngine(
- Collections.emptyList(), new ConfigurationProperties(new
Properties()), mock(DatabaseType.class),
mock(DataSource.class)).revise(schemaMetaData);
+ Collections.emptyList(), new ConfigurationProperties(new
Properties())).revise(schemaMetaData);
assertThat(actual.getName(), is(schemaMetaData.getName()));
assertThat(actual.getTables(), is(schemaMetaData.getTables()));
}
@@ -54,7 +52,7 @@ class SchemaMetaDataReviseEngineTest {
void assertReviseWithMetaDataReviseEntry() {
SchemaMetaData schemaMetaData = new SchemaMetaData("expected",
Collections.singletonList(createTableMetaData()));
SchemaMetaData actual = new SchemaMetaDataReviseEngine(
- Collections.singleton(new FixtureGlobalRule()), new
ConfigurationProperties(new Properties()), mock(DatabaseType.class),
mock(DataSource.class)).revise(schemaMetaData);
+ Collections.singleton(new FixtureGlobalRule()), new
ConfigurationProperties(new Properties())).revise(schemaMetaData);
assertThat(actual.getName(), is(schemaMetaData.getName()));
assertThat(actual.getTables(), is(schemaMetaData.getTables()));
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetadataReviseEngineTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetadataReviseEngineTest.java
index 1d632b0ec09..e304796c914 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetadataReviseEngineTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/table/TableMetadataReviseEngineTest.java
@@ -20,7 +20,6 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.reviser.table;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.ColumnMetaData;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.IndexMetaData;
import
org.apache.shardingsphere.infra.database.core.metadata.data.model.TableMetaData;
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.MetaDataReviseEntry;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
@@ -31,7 +30,6 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
-import javax.sql.DataSource;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Optional;
@@ -52,12 +50,6 @@ class TableMetadataReviseEngineTest<T extends
ShardingSphereRule> {
@Mock
private T rule;
- @Mock
- private DatabaseType databaseType;
-
- @Mock
- private DataSource dataSource;
-
@SuppressWarnings("rawtypes")
@Mock
private MetaDataReviseEntry metaDataReviseEntry;
@@ -67,7 +59,7 @@ class TableMetadataReviseEngineTest<T extends
ShardingSphereRule> {
void assertGetRevisedTableName() {
TableNameReviser tableNameReviser = mock(TableNameReviser.class);
TableMetaData originalMetaData = new
TableMetaData("originalTableName", new LinkedList<>(), null, null);
- TableMetaDataReviseEngine<T> tableMetaDataReviseEngine = new
TableMetaDataReviseEngine<T>(rule, databaseType, dataSource,
metaDataReviseEntry);
+ TableMetaDataReviseEngine<T> tableMetaDataReviseEngine = new
TableMetaDataReviseEngine<T>(rule, metaDataReviseEntry);
doReturn(Optional.of(tableNameReviser)).when(metaDataReviseEntry).getTableNameReviser();
when(tableNameReviser.revise(anyString(),
eq(rule))).thenReturn("revisedTableName");
TableMetaData revisedMetaData =
tableMetaDataReviseEngine.revise(originalMetaData);
@@ -82,7 +74,7 @@ class TableMetadataReviseEngineTest<T extends
ShardingSphereRule> {
Collection<IndexMetaData> indexes = new LinkedList<>();
indexes.add(new IndexMetaData("index1"));
TableMetaData tableMetaData = new TableMetaData("originalTableName",
columns, indexes, null);
- TableMetaDataReviseEngine<T> tableMetaDataReviseEngine = new
TableMetaDataReviseEngine<T>(rule, databaseType, dataSource,
metaDataReviseEntry);
+ TableMetaDataReviseEngine<T> tableMetaDataReviseEngine = new
TableMetaDataReviseEngine<T>(rule, metaDataReviseEntry);
when(metaDataReviseEntry.getTableNameReviser()).thenReturn(Optional.empty());
TableMetaData revisedMetaData =
tableMetaDataReviseEngine.revise(tableMetaData);
assertThat(revisedMetaData.getName(), is("originalTableName"));
