json_valid: null and missing should return false

Signed-off-by: Andrew Carbonetto <[email protected]>
Bit-Quill · Jan 15, 2025 · 67d979d · 67d979d
1 parent 1913bfe
commit 67d979d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/expression/json/JsonFunctions.java b/core/src/main/java/org/opensearch/sql/expression/json/JsonFunctions.java
@@ -9,7 +9,6 @@
 import static org.opensearch.sql.data.type.ExprCoreType.STRING;
 import static org.opensearch.sql.expression.function.FunctionDSL.define;
 import static org.opensearch.sql.expression.function.FunctionDSL.impl;
-import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling;
 
 import lombok.experimental.UtilityClass;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
@@ -25,7 +24,6 @@ public void register(BuiltinFunctionRepository repository) {
 
   private DefaultFunctionResolver jsonValid() {
     return define(
-        BuiltinFunctionName.JSON_VALID.getName(),
-        impl(nullMissingHandling(JsonUtils::isValidJson), BOOLEAN, STRING));
+        BuiltinFunctionName.JSON_VALID.getName(), impl(JsonUtils::isValidJson, BOOLEAN, STRING));
   }
 }
diff --git a/core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java b/core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java
@@ -8,6 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_FALSE;
+import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_MISSING;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_NULL;
 import static org.opensearch.sql.data.model.ExprValueUtils.LITERAL_TRUE;
 
@@ -37,9 +38,8 @@ public class JsonFunctionsTest {
   public void json_valid_returns_false() {
     assertEquals(LITERAL_FALSE, execute(JsonInvalidObject));
     assertEquals(LITERAL_FALSE, execute(JsonInvalidScalar));
-
-    // caught by nullMissingHandling and returns null
-    assertEquals(LITERAL_NULL, execute(LITERAL_NULL));
+    assertEquals(LITERAL_FALSE, execute(LITERAL_NULL));
+    assertEquals(LITERAL_FALSE, execute(LITERAL_MISSING));
   }
 
   @Test