This is an automated email from the ASF dual-hosted git repository.
panjuan 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 8842351373f Refactor HBaseQueryResultSet and
HBaseUpdateUpdater.getType() (#27961)
8842351373f is described below
commit 8842351373f595fdd4a59f19ac9ce3626382787a
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 7 14:45:36 2023 +0800
Refactor HBaseQueryResultSet and HBaseUpdateUpdater.getType() (#27961)
* Refactor GlobalRuleRALUpdater.getType()
* Refactor HBaseQueryResultSet.getType()
* Refactor HBaseUpdateUpdater.getType()
---
.../proxy/backend/hbase/result/query/HBaseDescribeResultSet.java | 5 +++--
.../proxy/backend/hbase/result/query/HBaseGetResultSet.java | 4 ++--
.../proxy/backend/hbase/result/query/HBaseListResultSet.java | 4 ++--
.../proxy/backend/hbase/result/query/HBaseQueryFactory.java | 2 +-
.../proxy/backend/hbase/result/query/HBaseQueryResultSet.java | 5 +++++
.../proxy/backend/hbase/result/update/HBaseDeleteUpdater.java | 4 ++--
.../proxy/backend/hbase/result/update/HBaseInsertUpdater.java | 4 ++--
.../backend/hbase/result/update/HBaseRegionReloadUpdater.java | 9 +++++----
.../proxy/backend/hbase/result/update/HBaseUpdateFactory.java | 2 +-
.../proxy/backend/hbase/result/update/HBaseUpdateUpdater.java | 4 ++--
.../proxy/backend/hbase/result/update/HBaseUpdater.java | 5 +++++
11 files changed, 30 insertions(+), 18 deletions(-)
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseDescribeResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseDescribeResultSet.java
index 46356b07ece..faffecf59d4 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseDescribeResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseDescribeResultSet.java
@@ -25,6 +25,7 @@ import
org.apache.shardingsphere.infra.binder.context.statement.dal.ShowCreateTa
import org.apache.shardingsphere.proxy.backend.hbase.context.HBaseContext;
import org.apache.shardingsphere.proxy.backend.hbase.executor.HBaseExecutor;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLShowCreateTableStatement;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -94,7 +95,7 @@ public final class HBaseDescribeResultSet implements
HBaseQueryResultSet {
* @return type name
*/
@Override
- public String getType() {
- return MySQLShowCreateTableStatement.class.getCanonicalName();
+ public Class<MySQLShowCreateTableStatement> getType() {
+ return MySQLShowCreateTableStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
index eb5ca8e7c3b..f518dd1f2d4 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
@@ -205,7 +205,7 @@ public final class HBaseGetResultSet implements
HBaseQueryResultSet {
}
@Override
- public String getType() {
- return MySQLSelectStatement.class.getCanonicalName();
+ public Class<MySQLSelectStatement> getType() {
+ return MySQLSelectStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
index bb25506af88..e10bb6c46e8 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseListResultSet.java
@@ -111,7 +111,7 @@ public final class HBaseListResultSet implements
HBaseQueryResultSet {
* @return type name
*/
@Override
- public String getType() {
- return MySQLShowTablesStatement.class.getCanonicalName();
+ public Class<MySQLShowTablesStatement> getType() {
+ return MySQLShowTablesStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryFactory.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryFactory.java
index 7c8d3d87cb7..aa26a41e0a3 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryFactory.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryFactory.java
@@ -38,7 +38,7 @@ public final class HBaseQueryFactory {
* @return instance of database backend handler
*/
public static ProxyBackendHandler newInstance(final SQLStatement
sqlStatement) {
- HBaseQueryResultSet resultSet =
TypedSPILoader.getService(HBaseQueryResultSet.class,
sqlStatement.getClass().getCanonicalName(), new Properties());
+ HBaseQueryResultSet resultSet =
TypedSPILoader.getService(HBaseQueryResultSet.class, sqlStatement.getClass(),
new Properties());
return new HBaseBackendQueryHandler(sqlStatement, resultSet);
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryResultSet.java
index 01b475eb42b..3c680020fb3 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseQueryResultSet.java
@@ -19,6 +19,8 @@ package
org.apache.shardingsphere.proxy.backend.hbase.result.query;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+
import java.util.Collection;
/**
@@ -53,4 +55,7 @@ public interface HBaseQueryResultSet extends TypedSPI {
* @return row data
*/
Collection<Object> getRowData();
+
+ @Override
+ Class<? extends SQLStatement> getType();
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
index 82b82dd7554..ea7aa81a24a 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
@@ -43,7 +43,7 @@ public final class HBaseDeleteUpdater implements HBaseUpdater
{
}
@Override
- public String getType() {
- return MySQLDeleteStatement.class.getCanonicalName();
+ public Class<MySQLDeleteStatement> getType() {
+ return MySQLDeleteStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
index 5a234e0d0bf..3f2854390bd 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
@@ -41,7 +41,7 @@ public final class HBaseInsertUpdater implements HBaseUpdater
{
}
@Override
- public String getType() {
- return MySQLInsertStatement.class.getCanonicalName();
+ public Class<MySQLInsertStatement> getType() {
+ return MySQLInsertStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
index 6d468bb632d..5cc39f7433f 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
@@ -17,13 +17,14 @@
package org.apache.shardingsphere.proxy.backend.hbase.result.update;
-import
org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
+import
org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
+import org.apache.shardingsphere.proxy.backend.hbase.bean.HBaseOperation;
import org.apache.shardingsphere.proxy.backend.hbase.context.HBaseContext;
import
org.apache.shardingsphere.proxy.backend.hbase.context.HBaseRegionWarmUpContext;
-import org.apache.shardingsphere.proxy.backend.hbase.bean.HBaseOperation;
import
org.apache.shardingsphere.proxy.backend.hbase.exception.HBaseOperationException;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQLFlushStatement;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -56,7 +57,7 @@ public final class HBaseRegionReloadUpdater implements
HBaseUpdater {
}
@Override
- public String getType() {
- return MySQLFlushStatement.class.getCanonicalName();
+ public Class<MySQLFlushStatement> getType() {
+ return MySQLFlushStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateFactory.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateFactory.java
index 32d6800c5c3..1e7c62f480a 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateFactory.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateFactory.java
@@ -38,7 +38,7 @@ public final class HBaseUpdateFactory {
* @return instance of database backend handler
*/
public static ProxyBackendHandler newInstance(final SQLStatement
sqlStatement) {
- HBaseUpdater updater = TypedSPILoader.getService(HBaseUpdater.class,
sqlStatement.getClass().getCanonicalName(), new Properties());
+ HBaseUpdater updater = TypedSPILoader.getService(HBaseUpdater.class,
sqlStatement.getClass(), new Properties());
return new HBaseBackendUpdateHandler(sqlStatement, updater);
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
index b5884829f0b..efd620d7ae1 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
@@ -42,7 +42,7 @@ public final class HBaseUpdateUpdater implements HBaseUpdater
{
}
@Override
- public String getType() {
- return MySQLUpdateStatement.class.getCanonicalName();
+ public Class<MySQLUpdateStatement> getType() {
+ return MySQLUpdateStatement.class;
}
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdater.java
index b6b2c386ba4..05aabed5a16 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdater.java
@@ -20,6 +20,8 @@ package
org.apache.shardingsphere.proxy.backend.hbase.result.update;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import org.apache.shardingsphere.proxy.backend.hbase.bean.HBaseOperation;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+
import java.util.Collection;
/**
@@ -34,4 +36,7 @@ public interface HBaseUpdater extends TypedSPI {
* @return affected rows
*/
Collection<UpdateResult> executeUpdate(HBaseOperation operation);
+
+ @Override
+ Class<? extends SQLStatement> getType();
}
