upd

Author: idegtiarenko

benchmarks/src/main/java/org/elasticsearch/benchmark/esql/QueryPlanningBenchmark.java

@@ -123,7 +123,7 @@ private LogicalPlan plan(String query) {
     }
 
     @Benchmark
-    public void run(Blackhole blackhole) {
+    public void manyFields(Blackhole blackhole) {
         blackhole.consume(plan("FROM test | LIMIT 10"));
     }
 }

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/tree/Node.java

@@ -194,9 +194,9 @@ public <E extends T> T transformDown(Class<E> typeToken, Function<E, ? extends T
     }
 
     @SuppressWarnings("unchecked")
-    public <E extends T> T transformDown(Predicate<Node<?>> tokenPredicate, Function<E, ? extends T> rule) {
+    public <E extends T> T transformDown(Predicate<Node<?>> nodePredicate, Function<E, ? extends T> rule) {
         // type filtering function
-        return transformDown((t) -> (tokenPredicate.test(t) ? rule.apply((E) t) : t));
+        return transformDown((t) -> (nodePredicate.test(t) ? rule.apply((E) t) : t));
     }
 
     @SuppressWarnings("unchecked")
@@ -213,9 +213,9 @@ public <E extends T> T transformUp(Class<E> typeToken, Function<E, ? extends T>
     }
 
     @SuppressWarnings("unchecked")
-    public <E extends T> T transformUp(Predicate<Node<?>> tokenPredicate, Function<E, ? extends T> rule) {
+    public <E extends T> T transformUp(Predicate<Node<?>> nodePredicate, Function<E, ? extends T> rule) {
         // type filtering function
-        return transformUp((t) -> (tokenPredicate.test(t) ? rule.apply((E) t) : t));
+        return transformUp((t) -> (nodePredicate.test(t) ? rule.apply((E) t) : t));
     }
 
     @SuppressWarnings("unchecked")

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

@@ -10,7 +10,9 @@
 import org.elasticsearch.xpack.esql.core.tree.Node;
 import org.elasticsearch.xpack.esql.core.util.ReflectionUtils;
 import org.elasticsearch.xpack.esql.optimizer.LogicalOptimizerContext;
+import org.elasticsearch.xpack.esql.plan.logical.Drop;
 import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
+import org.elasticsearch.xpack.esql.plan.logical.Limit;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.logical.Project;
 import org.elasticsearch.xpack.esql.rule.ParameterizedRule;
@@ -64,10 +66,17 @@ public final LogicalPlan apply(LogicalPlan plan, LogicalOptimizerContext ctx) {
 
         protected abstract Expression rule(E e, LogicalOptimizerContext ctx);
 
+        /**
+         * Defines if a node should be visited or not.
+         * Allows to skip nodes that are not applicable for the rule even if they contain expressions.
+         * By default that skips FROM, LIMIT, PROJECT, KEEP and DROP but this list could be extended or replaced in subclasses.
+         */
         protected boolean shouldVisit(Node<?> node) {
             return switch (node) {
-                case EsRelation esr -> false;
-                case Project p -> false;// this covers both keep and project
+                case EsRelation relation -> false;
+                case Project project -> false;// this covers both keep and project
+                case Drop drop -> false;
+                case Limit limit -> false;
                 default -> true;
             };
         }