[shardingsphere] branch master updated: Update this method so that its implementation is not identical (#25824)

[panjuan]

This is an automated email from the ASF dual-hosted git repository.

panjuan 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 3ad52f68c8b Update this method so that its implementation is not 
identical  (#25824)
3ad52f68c8b is described below

commit 3ad52f68c8bf5592c449f8dee26c1080fd4624b2
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun May 21 19:14:07 2023 +0800

    Update this method so that its implementation is not identical  (#25824)
---
 .../mysql/visitor/statement/MySQLStatementVisitor.java     | 10 +---------
 .../internal/asserts/segment/model/ModelClauseAssert.java  | 14 +++-----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git 
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
 
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
index 9e36bdb2c15..e07a22515c1 100644
--- 
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
+++ 
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
@@ -1348,7 +1348,7 @@ public abstract class MySQLStatementVisitor extends 
MySQLStatementBaseVisitor<AS
         } else {
             result.setInsertColumns(new 
InsertColumnsSegment(ctx.start.getStartIndex() - 1, ctx.start.getStartIndex() - 
1, Collections.emptyList()));
         }
-        
result.getValues().addAll(createReplaceValuesSegments(ctx.assignmentValues()));
+        
result.getValues().addAll(createInsertValuesSegments(ctx.assignmentValues()));
         return result;
     }
     
@@ -1360,14 +1360,6 @@ public abstract class MySQLStatementVisitor extends 
MySQLStatementBaseVisitor<AS
         return result;
     }
     
-    private Collection<InsertValuesSegment> createReplaceValuesSegments(final 
Collection<AssignmentValuesContext> assignmentValuesContexts) {
-        Collection<InsertValuesSegment> result = new LinkedList<>();
-        for (AssignmentValuesContext each : assignmentValuesContexts) {
-            result.add((InsertValuesSegment) visit(each));
-        }
-        return result;
-    }
-    
     @Override
     public ASTNode visitUpdate(final UpdateContext ctx) {
         MySQLUpdateStatement result = new MySQLUpdateStatement();
diff --git 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/model/ModelClauseAssert.java
 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/model/ModelClauseAssert.java
index b515415edf6..d1ec6e32297 100644
--- 
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/model/ModelClauseAssert.java
+++ 
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/segment/model/ModelClauseAssert.java
@@ -56,7 +56,7 @@ public final class ModelClauseAssert {
         if (null != expected.getReferenceModelSelect()) {
             assertNotNull(actual.getReferenceModelSelects(), 
assertContext.getText("Actual reference model select subquery should exist."));
             assertThat(assertContext.getText("Actual reference model select 
subquery size assertion error: "), actual.getReferenceModelSelects().size(), 
is(expected.getReferenceModelSelect().size()));
-            assertReferenceModelSelectStatements(assertContext, 
actual.getReferenceModelSelects(), expected.getReferenceModelSelect());
+            assertSubquerySegments(assertContext, 
actual.getReferenceModelSelects(), expected.getReferenceModelSelect());
         }
         if (null != expected.getOrderBySegments()) {
             assertNotNull(actual.getOrderBySegments(), 
assertContext.getText("Actual order by segments should exist."));
@@ -71,11 +71,11 @@ public final class ModelClauseAssert {
         if (null != expected.getCellAssignmentSelect()) {
             assertNotNull(actual.getCellAssignmentSelects(), 
assertContext.getText("Actual cell assignment select subquery should exist."));
             assertThat(assertContext.getText("Actual cell assignment select 
size assertion error: "), actual.getCellAssignmentSelects().size(), 
is(expected.getCellAssignmentSelect().size()));
-            assertCellAssignmentSelectStatements(assertContext, 
actual.getCellAssignmentSelects(), expected.getCellAssignmentSelect());
+            assertSubquerySegments(assertContext, 
actual.getCellAssignmentSelects(), expected.getCellAssignmentSelect());
         }
     }
     
-    private static void assertReferenceModelSelectStatements(final 
SQLCaseAssertContext assertContext, final List<SubquerySegment> actual, final 
List<SelectStatementTestCase> expected) {
+    private static void assertSubquerySegments(final SQLCaseAssertContext 
assertContext, final List<SubquerySegment> actual, final 
List<SelectStatementTestCase> expected) {
         int count = 0;
         for (SubquerySegment each : actual) {
             SelectStatementAssert.assertIs(assertContext, each.getSelect(), 
expected.get(count));
@@ -98,12 +98,4 @@ public final class ModelClauseAssert {
             count++;
         }
     }
-    
-    private static void assertCellAssignmentSelectStatements(final 
SQLCaseAssertContext assertContext, final List<SubquerySegment> actual, final 
List<SelectStatementTestCase> expected) {
-        int count = 0;
-        for (SubquerySegment each : actual) {
-            SelectStatementAssert.assertIs(assertContext, each.getSelect(), 
expected.get(count));
-            count++;
-        }
-    }
 }