This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 d1fcc87d68c Refactor MetaDataRefresher.getType() (#27962)
d1fcc87d68c is described below
commit d1fcc87d68c27b3099e3d3e1cb19bfeeb8857abf
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 7 16:05:36 2023 +0800
Refactor MetaDataRefresher.getType() (#27962)
---
.../infra/connection/refresher/MetaDataRefreshEngine.java | 2 +-
.../shardingsphere/infra/connection/refresher/MetaDataRefresher.java | 3 +++
.../refresher/type/index/AlterIndexStatementSchemaRefresher.java | 4 ++--
.../refresher/type/index/CreateIndexStatementSchemaRefresher.java | 4 ++--
.../refresher/type/index/DropIndexStatementSchemaRefresher.java | 4 ++--
.../refresher/type/schema/AlterSchemaStatementSchemaRefresher.java | 4 ++--
.../refresher/type/schema/CreateSchemaStatementSchemaRefresher.java | 4 ++--
.../refresher/type/schema/DropSchemaStatementSchemaRefresher.java | 4 ++--
.../refresher/type/table/AlterTableStatementSchemaRefresher.java | 4 ++--
.../refresher/type/table/CreateTableStatementSchemaRefresher.java | 4 ++--
.../refresher/type/table/DropTableStatementSchemaRefresher.java | 4 ++--
.../refresher/type/table/RenameTableStatementSchemaRefresher.java | 4 ++--
.../refresher/type/view/AlterViewStatementSchemaRefresher.java | 4 ++--
.../refresher/type/view/CreateViewStatementSchemaRefresher.java | 4 ++--
.../refresher/type/view/DropViewStatementSchemaRefresher.java | 4 ++--
15 files changed, 30 insertions(+), 27 deletions(-)
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefreshEngine.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefreshEngine.java
index d04d6bd009f..9be0d70146b 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefreshEngine.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefreshEngine.java
@@ -61,7 +61,7 @@ public final class MetaDataRefreshEngine {
if (IGNORED_SQL_STATEMENT_CLASSES.contains(sqlStatementClass)) {
return;
}
- Optional<MetaDataRefresher> schemaRefresher =
TypedSPILoader.findService(MetaDataRefresher.class,
sqlStatementClass.getSuperclass().getName());
+ Optional<MetaDataRefresher> schemaRefresher =
TypedSPILoader.findService(MetaDataRefresher.class,
sqlStatementClass.getSuperclass());
if (schemaRefresher.isPresent()) {
String schemaName =
sqlStatementContext.getTablesContext().getSchemaName()
.orElseGet(() -> new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDefaultSchemaName(database.getName())).toLowerCase();
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefresher.java
index b34e42c7124..a2b83e3f62f 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/MetaDataRefresher.java
@@ -48,4 +48,7 @@ public interface MetaDataRefresher<T extends SQLStatement>
extends TypedSPI {
*/
void refresh(ModeContextManager modeContextManager, ShardingSphereDatabase
database, Collection<String> logicDataSourceNames, String schemaName,
T sqlStatement, ConfigurationProperties props) throws
SQLException;
+
+ @Override
+ Class<T> getType();
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/AlterIndexStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/AlterIndexStatementSchemaRefresher.java
index c831115b6fe..974c7addcfa 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/AlterIndexStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/AlterIndexStatementSchemaRefresher.java
@@ -74,7 +74,7 @@ public final class AlterIndexStatementSchemaRefresher
implements MetaDataRefresh
}
@Override
- public String getType() {
- return AlterIndexStatement.class.getName();
+ public Class<AlterIndexStatement> getType() {
+ return AlterIndexStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
index 975b2951da9..c6892d282f9 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/CreateIndexStatementSchemaRefresher.java
@@ -60,7 +60,7 @@ public final class CreateIndexStatementSchemaRefresher
implements MetaDataRefres
}
@Override
- public String getType() {
- return CreateIndexStatement.class.getName();
+ public Class<CreateIndexStatement> getType() {
+ return CreateIndexStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/DropIndexStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/DropIndexStatementSchemaRefresher.java
index 3c474a22540..51a15caa1e8 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/DropIndexStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/index/DropIndexStatementSchemaRefresher.java
@@ -74,7 +74,7 @@ public final class DropIndexStatementSchemaRefresher
implements MetaDataRefreshe
}
@Override
- public String getType() {
- return DropIndexStatement.class.getName();
+ public Class<DropIndexStatement> getType() {
+ return DropIndexStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/AlterSchemaStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/AlterSchemaStatementSchemaRefresher.java
index d8d5fbf711f..0a5f7e02e3a 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/AlterSchemaStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/AlterSchemaStatementSchemaRefresher.java
@@ -45,7 +45,7 @@ public final class AlterSchemaStatementSchemaRefresher
implements MetaDataRefres
}
@Override
- public String getType() {
- return AlterSchemaStatement.class.getName();
+ public Class<AlterSchemaStatement> getType() {
+ return AlterSchemaStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/CreateSchemaStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/CreateSchemaStatementSchemaRefresher.java
index 609ceb650fe..b87c5e8abe1 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/CreateSchemaStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/CreateSchemaStatementSchemaRefresher.java
@@ -39,7 +39,7 @@ public final class CreateSchemaStatementSchemaRefresher
implements MetaDataRefre
}
@Override
- public String getType() {
- return CreateSchemaStatement.class.getName();
+ public Class<CreateSchemaStatement> getType() {
+ return CreateSchemaStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/DropSchemaStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/DropSchemaStatementSchemaRefresher.java
index 622501ee300..6642e92f5b2 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/DropSchemaStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/schema/DropSchemaStatementSchemaRefresher.java
@@ -47,7 +47,7 @@ public final class DropSchemaStatementSchemaRefresher
implements MetaDataRefresh
}
@Override
- public String getType() {
- return DropSchemaStatement.class.getName();
+ public Class<DropSchemaStatement> getType() {
+ return DropSchemaStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/AlterTableStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/AlterTableStatementSchemaRefresher.java
index cc2f23e15fc..6598916614e 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/AlterTableStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/AlterTableStatementSchemaRefresher.java
@@ -76,7 +76,7 @@ public final class AlterTableStatementSchemaRefresher
implements MetaDataRefresh
}
@Override
- public String getType() {
- return AlterTableStatement.class.getName();
+ public Class<AlterTableStatement> getType() {
+ return AlterTableStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/CreateTableStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/CreateTableStatementSchemaRefresher.java
index 65adc62c0be..6daa0618348 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/CreateTableStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/CreateTableStatementSchemaRefresher.java
@@ -72,7 +72,7 @@ public final class CreateTableStatementSchemaRefresher
implements MetaDataRefres
}
@Override
- public String getType() {
- return CreateTableStatement.class.getName();
+ public Class<CreateTableStatement> getType() {
+ return CreateTableStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/DropTableStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/DropTableStatementSchemaRefresher.java
index 62ec9037dcb..e7caf8b3fd1 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/DropTableStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/DropTableStatementSchemaRefresher.java
@@ -56,7 +56,7 @@ public final class DropTableStatementSchemaRefresher
implements MetaDataRefreshe
}
@Override
- public String getType() {
- return DropTableStatement.class.getName();
+ public Class<DropTableStatement> getType() {
+ return DropTableStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/RenameTableStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/RenameTableStatementSchemaRefresher.java
index 70cdefd575c..da66d3b10bb 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/RenameTableStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/table/RenameTableStatementSchemaRefresher.java
@@ -73,7 +73,7 @@ public final class RenameTableStatementSchemaRefresher
implements MetaDataRefres
}
@Override
- public String getType() {
- return RenameTableStatement.class.getName();
+ public Class<RenameTableStatement> getType() {
+ return RenameTableStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/AlterViewStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/AlterViewStatementSchemaRefresher.java
index 16030072ddf..055df4a5c59 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/AlterViewStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/AlterViewStatementSchemaRefresher.java
@@ -91,7 +91,7 @@ public final class AlterViewStatementSchemaRefresher
implements MetaDataRefreshe
}
@Override
- public String getType() {
- return AlterViewStatement.class.getName();
+ public Class<AlterViewStatement> getType() {
+ return AlterViewStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/CreateViewStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/CreateViewStatementSchemaRefresher.java
index 665b7d0870b..b8602abc55f 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/CreateViewStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/CreateViewStatementSchemaRefresher.java
@@ -69,7 +69,7 @@ public final class CreateViewStatementSchemaRefresher
implements MetaDataRefresh
}
@Override
- public String getType() {
- return CreateViewStatement.class.getName();
+ public Class<CreateViewStatement> getType() {
+ return CreateViewStatement.class;
}
}
diff --git
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/DropViewStatementSchemaRefresher.java
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/DropViewStatementSchemaRefresher.java
index ad79a545c06..d31566f09f2 100644
---
a/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/DropViewStatementSchemaRefresher.java
+++
b/infra/context/src/main/java/org/apache/shardingsphere/infra/connection/refresher/type/view/DropViewStatementSchemaRefresher.java
@@ -44,7 +44,7 @@ public final class DropViewStatementSchemaRefresher
implements MetaDataRefresher
}
@Override
- public String getType() {
- return DropViewStatement.class.getName();
+ public Class<DropViewStatement> getType() {
+ return DropViewStatement.class;
}
}
