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 ef6c15115c8 Refactor VariableSegment (#33754)
ef6c15115c8 is described below
commit ef6c15115c89f128dc943035fa3d3a712f978808
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Nov 21 15:41:53 2024 +0800
Refactor VariableSegment (#33754)
---
.../doris/visitor/statement/type/DorisDALStatementVisitor.java | 8 ++++----
.../sql/parser/statement/core/segment/dal/VariableSegment.java | 2 ++
.../mysql/handler/admin/MySQLAdminExecutorCreatorTest.java | 6 ++----
3 files changed, 8 insertions(+), 8 deletions(-)
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 1d2c7237c5a..05b2ae0c04b 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
@@ -924,14 +924,14 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
if (null != ctx.optionValueNoOptionType()) {
return getVariableAssignSegment(ctx.optionValueNoOptionType());
}
- VariableSegment variable = new
VariableSegment(ctx.internalVariableName().start.getStartIndex(),
ctx.internalVariableName().stop.getStopIndex(),
ctx.internalVariableName().getText());
- variable.setScope(ctx.optionType().getText());
+ VariableSegment variable = new VariableSegment(
+ ctx.internalVariableName().start.getStartIndex(),
ctx.internalVariableName().stop.getStopIndex(),
ctx.internalVariableName().getText(), ctx.optionType().getText());
return new VariableAssignSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), variable, ctx.setExprOrDefault().getText());
}
private VariableAssignSegment getVariableAssignSegment(final
OptionValueListContext ctx) {
- VariableSegment variable = new
VariableSegment(ctx.internalVariableName().start.getStartIndex(),
ctx.internalVariableName().stop.getStopIndex(),
ctx.internalVariableName().getText());
- variable.setScope(ctx.optionType().getText());
+ VariableSegment variable = new VariableSegment(
+ ctx.internalVariableName().start.getStartIndex(),
ctx.internalVariableName().stop.getStopIndex(),
ctx.internalVariableName().getText(), ctx.optionType().getText());
return new VariableAssignSegment(ctx.start.getStartIndex(),
ctx.setExprOrDefault().stop.getStopIndex(), variable,
ctx.setExprOrDefault().getText());
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/VariableSegment.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/VariableSegment.java
index 1f954a8df2d..01e5093634c 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/VariableSegment.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/VariableSegment.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.sql.parser.statement.core.segment.dal;
+import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
@@ -27,6 +28,7 @@ import java.util.Optional;
/**
* Variable segment.
*/
+@AllArgsConstructor
@RequiredArgsConstructor
@Getter
@Setter
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
index 8f3d8d63a75..9291a6ea343 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
@@ -209,8 +209,7 @@ class MySQLAdminExecutorCreatorTest {
MySQLSelectStatement selectStatement =
mock(MySQLSelectStatement.class);
when(selectStatement.getFrom()).thenReturn(Optional.empty());
ProjectionsSegment projectionsSegment = mock(ProjectionsSegment.class);
- VariableSegment variableSegment = new VariableSegment(0, 0,
"transaction_read_only");
- variableSegment.setScope("SESSION");
+ VariableSegment variableSegment = new VariableSegment(0, 0,
"transaction_read_only", "SESSION");
when(projectionsSegment.getProjections()).thenReturn(Collections.singletonList(new
ExpressionProjectionSegment(0, 10, "@@session.transaction_read_only",
variableSegment)));
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
@@ -225,8 +224,7 @@ class MySQLAdminExecutorCreatorTest {
MySQLSelectStatement selectStatement =
mock(MySQLSelectStatement.class);
when(selectStatement.getFrom()).thenReturn(Optional.empty());
ProjectionsSegment projectionsSegment = mock(ProjectionsSegment.class);
- VariableSegment variableSegment = new VariableSegment(0, 0,
"transaction_isolation");
- variableSegment.setScope("SESSION");
+ VariableSegment variableSegment = new VariableSegment(0, 0,
"transaction_isolation", "SESSION");
when(projectionsSegment.getProjections()).thenReturn(Collections.singletonList(new
ExpressionProjectionSegment(0, 10, "@@session.transaction_isolation",
variableSegment)));
when(selectStatement.getProjections()).thenReturn(projectionsSegment);
when(sqlStatementContext.getSqlStatement()).thenReturn(selectStatement);
