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 af64a0c04ae Remove unused column data type reviser (#30850)
af64a0c04ae is described below
commit af64a0c04ae8f64f122a2a84e200b4aef16e3e37
Author: ZhangCheng <[email protected]>
AuthorDate: Thu Apr 11 19:41:30 2024 +0800
Remove unused column data type reviser (#30850)
* Remove unused column data type reviser
* Remove unused column data type reviser
---
.../schema/reviser/MetaDataReviseEntry.java | 12 -------
.../reviser/column/ColumnDataTypeReviser.java | 39 ----------------------
.../schema/reviser/column/ColumnReviseEngine.java | 4 +--
3 files changed, 1 insertion(+), 54 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEntry.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEntry.java
index 98ec6ff3558..5ab20c9607f 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEntry.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/MetaDataReviseEntry.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.metadata.database.schema.reviser;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnDataTypeReviser;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnExistedReviser;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnGeneratedReviser;
import
org.apache.shardingsphere.infra.metadata.database.schema.reviser.column.ColumnNameReviser;
@@ -81,17 +80,6 @@ public interface MetaDataReviseEntry<T extends
ShardingSphereRule> extends Order
return Optional.empty();
}
- /**
- * Get column data type reviser.
- *
- * @param rule rule
- * @param tableName table name
- * @return column data type reviser
- */
- default Optional<? extends ColumnDataTypeReviser>
getColumnDataTypeReviser(final T rule, final String tableName) {
- return Optional.empty();
- }
-
/**
* Get column generated reviser.
*
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnDataTypeReviser.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnDataTypeReviser.java
deleted file mode 100644
index e88da4179c9..00000000000
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/reviser/column/ColumnDataTypeReviser.java
+++ /dev/null
@@ -1,39 +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.infra.metadata.database.schema.reviser.column;
-
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-
-import javax.sql.DataSource;
-import java.util.Optional;
-
-/**
- * Column data type reviser.
- */
-public interface ColumnDataTypeReviser {
-
- /**
- * Revise column data type.
- *
- * @param originalName original column name
- * @param databaseType database type
- * @param dataSource data source
- * @return revised data type
- */
- Optional<Integer> revise(String originalName, DatabaseType databaseType,
DataSource dataSource);
-}
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 39a0a7488c6..461012cdb3a 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
@@ -54,7 +54,6 @@ public final class ColumnReviseEngine<T extends
ShardingSphereRule> {
public Collection<ColumnMetaData> revise(final String tableName, final
Collection<ColumnMetaData> originalMetaDataList) {
Optional<? extends ColumnExistedReviser> existedReviser =
reviseEntry.getColumnExistedReviser(rule, tableName);
Optional<? extends ColumnNameReviser> nameReviser =
reviseEntry.getColumnNameReviser(rule, tableName);
- Optional<? extends ColumnDataTypeReviser> dataTypeReviser =
reviseEntry.getColumnDataTypeReviser(rule, tableName);
Optional<? extends ColumnGeneratedReviser> generatedReviser =
reviseEntry.getColumnGeneratedReviser(rule, tableName);
Collection<ColumnMetaData> result = new LinkedHashSet<>();
for (ColumnMetaData each : originalMetaDataList) {
@@ -62,9 +61,8 @@ public final class ColumnReviseEngine<T extends
ShardingSphereRule> {
continue;
}
String name = nameReviser.isPresent() ?
nameReviser.get().revise(each.getName()) : each.getName();
- int dataType = dataTypeReviser.map(optional ->
optional.revise(each.getName(), databaseType,
dataSource).orElseGet(each::getDataType)).orElseGet(each::getDataType);
boolean generated = generatedReviser.map(optional ->
optional.revise(each)).orElseGet(each::isGenerated);
- result.add(new ColumnMetaData(name, dataType, each.isPrimaryKey(),
generated, each.isCaseSensitive(), each.isVisible(), each.isUnsigned(),
each.isNullable()));
+ result.add(new ColumnMetaData(name, each.getDataType(),
each.isPrimaryKey(), generated, each.isCaseSensitive(), each.isVisible(),
each.isUnsigned(), each.isNullable()));
}
return result;
}
