iter

Author: pmpailis

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/AggregateFunction.java

@@ -170,13 +170,6 @@ public boolean hasWindow() {
         return true;
     }
 
-    /**
-     * Whether the aggregate function is a wildcard aggregation (e.g., COUNT(*)).
-     */
-    public boolean isWildcard() {
-        return false;
-    }
-
     /**
      * Returns the set of input attributes required by this aggregate function, excluding those referenced by the filter.
      */

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Count.java

@@ -142,15 +142,6 @@ public Nullability nullable() {
         return Nullability.FALSE;
     }
 
-    @Override
-    public boolean isWildcard() {
-        Expression field = field();
-        if (field instanceof Literal lit) {
-            return StringUtils.WILDCARD.equals(lit.toString());
-        }
-        return false;
-    }
-
     @Override
     protected TypeResolution resolveType() {
         return isType(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PruneColumns.java

@@ -16,7 +16,6 @@
 import org.elasticsearch.xpack.esql.core.expression.Expressions;
 import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
 import org.elasticsearch.xpack.esql.core.util.Holder;
-import org.elasticsearch.xpack.esql.expression.function.aggregate.AggregateFunction;
 import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
 import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
 import org.elasticsearch.xpack.esql.plan.logical.Eval;
@@ -52,7 +51,6 @@ public LogicalPlan apply(LogicalPlan plan) {
 
     static LogicalPlan pruneColumns(LogicalPlan plan, AttributeSet.Builder used, boolean inlineJoin) {
         Holder<Boolean> forkPresent = new Holder<>(false);
-        Holder<Boolean> wildcardAgg = new Holder<>(false);
         // while going top-to-bottom (upstream)
         return plan.transformDown(p -> {
             // Note: It is NOT required to do anything special for binary plans like JOINs, except INLINE STATS. It is perfectly fine that
@@ -72,15 +70,6 @@ static LogicalPlan pruneColumns(LogicalPlan plan, AttributeSet.Builder used, boo
                 return p;
             }
 
-            if (p instanceof Aggregate) {
-                var aggs = ((Aggregate) p).aggregates();
-                for (var agg : aggs) {
-                    if (agg.children().stream().anyMatch(x -> x instanceof AggregateFunction && ((AggregateFunction) x).isWildcard())) {
-                        wildcardAgg.set(true);
-                        break;
-                    }
-                }
-            }
             var recheck = new Holder<Boolean>();
             // analyze the unused items against dedicated 'producer' nodes such as Eval and Aggregate
             // perform a loop to retry checking if the current node is completely eliminated
@@ -94,7 +83,7 @@ static LogicalPlan pruneColumns(LogicalPlan plan, AttributeSet.Builder used, boo
                     case EsRelation esr -> pruneColumnsInEsRelation(esr, used);
                     case Fork fork -> {
                         forkPresent.set(true);
-                        yield wildcardAgg.get() ? fork : pruneColumnsInFork(fork, used);
+                        yield pruneColumnsInFork(fork, used);
                     }
                     default -> p;
                 };