Minor changes based on PR review.

forestmvey · forestmvey · commit 9b803d4b035a · 2023-03-29T17:09:12.000-07:00
Signed-off-by: forestmvey &lt;forestv@bitquilltech.com&gt;
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
@@ -34,8 +34,10 @@ public class UnnestOperator extends PhysicalPlan {
   private final Set<String> fields; // Needs to be a Set to match legacy implementation
   @Getter
   private final Map<String, List<String>> groupedPathsAndFields;
-  List<Map<String, ExprValue>> result = new ArrayList<>();
-  List<String> nonNestedFields = new ArrayList<>();
+  @EqualsAndHashCode.Exclude
+  private List<Map<String, ExprValue>> result = new ArrayList<>();
+  @EqualsAndHashCode.Exclude
+  private List<String> nonNestedFields = new ArrayList<>();
   @EqualsAndHashCode.Exclude
   private ListIterator<Map<String, ExprValue>> flattenedResult = result.listIterator();
 
@@ -100,10 +102,12 @@ public ExprValue next() {
 
       ExprValue inputValue = input.next();
       generateNonNestedFieldsMap(inputValue);
+      // Add all nested fields to result map
       for (String field : fields) {
         result = flatten(field, inputValue, result, true);
       }
 
+      // Add all non-nested fields to result map
       for (String nonNestedField : nonNestedFields) {
         result = flatten(nonNestedField, inputValue, result, false);
       }
