Fix merge

Author: svilen-mihaylov-elastic

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/Magnitude.java

@@ -31,7 +31,6 @@
 
 import java.io.IOException;
 
-import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isNotNull;
 import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DENSE_VECTOR;
 
@@ -88,9 +87,7 @@ protected TypeResolution resolveType() {
             return new TypeResolution("Unresolved children");
         }
 
-        return isNotNull(field(), sourceText(), TypeResolutions.ParamOrdinal.FIRST).and(
-            isType(field(), dt -> dt == DENSE_VECTOR, sourceText(), TypeResolutions.ParamOrdinal.FIRST, "dense_vector")
-        );
+        return isType(field(), dt -> dt == DENSE_VECTOR, sourceText(), TypeResolutions.ParamOrdinal.FIRST, "dense_vector");
     }
 
     /**

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -2500,7 +2500,7 @@ public void testVectorSimilarityFunctionsNullArgs() throws Exception {
             checkVectorFunctionsNullArgs("v_l2_norm(vector, null)");
         }
         if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled()) {
-            checkVectorFunctionsNullArgs("v_magnitude(null)", "first");
+            checkVectorFunctionsNullArgs("v_magnitude(null)");
         }
     }