Merge remote-tracking branch 'origin/esql-decay-function' into esql-decay-function

Author: timgrein

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Decay.java

@@ -177,26 +177,34 @@ protected TypeResolution resolveType() {
 
         // Spatial decay
         if (isSpatialPoint(valueDataType)) {
-            TypeResolution originResolution = isNotNull(origin, sourceText(), SECOND).and(isType(origin, DataType::isSpatialPoint, sourceText(), SECOND, "spatial point"));
+            TypeResolution originResolution = isNotNull(origin, sourceText(), SECOND).and(
+                isType(origin, DataType::isSpatialPoint, sourceText(), SECOND, "spatial point")
+            );
             if (originResolution.unresolved()) {
                 return originResolution;
             }
 
             // For a spatial decay the scale should be a distance unit string (e.g. "100km")
-            TypeResolution scaleResolution = isNotNull(scale, sourceText(), THIRD).and(isType(scale, DataType::isString, sourceText(), THIRD, "keyword or text"));
+            TypeResolution scaleResolution = isNotNull(scale, sourceText(), THIRD).and(
+                isType(scale, DataType::isString, sourceText(), THIRD, "keyword or text")
+            );
             if (scaleResolution.unresolved()) {
                 return scaleResolution;
             }
         }
         // Temporal decay
         else if (isMillisOrNanos(valueDataType)) {
-            TypeResolution originResolution = isNotNull(origin, sourceText(), SECOND).and(isType(origin, DataType::isMillisOrNanos, sourceText(), SECOND, "datetime or date_nanos"));
+            TypeResolution originResolution = isNotNull(origin, sourceText(), SECOND).and(
+                isType(origin, DataType::isMillisOrNanos, sourceText(), SECOND, "datetime or date_nanos")
+            );
             if (originResolution.unresolved()) {
                 return originResolution;
             }
 
             // For a temporal decay the scale should be a time value string (e.g. "5h")
-            TypeResolution scaleResolution = isNotNull(scale, sourceText(), THIRD).and(isType(scale, DataType::isString, sourceText(), THIRD, "date_period or time_duration"));
+            TypeResolution scaleResolution = isNotNull(scale, sourceText(), THIRD).and(
+                isType(scale, DataType::isString, sourceText(), THIRD, "date_period or time_duration")
+            );
             if (scaleResolution.unresolved()) {
                 return scaleResolution;
             }

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

@@ -2346,41 +2346,35 @@ public void testRemoteLookupJoinIsDisabled() {
 
     }
 
-    public void testDecayFunctionNullArgs(){
+    public void testDecayFunctionNullArgs() {
         assumeTrue("Decay function not enabled", EsqlCapabilities.Cap.DECAY_FUNCTION.isEnabled());
 
         // First arg cannot be null
         assertEquals(
             "2:23: first argument of [decay(null, origin, scale, 0, 0.5, \"linear\")] cannot be null, received [null]",
-            error("row origin = 10, scale = 10\n"
-                + "| eval decay_result = decay(null, origin, scale, 0, 0.5, \"linear\")")
+            error("row origin = 10, scale = 10\n" + "| eval decay_result = decay(null, origin, scale, 0, 0.5, \"linear\")")
         );
 
         // Second arg cannot be null
         assertEquals(
             "2:23: second argument of [decay(value, null, scale, 0, 0.5, \"linear\")] cannot be null, received [null]",
-            error("row value = 10, scale = 10\n"
-                + "| eval decay_result = decay(value, null, scale, 0, 0.5, \"linear\")")
+            error("row value = 10, scale = 10\n" + "| eval decay_result = decay(value, null, scale, 0, 0.5, \"linear\")")
         );
 
         // Third arg cannot be null
         assertEquals(
             "2:23: third argument of [decay(value, origin, null, 0, 0.5, \"linear\")] cannot be null, received [null]",
-            error("row value = 10, origin = 10\n"
-                + "| eval decay_result = decay(value, origin, null, 0, 0.5, \"linear\")")
+            error("row value = 10, origin = 10\n" + "| eval decay_result = decay(value, origin, null, 0, 0.5, \"linear\")")
         );
 
         // Fourth arg can be null
-        query("row value = 10, origin = 10, scale = 10\n"
-            + "| eval decay_result = decay(value, origin, scale, null, 0.5, \"linear\")");
+        query("row value = 10, origin = 10, scale = 10\n" + "| eval decay_result = decay(value, origin, scale, null, 0.5, \"linear\")");
 
         // Fifth arg can be null
-        query("row value = 10, origin = 10, scale = 10\n"
-            + "| eval decay_result = decay(value, origin, scale, 0, null, \"linear\")");
+        query("row value = 10, origin = 10, scale = 10\n" + "| eval decay_result = decay(value, origin, scale, 0, null, \"linear\")");
 
         // Sixth arg can be null
-        query("row value = 10, origin = 10, scale = 10\n"
-            + "| eval decay_result = decay(value, origin, scale, 0, 0.5, null)");
+        query("row value = 10, origin = 10, scale = 10\n" + "| eval decay_result = decay(value, origin, scale, 0, 0.5, null)");
     }
 
     private void checkFullTextFunctionsInStats(String functionInvocation) {