Further fixes and addressing reviews

astefan · astefan · commit 0ba7a4abf618 · 2025-07-02T19:20:21.000+03:00
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
@@ -83,6 +83,7 @@
 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.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 import org.elasticsearch.xpack.esql.plugin.EsqlPlugin;
@@ -446,7 +447,7 @@ public static Literal L(Object value) {
     }
 
     public static LogicalPlan emptySource() {
-        return new LocalRelation(Source.EMPTY, emptyList(), LocalSupplier.EMPTY);
+        return new LocalRelation(Source.EMPTY, emptyList(), EmptyLocalSupplier.EMPTY);
     }
 
     public static LogicalPlan localSource(BlockFactory blockFactory, List<Attribute> fields, List<Object> row) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateEmptyRelation.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateEmptyRelation.java
@@ -20,6 +20,7 @@
 import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
@@ -36,7 +37,7 @@ public PropagateEmptyRelation() {
     @Override
     protected LogicalPlan rule(UnaryPlan plan, LogicalOptimizerContext ctx) {
         LogicalPlan p = plan;
-        if (plan.child() instanceof LocalRelation local && local.supplier() == LocalSupplier.EMPTY) {
+        if (plan.child() instanceof LocalRelation local && local.supplier() == EmptyLocalSupplier.EMPTY) {
             // only care about non-grouped aggs might return something (count)
             if (plan instanceof Aggregate agg && agg.groupings().isEmpty()) {
                 List<Block> emptyBlocks = aggsFromEmpty(ctx.foldCtx(), agg.aggregates());
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PruneColumns.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PruneColumns.java
@@ -67,6 +67,7 @@ public LogicalPlan apply(LogicalPlan plan) {
                 return p;
             }
 
+            // TODO: INLINESTATS unit testing for tracking this set
             if (p instanceof InlineJoin ij) {
                 inlineJoinRightOutput.addAll(ij.right().outputSet());
             }
@@ -78,6 +79,7 @@ public LogicalPlan apply(LogicalPlan plan) {
             do {
                 recheck = false;
                 if (p instanceof Aggregate aggregate) {
+                    // TODO: INLINESTATS https://github.com/elastic/elasticsearch/pull/128917#discussion_r2175162099
                     var remaining = removeUnused(aggregate.aggregates(), used, inlineJoinRightOutput);
 
                     if (remaining != null) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PruneEmptyPlans.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PruneEmptyPlans.java
@@ -9,13 +9,13 @@
 
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
-import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 
 public final class PruneEmptyPlans extends OptimizerRules.OptimizerRule<UnaryPlan> {
 
     public static LogicalPlan skipPlan(UnaryPlan plan) {
-        return new LocalRelation(plan.source(), plan.output(), LocalSupplier.EMPTY);
+        return new LocalRelation(plan.source(), plan.output(), EmptyLocalSupplier.EMPTY);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/SkipQueryOnEmptyMappings.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/SkipQueryOnEmptyMappings.java
@@ -9,13 +9,13 @@
 
 import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
-import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 
 public final class SkipQueryOnEmptyMappings extends OptimizerRules.OptimizerRule<EsRelation> {
 
     @Override
     protected LogicalPlan rule(EsRelation plan) {
-        return plan.concreteIndices().isEmpty() ? new LocalRelation(plan.source(), plan.output(), LocalSupplier.EMPTY) : plan;
+        return plan.concreteIndices().isEmpty() ? new LocalRelation(plan.source(), plan.output(), EmptyLocalSupplier.EMPTY) : plan;
     }
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/PlanWritables.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/PlanWritables.java
@@ -29,6 +29,7 @@
 import org.elasticsearch.xpack.esql.plan.logical.join.InlineJoin;
 import org.elasticsearch.xpack.esql.plan.logical.join.Join;
 import org.elasticsearch.xpack.esql.plan.logical.local.CopyingLocalSupplier;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.EsqlProject;
 import org.elasticsearch.xpack.esql.plan.logical.local.ImmediateLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
@@ -129,6 +130,6 @@ public static List<NamedWriteableRegistry.Entry> physical() {
     }
 
     public static List<NamedWriteableRegistry.Entry> others() {
-        return List.of(CopyingLocalSupplier.ENTRY, ImmediateLocalSupplier.ENTRY);
+        return List.of(CopyingLocalSupplier.ENTRY, ImmediateLocalSupplier.ENTRY, EmptyLocalSupplier.ENTRY);
     }
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/join/InlineJoin.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/join/InlineJoin.java
@@ -77,6 +77,8 @@ public static LogicalPlan inlineData(InlineJoin target, LocalRelation data) {
 
     /**
      * Replaces the stubbed source with the actual source.
+     * NOTE: this will replace all {@link StubRelation}s found with the source and the method is meant to be used to replace one node only
+     * when being called on a plan that has only ONE StubRelation in it.
      */
     public static LogicalPlan replaceStub(LogicalPlan source, LogicalPlan stubbed) {
         // here we could have used stubbed.transformUp(StubRelation.class, stubRelation -> source)
@@ -129,7 +131,7 @@ public static LogicalPlanTuple firstSubPlan(LogicalPlan optimizedPlan) {
         optimizedPlan.forEachUp(InlineJoin.class, ij -> {
             // extract the right side of the plan and replace its source
             if (subPlan.get() == null && ij.right().anyMatch(p -> p instanceof StubRelation)) {
-                var p = InlineJoin.replaceStub(ij.left(), ij.right());
+                var p = replaceStub(ij.left(), ij.right());
                 p.setOptimized();
                 subPlan.set(new LogicalPlanTuple(p, ij.right()));
             }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/EmptyLocalSupplier.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/EmptyLocalSupplier.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.plan.logical.local;
+
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BlockUtils;
+
+import java.io.IOException;
+
+public class EmptyLocalSupplier implements LocalSupplier {
+
+    public static final LocalSupplier EMPTY = new EmptyLocalSupplier();
+    public static final String NAME = "EmptySupplier";
+    private static final Writeable.Reader<LocalSupplier> EMPTY_LOCAL_SUPPLIER_READER = in -> {
+        assert in.readVInt() == 0;
+        return EMPTY;
+    };
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
+        LocalSupplier.class,
+        NAME,
+        EMPTY_LOCAL_SUPPLIER_READER
+    );
+
+    private EmptyLocalSupplier() {}
+
+    @Override
+    public String getWriteableName() {
+        return NAME;
+    }
+
+    @Override
+    public Block[] get() {
+        return BlockUtils.NO_BLOCKS;
+    }
+
+    @Override
+    public String toString() {
+        return "EMPTY";
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeVInt(0);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj == EMPTY;
+    }
+
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalSupplier.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalSupplier.java
@@ -8,10 +8,8 @@
 package org.elasticsearch.xpack.esql.plan.logical.local;
 
 import org.elasticsearch.common.io.stream.NamedWriteable;
-import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.compute.data.Block;
-import org.elasticsearch.compute.data.BlockUtils;
 import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
 
 import java.io.IOException;
@@ -26,46 +24,14 @@
  *     {@link UnsupportedOperationException}.
  * </p>
  */
-public interface LocalSupplier extends Supplier<Block[]>, Writeable, NamedWriteable {
-
-    LocalSupplier EMPTY = new LocalSupplier() {
-        @Override
-        public String getWriteableName() {
-            return "EmptySupplier";
-        }
-
-        @Override
-        public Block[] get() {
-            return BlockUtils.NO_BLOCKS;
-        }
-
-        @Override
-        public String toString() {
-            return "EMPTY";
-        }
-
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            out.writeVInt(0);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return obj == EMPTY;
-        }
-
-        @Override
-        public int hashCode() {
-            return 0;
-        }
-    };
+public interface LocalSupplier extends Supplier<Block[]>, NamedWriteable {
 
     static LocalSupplier of(Block[] blocks) {
         return new ImmediateLocalSupplier(blocks);
     }
 
     static LocalSupplier readFrom(PlanStreamInput in) throws IOException {
         Block[] blocks = in.readCachedBlockArray();
-        return blocks.length == 0 ? EMPTY : of(blocks);
+        return blocks.length == 0 ? EmptyLocalSupplier.EMPTY : of(blocks);
     }
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java
@@ -52,9 +52,9 @@
 import org.elasticsearch.xpack.esql.plan.logical.Project;
 import org.elasticsearch.xpack.esql.plan.logical.Row;
 import org.elasticsearch.xpack.esql.plan.logical.UnaryPlan;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.EsqlProject;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
-import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 import org.elasticsearch.xpack.esql.stats.SearchStats;
 import org.hamcrest.Matchers;
 import org.junit.BeforeClass;
@@ -681,7 +681,7 @@ public void testReplaceStringCasingAndRLikeWithLocalRelation() {
         var plan = localPlan("FROM test | WHERE TO_LOWER(TO_UPPER(first_name)) RLIKE \"VALÜ*\"");
 
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), equalTo(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
     }
 
     // same plan as in testReplaceUpperStringCasingWithInsensitiveRLike, but with LIKE instead of RLIKE
@@ -720,7 +720,7 @@ public void testReplaceStringCasingAndLikeWithLocalRelation() {
         var plan = localPlan("FROM test | WHERE TO_LOWER(TO_UPPER(first_name)) LIKE \"VALÜ*\"");
 
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), equalTo(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
     }
 
     /**
@@ -780,7 +780,7 @@ private IsNotNull isNotNull(Expression field) {
 
     private LocalRelation asEmptyRelation(Object o) {
         var empty = as(o, LocalRelation.class);
-        assertThat(empty.supplier(), is(LocalSupplier.EMPTY));
+        assertThat(empty.supplier(), is(EmptyLocalSupplier.EMPTY));
         return empty;
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java
@@ -128,9 +128,9 @@
 import org.elasticsearch.xpack.esql.plan.logical.join.JoinConfig;
 import org.elasticsearch.xpack.esql.plan.logical.join.JoinTypes;
 import org.elasticsearch.xpack.esql.plan.logical.join.LookupJoin;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.EsqlProject;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
-import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -1238,7 +1238,7 @@ public void testPushdownLimitsPastLeftJoin() {
         var rule = new PushDownAndCombineLimits();
 
         var leftChild = emptySource();
-        var rightChild = new LocalRelation(Source.EMPTY, List.of(fieldAttribute()), LocalSupplier.EMPTY);
+        var rightChild = new LocalRelation(Source.EMPTY, List.of(fieldAttribute()), EmptyLocalSupplier.EMPTY);
         assertNotEquals(leftChild, rightChild);
 
         var joinConfig = new JoinConfig(JoinTypes.LEFT, List.of(), List.of(), List.of());
@@ -3089,7 +3089,7 @@ public void testFoldInEval() {
             """);
 
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), is(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), is(EmptyLocalSupplier.EMPTY));
     }
 
     public void testFoldFromRow() {
@@ -5340,7 +5340,7 @@ public void testNoWrongIsNotNullPruning() {
             """);
 
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), equalTo(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
         assertWarnings(
             "Line 2:16: evaluation of [a + b] failed, treating result as null. Only first 20 failures recorded.",
             "Line 2:16: java.lang.IllegalArgumentException: single-value function encountered multi-value"
@@ -6107,7 +6107,7 @@ public void testSimplifyComparisonArithmeticSkippedOnFloats() {
     public void testReplaceStringCasingWithInsensitiveEqualsUpperFalse() {
         var plan = optimizedPlan("FROM test | WHERE TO_UPPER(first_name) == \"VALÜe\"");
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), equalTo(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
     }
 
     public void testReplaceStringCasingWithInsensitiveEqualsUpperTrue() {
@@ -6122,7 +6122,7 @@ public void testReplaceStringCasingWithInsensitiveEqualsUpperTrue() {
     public void testReplaceStringCasingWithInsensitiveEqualsLowerFalse() {
         var plan = optimizedPlan("FROM test | WHERE TO_LOWER(first_name) == \"VALÜe\"");
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), equalTo(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
     }
 
     public void testReplaceStringCasingWithInsensitiveEqualsLowerTrue() {
@@ -7318,7 +7318,7 @@ public void testWhereNull() {
             | LIMIT 12
             """);
         var local = as(plan, LocalRelation.class);
-        assertThat(local.supplier(), equalTo(LocalSupplier.EMPTY));
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
     }
 
     public void testFunctionNamedParamsAsFunctionArgument() {
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
@@ -109,8 +109,8 @@
 import org.elasticsearch.xpack.esql.plan.logical.TopN;
 import org.elasticsearch.xpack.esql.plan.logical.join.Join;
 import org.elasticsearch.xpack.esql.plan.logical.join.JoinTypes;
+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;
-import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 import org.elasticsearch.xpack.esql.plan.physical.AggregateExec;
 import org.elasticsearch.xpack.esql.plan.physical.DissectExec;
 import org.elasticsearch.xpack.esql.plan.physical.EnrichExec;
@@ -2547,7 +2547,7 @@ public void testLocallyMissingField() {
         var limit = as(optimized, LimitExec.class);
         var exchange = as(limit.child(), ExchangeExec.class);
         var source = as(exchange.child(), LocalSourceExec.class);
-        assertEquals(LocalSupplier.EMPTY, source.supplier());
+        assertEquals(EmptyLocalSupplier.EMPTY, source.supplier());
     }
 
     /**
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalSupplierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/local/LocalSupplierTests.java
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/LocalSourceExecSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/LocalSourceExecSerializationTests.java

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@`
`83`	`83`	`import org.elasticsearch.xpack.esql.plan.logical.EsRelation;`
`84`	`84`	`import org.elasticsearch.xpack.esql.plan.logical.Limit;`
`85`	`85`	`import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;`
	`86`	`+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;`
`86`	`87`	`import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;`
`87`	`88`	`import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;`
`88`	`89`	`import org.elasticsearch.xpack.esql.plugin.EsqlPlugin;`
`@@ -446,7 +447,7 @@ public static Literal L(Object value) {`
`446`	`447`	`}`
`447`	`448`
`448`	`449`	`public static LogicalPlan emptySource() {`
`449`		`- return new LocalRelation(Source.EMPTY, emptyList(), LocalSupplier.EMPTY);`
	`450`	`+ return new LocalRelation(Source.EMPTY, emptyList(), EmptyLocalSupplier.EMPTY);`
`450`	`451`	`}`
`451`	`452`
`452`	`453`	`public static LogicalPlan localSource(BlockFactory blockFactory, List<Attribute> fields, List<Object> row) {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public LogicalPlan apply(LogicalPlan plan) {`
`67`	`67`	`return p;`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ // TODO: INLINESTATS unit testing for tracking this set`
`70`	`71`	`if (p instanceof InlineJoin ij) {`
`71`	`72`	`inlineJoinRightOutput.addAll(ij.right().outputSet());`
`72`	`73`	`}`
`@@ -78,6 +79,7 @@ public LogicalPlan apply(LogicalPlan plan) {`
`78`	`79`	`do {`
`79`	`80`	`recheck = false;`
`80`	`81`	`if (p instanceof Aggregate aggregate) {`
	`82`	`+ // TODO: INLINESTATS https://github.com/elastic/elasticsearch/pull/128917#discussion_r2175162099`
`81`	`83`	`var remaining = removeUnused(aggregate.aggregates(), used, inlineJoinRightOutput);`
`82`	`84`
`83`	`85`	`if (remaining != null) {`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@`
`9`	`9`
`10`	`10`	`import org.elasticsearch.xpack.esql.plan.logical.EsRelation;`
`11`	`11`	`import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;`
	`12`	`+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;`
`12`	`13`	`import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;`
`13`		`-import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;`
`14`	`14`
`15`	`15`	`public final class SkipQueryOnEmptyMappings extends OptimizerRules.OptimizerRule<EsRelation> {`
`16`	`16`
`17`	`17`	`@Override`
`18`	`18`	`protected LogicalPlan rule(EsRelation plan) {`
`19`		`- return plan.concreteIndices().isEmpty() ? new LocalRelation(plan.source(), plan.output(), LocalSupplier.EMPTY) : plan;`
	`19`	`+ return plan.concreteIndices().isEmpty() ? new LocalRelation(plan.source(), plan.output(), EmptyLocalSupplier.EMPTY) : plan;`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import org.elasticsearch.xpack.esql.plan.logical.join.InlineJoin;`
`30`	`30`	`import org.elasticsearch.xpack.esql.plan.logical.join.Join;`
`31`	`31`	`import org.elasticsearch.xpack.esql.plan.logical.local.CopyingLocalSupplier;`
	`32`	`+import org.elasticsearch.xpack.esql.plan.logical.local.EmptyLocalSupplier;`
`32`	`33`	`import org.elasticsearch.xpack.esql.plan.logical.local.EsqlProject;`
`33`	`34`	`import org.elasticsearch.xpack.esql.plan.logical.local.ImmediateLocalSupplier;`
`34`	`35`	`import org.elasticsearch.xpack.esql.plan.logical.local.LocalRelation;`
`@@ -129,6 +130,6 @@ public static List<NamedWriteableRegistry.Entry> physical() {`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`public static List<NamedWriteableRegistry.Entry> others() {`
`132`		`- return List.of(CopyingLocalSupplier.ENTRY, ImmediateLocalSupplier.ENTRY);`
	`133`	`+ return List.of(CopyingLocalSupplier.ENTRY, ImmediateLocalSupplier.ENTRY, EmptyLocalSupplier.ENTRY);`
`133`	`134`	`}`
`134`	`135`	`}`