Refactor VariableSegment (#33754)

apache · Nov 21, 2024 · ef6c151 · ef6c151
1 parent 7e0b71f
commit ef6c151
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/...ache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java b/...ache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
@@ -924,14 +924,14 @@ private VariableAssignSegment getVariableAssignSegment(final OptionValueContext
         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/...java/org/apache/shardingsphere/sql/parser/statement/core/segment/dal/VariableSegment.java b/...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 @@
 /**
  * Variable segment.
  */
+@AllArgsConstructor
 @RequiredArgsConstructor
 @Getter
 @Setter

diff --git a/...pache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java b/...pache/shardingsphere/proxy/backend/mysql/handler/admin/MySQLAdminExecutorCreatorTest.java
@@ -209,8 +209,7 @@ void assertCreateWithSelectStatementForTransactionReadOnly() {
         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 @@ void assertCreateWithSelectStatementForTransactionIsolation() {
         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);