Fixing flakey tests for UnnestOperator.

Signed-off-by: forestmvey <forestv@bitquilltech.com>
opensearch-project · Mar 31, 2023 · 404ccc3 · 404ccc3
1 parent 4982979
commit 404ccc3
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 18 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/UnnestOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/UnnestOperator.java
@@ -10,7 +10,6 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -307,7 +306,7 @@ private void getNested(
         && (StringUtils.substringAfterLast(field, ".").equals(nestedField)
             || !field.contains("."))
     ) {
-      ret.add(new HashMap<>(Map.of(field, currentObj)));
+      ret.add(new LinkedHashMap<>(Map.of(field, currentObj)));
     } else if (currentObj != null) {
       getNested(field, nestedField.substring(nestedField.indexOf(".") + 1),
           row, ret, currentObj, supportArrays);

diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/UnnestOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/UnnestOperatorTest.java
@@ -102,9 +102,24 @@ public void nested_one_nested_field() {
     assertThat(
         execute(new UnnestOperator(inputPlan, fields, groupedFieldsByPath)),
         contains(
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "a", "comment.data", "1"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "b", "comment.data", "1"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "c", "comment.data", "1")))
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "a");
+                  put("comment.data", "1");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "b");
+                  put("comment.data", "1");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "c");
+                  put("comment.data", "1");
+                }}
+            )
         )
     );
   }
@@ -124,19 +139,63 @@ public void nested_two_nested_field() {
                 "field", new ReferenceExpression("comment.data", STRING),
                 "path", new ReferenceExpression("comment", STRING))
         );
-
     assertThat(
         execute(new UnnestOperator(inputPlan, fields)),
         contains(
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "a", "comment.data", "1"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "a", "comment.data", "2"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "a", "comment.data", "3"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "b", "comment.data", "1"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "b", "comment.data", "2"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "b", "comment.data", "3"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "c", "comment.data", "1"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "c", "comment.data", "2"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "c", "comment.data", "3")))
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "a");
+                  put("comment.data", "1");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "a");
+                  put("comment.data", "2");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "a");
+                  put("comment.data", "3");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "b");
+                  put("comment.data", "1");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "b");
+                  put("comment.data", "2");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "b");
+                  put("comment.data", "3");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "c");
+                  put("comment.data", "1");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "c");
+                  put("comment.data", "2");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "c");
+                  put("comment.data", "3");
+                }}
+            )
         )
     );
   }
@@ -159,9 +218,24 @@ public void nested_two_nested_fields_with_same_path() {
     assertThat(
         execute(new UnnestOperator(inputPlan, fields)),
         contains(
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "a", "message.id", "1"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "b", "message.id", "2"))),
-            tupleValue(new LinkedHashMap<>(Map.of("message.info", "c", "message.id", "3")))
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "a");
+                  put("message.id", "1");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "b");
+                  put("message.id", "2");
+                }}
+            ),
+            tupleValue(
+                new LinkedHashMap<>() {{
+                  put("message.info", "c");
+                  put("message.id", "3");
+                }}
+            )
         )
     );
   }