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 0e75764898a Refactor MySQLShowFunctionStatusExecutor and
MySQLShowProcedureStatusExecutor (#36875)
0e75764898a is described below
commit 0e75764898a658b5ffeef8a40a11d501bcad1982
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Oct 13 16:11:19 2025 +0800
Refactor MySQLShowFunctionStatusExecutor and
MySQLShowProcedureStatusExecutor (#36875)
---
.../executor/show/MySQLShowFunctionStatusExecutor.java | 16 ++++------------
.../executor/show/MySQLShowProcedureStatusExecutor.java | 16 ++++------------
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
index 74a1ab733a0..186c0cc328e 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowFunctionStatusExecutor.java
@@ -19,13 +19,11 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sho
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResultMetaData;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultColumnMetaData;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultMetaData;
-import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
-import
org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminQueryExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -45,17 +43,15 @@ public final class MySQLShowFunctionStatusExecutor
implements DatabaseAdminQuery
private final MySQLShowFunctionStatusStatement sqlStatement;
- private QueryResultMetaData queryResultMetaData;
-
private MergedResult mergedResult;
@Override
public void execute(final ConnectionSession connectionSession, final
ShardingSphereMetaData metaData) {
- queryResultMetaData = createQueryResultMetaData();
- mergedResult = new TransparentMergedResult(getQueryResult());
+ mergedResult = new LocalDataMergedResult(Collections.emptyList());
}
- private QueryResultMetaData createQueryResultMetaData() {
+ @Override
+ public QueryResultMetaData getQueryResultMetaData() {
List<RawQueryResultColumnMetaData> columns = new ArrayList<>(11);
columns.add(new RawQueryResultColumnMetaData("", "Db", "Db",
Types.VARCHAR, "VARCHAR", 255, 0));
columns.add(new RawQueryResultColumnMetaData("", "Name", "Name",
Types.VARCHAR, "VARCHAR", 255, 0));
@@ -70,8 +66,4 @@ public final class MySQLShowFunctionStatusExecutor implements
DatabaseAdminQuery
columns.add(new RawQueryResultColumnMetaData("", "Database_Collation",
"Database_Collation", Types.VARCHAR, "VARCHAR", 20, 0));
return new RawQueryResultMetaData(columns);
}
-
- private QueryResult getQueryResult() {
- return new RawMemoryQueryResult(queryResultMetaData,
Collections.emptyList());
- }
}
diff --git
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
index 9a5e53febeb..cb5e630082a 100644
---
a/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
+++
b/proxy/backend/dialect/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/show/MySQLShowProcedureStatusExecutor.java
@@ -19,13 +19,11 @@ package
org.apache.shardingsphere.proxy.backend.mysql.handler.admin.executor.sho
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResultMetaData;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultColumnMetaData;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.metadata.RawQueryResultMetaData;
-import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.raw.type.RawMemoryQueryResult;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
-import
org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.proxy.backend.handler.admin.executor.DatabaseAdminQueryExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -45,17 +43,15 @@ public final class MySQLShowProcedureStatusExecutor
implements DatabaseAdminQuer
private final MySQLShowProcedureStatusStatement sqlStatement;
- private QueryResultMetaData queryResultMetaData;
-
private MergedResult mergedResult;
@Override
public void execute(final ConnectionSession connectionSession, final
ShardingSphereMetaData metaData) {
- queryResultMetaData = createQueryResultMetaData();
- mergedResult = new TransparentMergedResult(getQueryResult());
+ mergedResult = new LocalDataMergedResult(Collections.emptyList());
}
- private QueryResultMetaData createQueryResultMetaData() {
+ @Override
+ public QueryResultMetaData getQueryResultMetaData() {
List<RawQueryResultColumnMetaData> columns = new ArrayList<>(11);
columns.add(new RawQueryResultColumnMetaData("", "Db", "Db",
Types.VARCHAR, "VARCHAR", 255, 0));
columns.add(new RawQueryResultColumnMetaData("", "Name", "Name",
Types.VARCHAR, "VARCHAR", 255, 0));
@@ -70,8 +66,4 @@ public final class MySQLShowProcedureStatusExecutor
implements DatabaseAdminQuer
columns.add(new RawQueryResultColumnMetaData("", "Database_Collation",
"Database_Collation", Types.VARCHAR, "VARCHAR", 20, 0));
return new RawQueryResultMetaData(columns);
}
-
- private QueryResult getQueryResult() {
- return new RawMemoryQueryResult(queryResultMetaData,
Collections.emptyList());
- }
}
