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/26 09:51:51 UTC

(shardingsphere) branch master updated: Refactor GeneratedKeyContextEngine (#35803)

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 6e8e96dc54e Refactor GeneratedKeyContextEngine (#35803)
6e8e96dc54e is described below

commit 6e8e96dc54ed882c540baa9ed189f908494085bf
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 26 17:51:44 2025 +0800

    Refactor GeneratedKeyContextEngine (#35803)
---
 .../keygen/engine/GeneratedKeyContextEngine.java    | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
index 0a6c6b9fec2..7a4ee938bc4 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
@@ -28,6 +28,8 @@ import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simp
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.ParameterMarkerExpressionSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.statement.type.dml.InsertStatement;
 
+import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -91,14 +93,22 @@ public final class GeneratedKeyContextEngine {
     
     private GeneratedKeyContext findGeneratedKey(final Map<String, Integer> insertColumnNamesAndIndexes, final List<InsertValueContext> insertValueContexts,
                                                  final List<Object> params, final String generateKeyColumnName) {
-        GeneratedKeyContext result = new GeneratedKeyContext(generateKeyColumnName, false);
+        int generateKeyIndex = findGenerateKeyIndex(insertColumnNamesAndIndexes, generateKeyColumnName);
+        Collection<Comparable<?>> generatedValues = new LinkedList<>();
         for (InsertValueContext each : insertValueContexts) {
-            ExpressionSegment expression = each.getValueExpressions().get(findGenerateKeyIndex(insertColumnNamesAndIndexes, generateKeyColumnName));
-            getGeneratedValue(params, expression).ifPresent(optional -> result.getGeneratedValues().add(optional));
+            ExpressionSegment expression = each.getValueExpressions().get(generateKeyIndex);
+            getGeneratedValue(params, expression).ifPresent(generatedValues::add);
         }
+        GeneratedKeyContext result = new GeneratedKeyContext(generateKeyColumnName, false);
+        result.getGeneratedValues().addAll(generatedValues);
         return result;
     }
     
+    private int findGenerateKeyIndex(final Map<String, Integer> insertColumnNamesAndIndexes, final String generateKeyColumnName) {
+        String tableName = insertStatement.getTable().map(optional -> optional.getTableName().getIdentifier().getValue()).orElse("");
+        return insertColumnNamesAndIndexes.isEmpty() ? schema.getVisibleColumnAndIndexMap(tableName).get(generateKeyColumnName) : insertColumnNamesAndIndexes.get(generateKeyColumnName);
+    }
+    
     private Optional<Comparable<?>> getGeneratedValue(final List<Object> params, final ExpressionSegment expression) {
         if (expression instanceof ParameterMarkerExpressionSegment) {
             if (params.size() > ((ParameterMarkerExpressionSegment) expression).getParameterMarkerIndex()
@@ -114,9 +124,4 @@ public final class GeneratedKeyContextEngine {
         }
         return Optional.empty();
     }
-    
-    private int findGenerateKeyIndex(final Map<String, Integer> insertColumnNamesAndIndexes, final String generateKeyColumnName) {
-        String tableName = insertStatement.getTable().map(optional -> optional.getTableName().getIdentifier().getValue()).orElse("");
-        return insertColumnNamesAndIndexes.isEmpty() ? schema.getVisibleColumnAndIndexMap(tableName).get(generateKeyColumnName) : insertColumnNamesAndIndexes.get(generateKeyColumnName);
-    }
 }