Change capabilities to avoid bwc problems

elasticsearchmachine · elasticsearchmachine · commit 71d7eabff720 · 2025-10-09T14:33:44.000+02:00
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/vector-magnitude.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/vector-magnitude.csv-spec
@@ -1,7 +1,7 @@
  # Tests for v_magnitude scalar function
  
  magnitudeWithVectorField
- required_capability: magnitude_scalar_vector_function
+ required_capability: magnitude_scalar_vector_function_pushable
  required_capability: dense_vector_field_type_released
  
 // tag::vector-magnitude[]
@@ -29,7 +29,7 @@ linen      | 415.93267822265625
 ;
 
  magnitudeAsPartOfExpression
- required_capability: magnitude_scalar_vector_function
+ required_capability: magnitude_scalar_vector_function_pushable
  required_capability: dense_vector_field_type_released
  
  from colors
@@ -53,7 +53,7 @@ linen      | 208.966
 ;
 
 magnitudeWithLiteralVectors
-required_capability: magnitude_scalar_vector_function
+required_capability: magnitude_scalar_vector_function_pushable
 required_capability: dense_vector_field_type_released
  
 row a = 1
@@ -66,7 +66,7 @@ magnitude:double
 ;
 
  magnitudeWithStats
- required_capability: magnitude_scalar_vector_function
+ required_capability: magnitude_scalar_vector_function_pushable
  required_capability: dense_vector_field_type_released
  
  from colors
@@ -79,7 +79,7 @@ avg:double | min:double | max:double
 ;
 
 magnitudeWithNull
-required_capability: magnitude_scalar_vector_function
+required_capability: magnitude_scalar_vector_function_pushable
 required_capability: dense_vector_field_type_released
  
 row a = 1
@@ -92,7 +92,7 @@ null
 ;
 
 magnitudeWithRow
-required_capability: magnitude_scalar_vector_function
+required_capability: magnitude_scalar_vector_function_pushable
 required_capability: to_dense_vector_function
 required_capability: dense_vector_field_type_released
  
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
@@ -1305,7 +1305,7 @@ public enum Cap {
         /**
          * Cosine vector similarity function
          */
-        COSINE_VECTOR_SIMILARITY_FUNCTION(Build.current().isSnapshot()),
+        COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE(Build.current().isSnapshot()),
 
         /**
          * Fixed some profile serialization issues
@@ -1319,17 +1319,17 @@ public enum Cap {
         /**
          * Dot product vector similarity function
          */
-        DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION(Build.current().isSnapshot()),
+        DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE(Build.current().isSnapshot()),
 
         /**
          * l1 norm vector similarity function
          */
-        L1_NORM_VECTOR_SIMILARITY_FUNCTION(Build.current().isSnapshot()),
+        L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE(Build.current().isSnapshot()),
 
         /**
          * l2 norm vector similarity function
          */
-        L2_NORM_VECTOR_SIMILARITY_FUNCTION(Build.current().isSnapshot()),
+        L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE(Build.current().isSnapshot()),
 
         /**
          * Support for the options field of CATEGORIZE.
@@ -1355,7 +1355,7 @@ public enum Cap {
         /*
          * Support for calculating the scalar vector magnitude.
          */
-        MAGNITUDE_SCALAR_VECTOR_FUNCTION(Build.current().isSnapshot()),
+        MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE(Build.current().isSnapshot()),
 
         /**
          * Byte elements dense vector field type support.
@@ -1375,7 +1375,7 @@ public enum Cap {
         /**
          * Support for vector Hamming distance.
          */
-        HAMMING_VECTOR_SIMILARITY_FUNCTION(Build.current().isSnapshot()),
+        HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE(Build.current().isSnapshot()),
 
         /**
          * Support for tbucket function
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/VectorWritables.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/vector/VectorWritables.java
@@ -28,22 +28,22 @@ public static List<NamedWriteableRegistry.Entry> getNamedWritables() {
         List<NamedWriteableRegistry.Entry> entries = new ArrayList<>();
 
         entries.add(Knn.ENTRY);
-        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             entries.add(CosineSimilarity.ENTRY);
         }
-        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             entries.add(DotProduct.ENTRY);
         }
-        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             entries.add(L1Norm.ENTRY);
         }
-        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             entries.add(L2Norm.ENTRY);
         }
-        if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE.isEnabled()) {
             entries.add(Magnitude.ENTRY);
         }
-        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             entries.add(Hamming.ENTRY);
         }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java
@@ -2418,28 +2418,28 @@ private void checkDenseVectorCastingKnnQueryParams(String fieldName) {
     }
 
     public void testDenseVectorImplicitCastingSimilarityFunctions() {
-        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorImplicitCastingSimilarityFunction(
                 "v_cosine(float_vector, [0.342, 0.164, 0.234])",
                 List.of(0.342, 0.164, 0.234)
             );
             checkDenseVectorImplicitCastingSimilarityFunction("v_cosine(byte_vector, [1, 2, 3])", List.of(1, 2, 3));
         }
-        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorImplicitCastingSimilarityFunction(
                 "v_dot_product(float_vector, [0.342, 0.164, 0.234])",
                 List.of(0.342, 0.164, 0.234)
             );
             checkDenseVectorImplicitCastingSimilarityFunction("v_dot_product(byte_vector, [1, 2, 3])", List.of(1, 2, 3));
         }
-        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorImplicitCastingSimilarityFunction(
                 "v_l1_norm(float_vector, [0.342, 0.164, 0.234])",
                 List.of(0.342, 0.164, 0.234)
             );
             checkDenseVectorImplicitCastingSimilarityFunction("v_l1_norm(byte_vector, [1, 2, 3])", List.of(1, 2, 3));
         }
-        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorImplicitCastingSimilarityFunction(
                 "v_l2_norm(float_vector, [0.342, 0.164, 0.234])",
                 List.of(0.342, 0.164, 0.234)
@@ -2450,7 +2450,7 @@ public void testDenseVectorImplicitCastingSimilarityFunctions() {
                 checkDenseVectorImplicitCastingSimilarityFunction("v_l2_norm(bit_vector, [1, 2])", List.of(1, 2));
             }
         }
-        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorImplicitCastingSimilarityFunction(
                 "v_hamming(byte_vector, [0.342, 0.164, 0.234])",
                 List.of(0.342, 0.164, 0.234)
@@ -2480,23 +2480,23 @@ private void checkDenseVectorImplicitCastingSimilarityFunction(String similarity
     }
 
     public void testDenseVectorEvalCastingSimilarityFunctions() {
-        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorEvalCastingSimilarityFunction("v_cosine(float_vector, query)");
             checkDenseVectorEvalCastingSimilarityFunction("v_cosine(byte_vector, query)");
         }
-        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorEvalCastingSimilarityFunction("v_dot_product(float_vector, query)");
             checkDenseVectorEvalCastingSimilarityFunction("v_dot_product(byte_vector, query)");
         }
-        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorEvalCastingSimilarityFunction("v_l1_norm(float_vector, query)");
             checkDenseVectorEvalCastingSimilarityFunction("v_l1_norm(byte_vector, query)");
         }
-        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorEvalCastingSimilarityFunction("v_l2_norm(float_vector, query)");
             checkDenseVectorEvalCastingSimilarityFunction("v_l2_norm(float_vector, query)");
         }
-        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkDenseVectorEvalCastingSimilarityFunction("v_hamming(byte_vector, query)");
             checkDenseVectorEvalCastingSimilarityFunction("v_hamming(byte_vector, query)");
         }
@@ -2521,16 +2521,16 @@ private void checkDenseVectorEvalCastingSimilarityFunction(String similarityFunc
 
     public void testVectorFunctionHexImplicitCastingError() {
         checkVectorFunctionHexImplicitCastingError("where knn(float_vector, \"notcorrect\")");
-        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionHexImplicitCastingError("eval s = v_dot_product(\"notcorrect\", 0.342)");
         }
-        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionHexImplicitCastingError("eval s = v_l1_norm(\"notcorrect\", 0.342)");
         }
-        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionHexImplicitCastingError("eval s = v_l2_norm(\"notcorrect\", 0.342)");
         }
-        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionHexImplicitCastingError("eval s = v_hamming(\"notcorrect\", 0.342)");
         }
     }
@@ -2548,7 +2548,7 @@ private void checkVectorFunctionHexImplicitCastingError(String clause) {
     }
 
     public void testMagnitudePlanWithDenseVectorImplicitCasting() {
-        assumeTrue("v_magnitude not available", EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled());
+        assumeTrue("v_magnitude not available", EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE.isEnabled());
 
         var plan = analyze(String.format(Locale.ROOT, """
             from test | eval scalar = v_magnitude([1, 2, 3])
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
@@ -2471,26 +2471,26 @@ private void checkFullTextFunctionsInStats(String functionInvocation) {
     }
 
     public void testVectorSimilarityFunctionsNullArgs() throws Exception {
-        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionsNullArgs("v_cosine(null, vector)");
             checkVectorFunctionsNullArgs("v_cosine(vector, null)");
         }
-        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionsNullArgs("v_dot_product(null, vector)");
             checkVectorFunctionsNullArgs("v_dot_product(vector, null)");
         }
-        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionsNullArgs("v_l1_norm(null, vector)");
             checkVectorFunctionsNullArgs("v_l1_norm(vector, null)");
         }
-        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionsNullArgs("v_l2_norm(null, vector)");
             checkVectorFunctionsNullArgs("v_l2_norm(vector, null)");
         }
-        if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionsNullArgs("v_magnitude(null)");
         }
-        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
+        if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {
             checkVectorFunctionsNullArgs("v_hamming(null, vector)");
             checkVectorFunctionsNullArgs("v_hamming(vector, null)");
         }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/CosineSimilarityTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/CosineSimilarityTests.java
@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     protected EsqlCapabilities.Cap capability() {
-        return EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION;
+        return EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/DotProductSimilarityTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/DotProductSimilarityTests.java
@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     protected EsqlCapabilities.Cap capability() {
-        return EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION;
+        return EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/HammingSimilarityTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/HammingSimilarityTests.java
@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     protected EsqlCapabilities.Cap capability() {
-        return EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION;
+        return EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/L1NormSimilarityTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/L1NormSimilarityTests.java
@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     protected EsqlCapabilities.Cap capability() {
-        return EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION;
+        return EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/L2NormSimilarityTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/L2NormSimilarityTests.java
@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     protected EsqlCapabilities.Cap capability() {
-        return EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION;
+        return EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/MagnitudeTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/vector/MagnitudeTests.java
@@ -38,7 +38,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     protected EsqlCapabilities.Cap capability() {
-        return EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION;
+        return EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java
@@ -8314,6 +8314,47 @@ protected List<Batch<PhysicalPlan>> batches() {
         return PhysicalPlanOptimizer;
     }
 
+    public void testTest() throws Exception {
+
+        PhysicalPlan plan = physicalPlan("""
+            from test
+            | stats a = min(salary) by emp_no
+            """);
+
+        var limit = as(plan, LimitExec.class);
+        var aggregate = as(limit.child(), AggregateExec.class);
+        var min = as(Alias.unwrap(aggregate.aggregates().get(0)), Min.class);
+        var salary = as(min.field(), NamedExpression.class);
+        assertThat(salary.name(), is("salary"));
+        Holder<Integer> appliedCount = new Holder<>(0);
+        // use a custom rule that adds another output attribute
+        var customRuleBatch = new RuleExecutor.Batch<>(
+            "CustomRuleBatch",
+            RuleExecutor.Limiter.ONCE,
+            new PhysicalOptimizerRules.ParameterizedOptimizerRule<PhysicalPlan, PhysicalOptimizerContext>() {
+                @Override
+                public PhysicalPlan rule(PhysicalPlan plan, PhysicalOptimizerContext context) {
+                    // This rule adds a missing attribute to the plan output
+                    // We only want to apply it once, so we use a static counter
+                    if (appliedCount.get() == 0) {
+                        appliedCount.set(appliedCount.get() + 1);
+                        Literal additionalLiteral = new Literal(Source.EMPTY, "additional literal", INTEGER);
+                        return new EvalExec(
+                            plan.source(),
+                            plan,
+                            List.of(new Alias(Source.EMPTY, "additionalAttribute", additionalLiteral))
+                        );
+                    }
+                    return plan;
+                }
+            }
+        );
+        PhysicalPlanOptimizer customRulesPhysicalPlanOptimizer = getCustomRulesPhysicalPlanOptimizer(List.of(customRuleBatch));
+        Exception e = expectThrows(VerificationException.class, () -> customRulesPhysicalPlanOptimizer.optimize(plan));
+        assertThat(e.getMessage(), containsString("Output has changed from"));
+        assertThat(e.getMessage(), containsString("additionalAttribute"));
+    }
+
     public void testVerifierOnAdditionalAttributeAdded() throws Exception {
 
         PhysicalPlan plan = physicalPlan("""

Original file line number	Diff line number	Diff line change
`@@ -28,22 +28,22 @@ public static List<NamedWriteableRegistry.Entry> getNamedWritables() {`
`28`	`28`	`List<NamedWriteableRegistry.Entry> entries = new ArrayList<>();`
`29`	`29`
`30`	`30`	`entries.add(Knn.ENTRY);`
`31`		`- if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`31`	`+ if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`32`	`32`	`entries.add(CosineSimilarity.ENTRY);`
`33`	`33`	`}`
`34`		`- if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`34`	`+ if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`35`	`35`	`entries.add(DotProduct.ENTRY);`
`36`	`36`	`}`
`37`		`- if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`37`	`+ if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`38`	`38`	`entries.add(L1Norm.ENTRY);`
`39`	`39`	`}`
`40`		`- if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`40`	`+ if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`41`	`41`	`entries.add(L2Norm.ENTRY);`
`42`	`42`	`}`
`43`		`- if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled()) {`
	`43`	`+ if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE.isEnabled()) {`
`44`	`44`	`entries.add(Magnitude.ENTRY);`
`45`	`45`	`}`
`46`		`- if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`46`	`+ if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`47`	`47`	`entries.add(Hamming.ENTRY);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -2418,28 +2418,28 @@ private void checkDenseVectorCastingKnnQueryParams(String fieldName) {`
`2418`	`2418`	`}`
`2419`	`2419`
`2420`	`2420`	`public void testDenseVectorImplicitCastingSimilarityFunctions() {`
`2421`		`- if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2421`	`+ if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2422`	`2422`	`checkDenseVectorImplicitCastingSimilarityFunction(`
`2423`	`2423`	`"v_cosine(float_vector, [0.342, 0.164, 0.234])",`
`2424`	`2424`	`List.of(0.342, 0.164, 0.234)`
`2425`	`2425`	`);`
`2426`	`2426`	`checkDenseVectorImplicitCastingSimilarityFunction("v_cosine(byte_vector, [1, 2, 3])", List.of(1, 2, 3));`
`2427`	`2427`	`}`
`2428`		`- if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2428`	`+ if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2429`	`2429`	`checkDenseVectorImplicitCastingSimilarityFunction(`
`2430`	`2430`	`"v_dot_product(float_vector, [0.342, 0.164, 0.234])",`
`2431`	`2431`	`List.of(0.342, 0.164, 0.234)`
`2432`	`2432`	`);`
`2433`	`2433`	`checkDenseVectorImplicitCastingSimilarityFunction("v_dot_product(byte_vector, [1, 2, 3])", List.of(1, 2, 3));`
`2434`	`2434`	`}`
`2435`		`- if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2435`	`+ if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2436`	`2436`	`checkDenseVectorImplicitCastingSimilarityFunction(`
`2437`	`2437`	`"v_l1_norm(float_vector, [0.342, 0.164, 0.234])",`
`2438`	`2438`	`List.of(0.342, 0.164, 0.234)`
`2439`	`2439`	`);`
`2440`	`2440`	`checkDenseVectorImplicitCastingSimilarityFunction("v_l1_norm(byte_vector, [1, 2, 3])", List.of(1, 2, 3));`
`2441`	`2441`	`}`
`2442`		`- if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2442`	`+ if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2443`	`2443`	`checkDenseVectorImplicitCastingSimilarityFunction(`
`2444`	`2444`	`"v_l2_norm(float_vector, [0.342, 0.164, 0.234])",`
`2445`	`2445`	`List.of(0.342, 0.164, 0.234)`
`@@ -2450,7 +2450,7 @@ public void testDenseVectorImplicitCastingSimilarityFunctions() {`
`2450`	`2450`	`checkDenseVectorImplicitCastingSimilarityFunction("v_l2_norm(bit_vector, [1, 2])", List.of(1, 2));`
`2451`	`2451`	`}`
`2452`	`2452`	`}`
`2453`		`- if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2453`	`+ if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2454`	`2454`	`checkDenseVectorImplicitCastingSimilarityFunction(`
`2455`	`2455`	`"v_hamming(byte_vector, [0.342, 0.164, 0.234])",`
`2456`	`2456`	`List.of(0.342, 0.164, 0.234)`
`@@ -2480,23 +2480,23 @@ private void checkDenseVectorImplicitCastingSimilarityFunction(String similarity`
`2480`	`2480`	`}`
`2481`	`2481`
`2482`	`2482`	`public void testDenseVectorEvalCastingSimilarityFunctions() {`
`2483`		`- if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2483`	`+ if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2484`	`2484`	`checkDenseVectorEvalCastingSimilarityFunction("v_cosine(float_vector, query)");`
`2485`	`2485`	`checkDenseVectorEvalCastingSimilarityFunction("v_cosine(byte_vector, query)");`
`2486`	`2486`	`}`
`2487`		`- if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2487`	`+ if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2488`	`2488`	`checkDenseVectorEvalCastingSimilarityFunction("v_dot_product(float_vector, query)");`
`2489`	`2489`	`checkDenseVectorEvalCastingSimilarityFunction("v_dot_product(byte_vector, query)");`
`2490`	`2490`	`}`
`2491`		`- if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2491`	`+ if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2492`	`2492`	`checkDenseVectorEvalCastingSimilarityFunction("v_l1_norm(float_vector, query)");`
`2493`	`2493`	`checkDenseVectorEvalCastingSimilarityFunction("v_l1_norm(byte_vector, query)");`
`2494`	`2494`	`}`
`2495`		`- if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2495`	`+ if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2496`	`2496`	`checkDenseVectorEvalCastingSimilarityFunction("v_l2_norm(float_vector, query)");`
`2497`	`2497`	`checkDenseVectorEvalCastingSimilarityFunction("v_l2_norm(float_vector, query)");`
`2498`	`2498`	`}`
`2499`		`- if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2499`	`+ if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2500`	`2500`	`checkDenseVectorEvalCastingSimilarityFunction("v_hamming(byte_vector, query)");`
`2501`	`2501`	`checkDenseVectorEvalCastingSimilarityFunction("v_hamming(byte_vector, query)");`
`2502`	`2502`	`}`
`@@ -2521,16 +2521,16 @@ private void checkDenseVectorEvalCastingSimilarityFunction(String similarityFunc`
`2521`	`2521`
`2522`	`2522`	`public void testVectorFunctionHexImplicitCastingError() {`
`2523`	`2523`	`checkVectorFunctionHexImplicitCastingError("where knn(float_vector, \"notcorrect\")");`
`2524`		`- if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2524`	`+ if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2525`	`2525`	`checkVectorFunctionHexImplicitCastingError("eval s = v_dot_product(\"notcorrect\", 0.342)");`
`2526`	`2526`	`}`
`2527`		`- if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2527`	`+ if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2528`	`2528`	`checkVectorFunctionHexImplicitCastingError("eval s = v_l1_norm(\"notcorrect\", 0.342)");`
`2529`	`2529`	`}`
`2530`		`- if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2530`	`+ if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2531`	`2531`	`checkVectorFunctionHexImplicitCastingError("eval s = v_l2_norm(\"notcorrect\", 0.342)");`
`2532`	`2532`	`}`
`2533`		`- if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2533`	`+ if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2534`	`2534`	`checkVectorFunctionHexImplicitCastingError("eval s = v_hamming(\"notcorrect\", 0.342)");`
`2535`	`2535`	`}`
`2536`	`2536`	`}`
`@@ -2548,7 +2548,7 @@ private void checkVectorFunctionHexImplicitCastingError(String clause) {`
`2548`	`2548`	`}`
`2549`	`2549`
`2550`	`2550`	`public void testMagnitudePlanWithDenseVectorImplicitCasting() {`
`2551`		`- assumeTrue("v_magnitude not available", EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled());`
	`2551`	`+ assumeTrue("v_magnitude not available", EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE.isEnabled());`
`2552`	`2552`
`2553`	`2553`	`var plan = analyze(String.format(Locale.ROOT, """`
`2554`	`2554`	`from test \| eval scalar = v_magnitude([1, 2, 3])`
Original file line number	Diff line number	Diff line change
`@@ -2471,26 +2471,26 @@ private void checkFullTextFunctionsInStats(String functionInvocation) {`
`2471`	`2471`	`}`
`2472`	`2472`
`2473`	`2473`	`public void testVectorSimilarityFunctionsNullArgs() throws Exception {`
`2474`		`- if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2474`	`+ if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2475`	`2475`	`checkVectorFunctionsNullArgs("v_cosine(null, vector)");`
`2476`	`2476`	`checkVectorFunctionsNullArgs("v_cosine(vector, null)");`
`2477`	`2477`	`}`
`2478`		`- if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2478`	`+ if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2479`	`2479`	`checkVectorFunctionsNullArgs("v_dot_product(null, vector)");`
`2480`	`2480`	`checkVectorFunctionsNullArgs("v_dot_product(vector, null)");`
`2481`	`2481`	`}`
`2482`		`- if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2482`	`+ if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2483`	`2483`	`checkVectorFunctionsNullArgs("v_l1_norm(null, vector)");`
`2484`	`2484`	`checkVectorFunctionsNullArgs("v_l1_norm(vector, null)");`
`2485`	`2485`	`}`
`2486`		`- if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2486`	`+ if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2487`	`2487`	`checkVectorFunctionsNullArgs("v_l2_norm(null, vector)");`
`2488`	`2488`	`checkVectorFunctionsNullArgs("v_l2_norm(vector, null)");`
`2489`	`2489`	`}`
`2490`		`- if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION.isEnabled()) {`
	`2490`	`+ if (EsqlCapabilities.Cap.MAGNITUDE_SCALAR_VECTOR_FUNCTION_PUSHABLE.isEnabled()) {`
`2491`	`2491`	`checkVectorFunctionsNullArgs("v_magnitude(null)");`
`2492`	`2492`	`}`
`2493`		`- if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {`
	`2493`	`+ if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION_PUSHABLE.isEnabled()) {`
`2494`	`2494`	`checkVectorFunctionsNullArgs("v_hamming(null, vector)");`
`2495`	`2495`	`checkVectorFunctionsNullArgs("v_hamming(vector, null)");`
`2496`	`2496`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`protected EsqlCapabilities.Cap capability() {`
`40`		`- return EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION;`
	`40`	`+ return EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION_PUSHABLE;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override`