You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/06/12 07:17:45 UTC
(shardingsphere) branch master updated: Refactor ExplainStatement (#35685)
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 33bb56ba730 Refactor ExplainStatement (#35685)
33bb56ba730 is described below
commit 33bb56ba73070135bec7118d1cdb5693cac075af
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 12 15:17:39 2025 +0800
Refactor ExplainStatement (#35685)
* Refactor ExplainStatement
* Refactor ExplainStatement
---
.../statement/type/dal/ExplainStatementContext.java | 2 +-
.../engine/statement/dal/ExplainStatementBinder.java | 2 +-
.../statement/type/DorisDALStatementVisitor.java | 2 +-
.../statement/type/MySQLDALStatementVisitor.java | 2 +-
.../core/segment/dml/column/ColumnSegment.java | 20 ++++++++++----------
.../core/statement/dal/ExplainStatement.java | 10 +++++-----
.../statement/dal/impl/ExplainStatementAssert.java | 6 +++---
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/type/dal/ExplainStatementContext.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/type/dal/ExplainStatementContext.java
index 4fdc9d404b0..184a8780c0a 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/type/dal/ExplainStatementContext.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/type/dal/ExplainStatementContext.java
@@ -53,7 +53,7 @@ public final class ExplainStatementContext extends CommonSQLStatementContext imp
private Collection<SimpleTableSegment> extractTablesFromExplain(final ExplainStatement sqlStatement) {
Collection<SimpleTableSegment> result = new LinkedList<>();
- sqlStatement.getSimpleTable().ifPresent(result::add);
+ sqlStatement.getTable().ifPresent(result::add);
SQLStatement explainableStatement = sqlStatement.getSqlStatement();
TableExtractor extractor = new TableExtractor();
// TODO extract table from declare, execute, createMaterializedView, refreshMaterializedView
diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
index 9d384db5b8e..3e86f255144 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
@@ -42,7 +42,7 @@ public final class ExplainStatementBinder implements SQLStatementBinder<ExplainS
private ExplainStatement copy(final ExplainStatement sqlStatement, final SQLStatement boundSQLStatement) {
ExplainStatement result = new ExplainStatement();
result.setSqlStatement(boundSQLStatement);
- sqlStatement.getSimpleTable().ifPresent(result::setSimpleTable);
+ sqlStatement.getTable().ifPresent(result::setTable);
sqlStatement.getColumnWild().ifPresent(result::setColumnWild);
SQLStatementCopyUtils.copyAttributes(sqlStatement, result);
return result;
diff --git a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
index 9c87ef78ee9..5d694b8fa59 100644
--- a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
+++ b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
@@ -493,7 +493,7 @@ public final class DorisDALStatementVisitor extends DorisStatementVisitor implem
public ASTNode visitExplain(final ExplainContext ctx) {
ExplainStatement result = new ExplainStatement();
if (null != ctx.tableName()) {
- result.setSimpleTable((SimpleTableSegment) visit(ctx.tableName()));
+ result.setTable((SimpleTableSegment) visit(ctx.tableName()));
if (null != ctx.columnRef()) {
result.setColumnWild((ColumnSegment) visit(ctx.columnRef()));
} else if (null != ctx.textString()) {
diff --git a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
index 9b73c154999..c53641e46f0 100644
--- a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
+++ b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
@@ -506,7 +506,7 @@ public final class MySQLDALStatementVisitor extends MySQLStatementVisitor implem
public ASTNode visitExplain(final ExplainContext ctx) {
ExplainStatement result = new ExplainStatement();
if (null != ctx.tableName()) {
- result.setSimpleTable((SimpleTableSegment) visit(ctx.tableName()));
+ result.setTable((SimpleTableSegment) visit(ctx.tableName()));
if (null != ctx.columnRef()) {
result.setColumnWild((ColumnSegment) visit(ctx.columnRef()));
} else if (null != ctx.textString()) {
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/column/ColumnSegment.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/column/ColumnSegment.java
index b114279424f..eec66d99731 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/column/ColumnSegment.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dml/column/ColumnSegment.java
@@ -91,16 +91,6 @@ public final class ColumnSegment implements ExpressionSegment, OwnerAvailable {
return null == owner ? column : String.join(".", owner.getIdentifier().getValue(), column);
}
- @Override
- public Optional<OwnerSegment> getOwner() {
- return Optional.ofNullable(owner);
- }
-
- @Override
- public String getText() {
- return getExpression();
- }
-
/**
* Get left parentheses.
*
@@ -118,4 +108,14 @@ public final class ColumnSegment implements ExpressionSegment, OwnerAvailable {
public Optional<ParenthesesSegment> getRightParentheses() {
return Optional.ofNullable(rightParentheses);
}
+
+ @Override
+ public Optional<OwnerSegment> getOwner() {
+ return Optional.ofNullable(owner);
+ }
+
+ @Override
+ public String getText() {
+ return getExpression();
+ }
}
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ExplainStatement.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ExplainStatement.java
index a94502e0cdd..9fc0844a8a7 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ExplainStatement.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ExplainStatement.java
@@ -35,17 +35,17 @@ public final class ExplainStatement extends AbstractSQLStatement implements DALS
private SQLStatement sqlStatement;
- private SimpleTableSegment simpleTable;
+ private SimpleTableSegment table;
private ColumnSegment columnWild;
/**
- * Get simple table.
+ * Get table.
*
- * @return simple table
+ * @return table
*/
- public Optional<SimpleTableSegment> getSimpleTable() {
- return Optional.ofNullable(simpleTable);
+ public Optional<SimpleTableSegment> getTable() {
+ return Optional.ofNullable(table);
}
/**
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ExplainStatementAssert.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ExplainStatementAssert.java
index 90040da63da..3c37adc0ebc 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ExplainStatementAssert.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/dal/impl/ExplainStatementAssert.java
@@ -67,15 +67,15 @@ public final class ExplainStatementAssert {
}
private static void assertExplainStatementColumnWild(final SQLCaseAssertContext assertContext, final ExplainStatement actual, final ExplainStatementTestCase expected) {
- if (actual.getSimpleTable().isPresent()) {
- TableAssert.assertIs(assertContext, actual.getSimpleTable().get(), expected.getTable());
+ if (actual.getTable().isPresent()) {
+ TableAssert.assertIs(assertContext, actual.getTable().get(), expected.getTable());
if (actual.getColumnWild().isPresent()) {
ColumnAssert.assertIs(assertContext, actual.getColumnWild().get(), expected.getColumn());
} else {
assertFalse(actual.getColumnWild().isPresent(), assertContext.getText("Actual column wild should not exist."));
}
} else {
- assertFalse(actual.getSimpleTable().isPresent(), assertContext.getText("Actual table should not exist."));
+ assertFalse(actual.getTable().isPresent(), assertContext.getText("Actual table should not exist."));
}
}
}