Remove null checks for str and substr in CONTAINS function logic

mjmbischoff · mjmbischoff · commit 60ebb6bf2cf5 · 2025-08-24T16:09:25.000+02:00
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Contains.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Contains.java
@@ -100,7 +100,7 @@ public boolean foldable() {
 
     @Evaluator
     static boolean process(BytesRef str, BytesRef substr) {
-        if (str == null || substr == null || str.length < substr.length) {
+        if (str.length < substr.length) {
             return false;
         }
         return str.utf8ToString().contains(substr.utf8ToString());

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public boolean foldable() {`
`100`	`100`
`101`	`101`	`@Evaluator`
`102`	`102`	`static boolean process(BytesRef str, BytesRef substr) {`
`103`		`- if (str == null \|\| substr == null \|\| str.length < substr.length) {`
	`103`	`+ if (str.length < substr.length) {`
`104`	`104`	`return false;`
`105`	`105`	`}`
`106`	`106`	`return str.utf8ToString().contains(substr.utf8ToString());`