Merge PR #6725: Replace nested Stream.concat with direct iteration

Author: RanVaknin

.changes/next-release/feature-AmazonDynamoDBEnhancedClient-15a5c11.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon DynamoDB Enhanced Client",
+    "contributor": "",
+    "description": "Improved performance of UpdateExpression conversion by replacing Stream.concat chains and String.format with direct iteration and StringJoiner."
+}

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/update/UpdateExpressionConverter.java

@@ -17,8 +17,10 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.StringJoiner;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -113,53 +115,89 @@ public static List<String> findAttributeNames(UpdateExpression updateExpression)
     private static List<String> groupExpressions(UpdateExpression expression) {
         List<String> groupExpressions = new ArrayList<>();
         if (!expression.setActions().isEmpty()) {
-            groupExpressions.add(SET + expression.setActions().stream()
-                                                 .map(a -> String.format("%s = %s", a.path(), a.value()))
-                                                 .collect(Collectors.joining(ACTION_SEPARATOR)));
+            StringJoiner joiner = new StringJoiner(ACTION_SEPARATOR, SET, "");
+            expression.setActions().forEach(a -> joiner.add(a.path() + " = " + a.value()));
+            groupExpressions.add(joiner.toString());
         }
         if (!expression.removeActions().isEmpty()) {
-            groupExpressions.add(REMOVE + expression.removeActions().stream()
-                                                    .map(RemoveAction::path)
-                                                    .collect(Collectors.joining(ACTION_SEPARATOR)));
+            StringJoiner joiner = new StringJoiner(ACTION_SEPARATOR, REMOVE, "");
+            expression.removeActions().forEach(a -> joiner.add(a.path()));
+            groupExpressions.add(joiner.toString());
         }
         if (!expression.deleteActions().isEmpty()) {
-            groupExpressions.add(DELETE + expression.deleteActions().stream()
-                                                    .map(a -> String.format("%s %s", a.path(), a.value()))
-                                                    .collect(Collectors.joining(ACTION_SEPARATOR)));
+            StringJoiner joiner = new StringJoiner(ACTION_SEPARATOR, DELETE, "");
+            expression.deleteActions().forEach(a -> joiner.add(a.path() + " " + a.value()));
+            groupExpressions.add(joiner.toString());
         }
         if (!expression.addActions().isEmpty()) {
-            groupExpressions.add(ADD + expression.addActions().stream()
-                                                 .map(a -> String.format("%s %s", a.path(), a.value()))
-                                                 .collect(Collectors.joining(ACTION_SEPARATOR)));
+            StringJoiner joiner = new StringJoiner(ACTION_SEPARATOR, ADD, "");
+            expression.addActions().forEach(a -> joiner.add(a.path() + " " + a.value()));
+            groupExpressions.add(joiner.toString());
         }
         return groupExpressions;
     }
 
-    private static Stream<Map<String, String>> streamOfExpressionNames(UpdateExpression expression) {
-        return Stream.concat(expression.setActions().stream().map(SetAction::expressionNames),
-                             Stream.concat(expression.removeActions().stream().map(RemoveAction::expressionNames),
-                                           Stream.concat(expression.deleteActions().stream()
-                                                                   .map(DeleteAction::expressionNames),
-                                                         expression.addActions().stream()
-                                                                   .map(AddAction::expressionNames))));
+    private static Map<String, AttributeValue> mergeExpressionValues(UpdateExpression expression) {
+        Map<String, AttributeValue> merged = new HashMap<>();
+
+        for (SetAction action : expression.setActions()) {
+            mergeValuesInto(merged, action.expressionValues());
+        }
+        for (DeleteAction action : expression.deleteActions()) {
+            mergeValuesInto(merged, action.expressionValues());
+        }
+        for (AddAction action : expression.addActions()) {
+            mergeValuesInto(merged, action.expressionValues());
+        }
+
+        return merged.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(merged);
     }
 
-    private static Map<String, AttributeValue> mergeExpressionValues(UpdateExpression expression) {
-        return streamOfExpressionValues(expression)
-            .reduce(Expression::joinValues)
-            .orElseGet(Collections::emptyMap);
+    private static Map<String, String> mergeExpressionNames(UpdateExpression expression) {
+        Map<String, String> merged = new HashMap<>();
+
+        for (SetAction action : expression.setActions()) {
+            mergeNamesInto(merged, action.expressionNames());
+        }
+        for (RemoveAction action : expression.removeActions()) {
+            mergeNamesInto(merged, action.expressionNames());
+        }
+        for (DeleteAction action : expression.deleteActions()) {
+            mergeNamesInto(merged, action.expressionNames());
+        }
+        for (AddAction action : expression.addActions()) {
+            mergeNamesInto(merged, action.expressionNames());
+        }
+
+        return merged.isEmpty() ? Collections.emptyMap() : Collections.unmodifiableMap(merged);
     }
 
-    private static Stream<Map<String, AttributeValue>> streamOfExpressionValues(UpdateExpression expression) {
-        return Stream.concat(expression.setActions().stream().map(SetAction::expressionValues),
-                             Stream.concat(expression.deleteActions().stream().map(DeleteAction::expressionValues),
-                                           expression.addActions().stream().map(AddAction::expressionValues)));
+    private static void mergeNamesInto(Map<String, String> target, Map<String, String> source) {
+        if (source == null || source.isEmpty()) {
+            return;
+        }
+        source.forEach((key, value) -> {
+            String oldValue = target.put(key, value);
+            if (oldValue != null && !oldValue.equals(value)) {
+                throw new IllegalArgumentException(
+                    String.format("Attempt to coalesce two expressions with conflicting expression names. "
+                                  + "Expression name key = '%s'", key));
+            }
+        });
     }
 
-    private static Map<String, String> mergeExpressionNames(UpdateExpression expression) {
-        return streamOfExpressionNames(expression)
-            .reduce(Expression::joinNames)
-            .orElseGet(Collections::emptyMap);
+    private static void mergeValuesInto(Map<String, AttributeValue> target, Map<String, AttributeValue> source) {
+        if (source == null || source.isEmpty()) {
+            return;
+        }
+        source.forEach((key, value) -> {
+            AttributeValue oldValue = target.put(key, value);
+            if (oldValue != null && !oldValue.equals(value)) {
+                throw new IllegalArgumentException(
+                    String.format("Attempt to coalesce two expressions with conflicting expression values. "
+                                  + "Expression value key = '%s'", key));
+            }
+        });
     }
 
     private static List<String> listPathsWithoutTokens(UpdateExpression expression) {