Merge branch 'master' into alhuang-merge-gate-sysadmin

snowflakedb · Nov 15, 2024 · 10fbb62 · 10fbb62
2 parents b153e41 + 8ba1e0c
commit 10fbb62
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/IcebergParquetValueParser.java b/src/main/java/net/snowflake/ingest/streaming/internal/IcebergParquetValueParser.java
@@ -468,6 +468,9 @@ private static ParquetBufferValue getStructValue(
           missingFields.add(type.getFieldName(i));
         } else {
           listVal.add(null);
+          subColumnFinder
+              .getSubColumns(type.getType(i).getId())
+              .forEach(subColumn -> statsMap.get(subColumn).incCurrentNullCount());
         }
       }
     }

diff --git a/src/test/java/net/snowflake/ingest/streaming/internal/datatypes/IcebergStructuredIT.java b/src/test/java/net/snowflake/ingest/streaming/internal/datatypes/IcebergStructuredIT.java
@@ -7,6 +7,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -58,6 +59,7 @@ public void testStructuredDataType() throws Exception {
         "object(a int, b string, c boolean)", "{\"a\": 1, \"b\": \"test\", \"c\": true}");
     assertStructuredDataType("map(string, int)", "{\"key1\": 1}");
     assertStructuredDataType("array(int)", "[1, 2, 3]");
+    assertStructuredDataType("object(a int, b string, c boolean) not null", "{}");
     assertStructuredDataType("array(string) not null", "[]");
     assertStructuredDataType("map(string, int) not null", "{}");
     assertMap(
@@ -68,6 +70,9 @@ public void testStructuredDataType() throws Exception {
           }
         });
     assertStructuredDataType("array(string)", null);
+    assertStructuredDataType("map(string, int)", null);
+    assertStructuredDataType("object(a int, b string, c boolean)", null);
+    assertStructuredDataType("object(a int, b string, c boolean)", "{\"a\": null}");
 
     /* Map with null key */
     Assertions.assertThatThrownBy(
@@ -443,6 +448,8 @@ private void assertStructuredDataType(String dataType, String value) throws Exce
     String tmp = res.getString(2);
     JsonNode actualNode = tmp == null ? null : objectMapper.readTree(tmp);
     JsonNode expectedNode = value == null ? null : objectMapper.readTree(value);
+    removeNullFields(actualNode);
+    removeNullFields(expectedNode);
     assertThat(actualNode).isEqualTo(expectedNode);
   }
 
@@ -464,4 +471,31 @@ private void assertMap(String dataType, Map<?, ?> value) throws Exception {
     JsonNode expectedNode = value == null ? null : objectMapper.valueToTree(value);
     assertThat(actualNode).isEqualTo(expectedNode);
   }
+
+  /**
+   * Remove null fields from the JSON node. This is used to compare the JSON node ignoring null
+   * values. e.g. "{}" and "{a: null}".
+   *
+   * @param node JSON node
+   */
+  private void removeNullFields(JsonNode node) {
+    if (node == null) {
+      return;
+    }
+    if (node.isObject()) {
+      List<String> keys = new ArrayList<>();
+      node.fields()
+          .forEachRemaining(
+              entry -> {
+                if (entry.getValue().isNull()) {
+                  keys.add(entry.getKey());
+                } else {
+                  removeNullFields(entry.getValue());
+                }
+              });
+      keys.forEach(((ObjectNode) (node))::remove);
+    } else if (node.isArray()) {
+      node.forEach(this::removeNullFields);
+    }
+  }
 }