You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by wu...@apache.org on 2024/02/10 15:22:52 UTC
(shardingsphere) branch master updated: Refactor DistSQLQueryExecuteEngine (#30084)
This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 a0dc5974678 Refactor DistSQLQueryExecuteEngine (#30084)
a0dc5974678 is described below
commit a0dc5974678b57c298f71a9588f82a4a4ce128ea
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Feb 10 23:22:46 2024 +0800
Refactor DistSQLQueryExecuteEngine (#30084)
---
.../distsql/handler/engine/query/DistSQLQueryExecuteEngine.java | 3 ++-
.../distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
index 90918240254..bce23b60655 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
@@ -66,13 +66,14 @@ public final class DistSQLQueryExecuteEngine {
@SuppressWarnings("unchecked")
public void executeQuery() throws SQLException {
DistSQLQueryExecutor<DistSQLStatement> executor = TypedSPILoader.getService(DistSQLQueryExecutor.class, sqlStatement.getClass());
- columnNames = executor.getColumnNames();
try {
new DistSQLExecutorAwareSetter(executor).set(contextManager, null == databaseName ? null : contextManager.getDatabase(databaseName), distsqlConnectionContext);
} catch (final UnsupportedSQLOperationException ignored) {
rows = Collections.emptyList();
+ columnNames = executor.getColumnNames();
return;
}
rows = executor.getRows(sqlStatement, contextManager);
+ columnNames = executor.getColumnNames();
}
}
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
index 8acfd1a3421..b041d2b2fb5 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/update/DistSQLUpdateExecuteEngine.java
@@ -18,13 +18,13 @@
package org.apache.shardingsphere.distsql.handler.engine.update;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorAwareSetter;
-import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorRequiredChecker;
import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.database.DatabaseRuleDefinitionExecuteEngine;
import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.global.GlobalRuleDefinitionExecuteEngine;
import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.legacy.LegacyDatabaseRuleDefinitionExecuteEngine;
import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.engine.legacy.LegacyGlobalRuleDefinitionExecuteEngine;
import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.database.DatabaseRuleDefinitionExecutor;
import org.apache.shardingsphere.distsql.handler.engine.update.rdl.rule.spi.global.GlobalRuleDefinitionExecutor;
+import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorRequiredChecker;
import org.apache.shardingsphere.distsql.handler.util.DatabaseNameUtils;
import org.apache.shardingsphere.distsql.statement.DistSQLStatement;
import org.apache.shardingsphere.distsql.statement.rdl.rule.RuleDefinitionStatement;