added null test

Signed-off-by: Kenrick Yap <[email protected]>
Bit-Quill · Jan 14, 2025 · 2b2a8f3 · 2b2a8f3
1 parent 31ad2a4
commit 2b2a8f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/opensearch/sql/utils/JsonUtils.java b/core/src/main/java/org/opensearch/sql/utils/JsonUtils.java
@@ -16,6 +16,11 @@ public class JsonUtils {
    */
   public static ExprValue isValidJson(ExprValue jsonExprValue) {
     ObjectMapper objectMapper = new ObjectMapper();
+
+    if (jsonExprValue.isNull() || jsonExprValue.isMissing()) {
+      return ExprValueUtils.LITERAL_FALSE;
+    }
+
     try {
       objectMapper.readTree(jsonExprValue.stringValue());
       return ExprValueUtils.LITERAL_TRUE;

diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/JsonFunctionsIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/JsonFunctionsIT.java
@@ -50,6 +50,6 @@ public void test_not_json_valid() throws IOException {
                 "source=%s | where not json_valid(json_string) | fields test_name",
                 TEST_INDEX_JSON_TEST));
     verifySchema(result, schema("test_name", null, "string"));
-    verifyDataRows(result, rows("json invalid object"));
+    verifyDataRows(result, rows("json invalid object"), rows("json null"));
   }
 }
diff --git a/integ-test/src/test/resources/json_test.json b/integ-test/src/test/resources/json_test.json
@@ -10,3 +10,5 @@
 {"test_name":"json empty string","json_string":""}
 {"index":{"_id":"5"}}
 {"test_name":"json invalid object", "json_string":"{\"invalid\":\"json\", \"string\"}"}
+{"index":{"_id":"6"}}
+{"test_name":"json null", "json_string":null}