Fix node tests for ToPartial (#110448) (#110531)

This change makes the three-parameter constructor of ToPartial public so that EsqlNodeSubclassTests can pick it up properly. Closes #110310
elastic · Jul 5, 2024 · 779a5f0 · 779a5f0
1 parent 3f2c81e
commit 779a5f0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -88,12 +88,6 @@ tests:
 - class: org.elasticsearch.backwards.SearchWithMinCompatibleSearchNodeIT
   method: testMinVersionAsOldVersion
   issue: https://github.com/elastic/elasticsearch/issues/109454
-- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
-  method: testReplaceChildren {class org.elasticsearch.xpack.esql.expression.function.aggregate.ToPartial}
-  issue: https://github.com/elastic/elasticsearch/issues/110310
-- class: org.elasticsearch.xpack.esql.tree.EsqlNodeSubclassTests
-  method: testInfoParameters {class org.elasticsearch.xpack.esql.expression.function.aggregate.ToPartial}
-  issue: https://github.com/elastic/elasticsearch/issues/110310
 - class: org.elasticsearch.search.vectors.ExactKnnQueryBuilderTests
   method: testToQuery
   issue: https://github.com/elastic/elasticsearch/issues/110357

diff --git a/...l/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ToPartial.java b/...l/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ToPartial.java
@@ -65,12 +65,7 @@ public class ToPartial extends AggregateFunction implements ToAggregator {
 
     private final Expression function;
 
-    public ToPartial(Source source, AggregateFunction function) {
-        super(source, function.field(), List.of(function));
-        this.function = function;
-    }
-
-    private ToPartial(Source source, Expression field, Expression function) {
+    public ToPartial(Source source, Expression field, Expression function) {
         super(source, field, List.of(function));
         this.function = function;
     }

diff --git a/...src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/TranslateMetricsAggregate.java b/...src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/TranslateMetricsAggregate.java
@@ -150,7 +150,7 @@ LogicalPlan translate(Aggregate metrics) {
                 if (changed.get()) {
                     secondPassAggs.add(new Alias(alias.source(), alias.name(), null, outerAgg, agg.id()));
                 } else {
-                    var toPartial = new Alias(agg.source(), alias.name(), new ToPartial(agg.source(), af));
+                    var toPartial = new Alias(agg.source(), alias.name(), new ToPartial(agg.source(), af.field(), af));
                     var fromPartial = new FromPartial(agg.source(), toPartial.toAttribute(), af);
                     firstPassAggs.add(toPartial);
                     secondPassAggs.add(new Alias(alias.source(), alias.name(), null, fromPartial, alias.id()));