Disable optimization for field based join

julian-elastic · julian-elastic · commit 20c7fa55fdda · 2025-09-23T09:51:04.000-04:00
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexOperator.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/LookupFromIndexOperator.java
@@ -180,6 +180,9 @@ protected void performAsync(Page inputPage, ActionListener<OngoingJoin> listener
     }
 
     private List<MatchConfig> uniqueMatchFieldsByName(List<MatchConfig> matchFields) {
+        if (joinOnConditions == null) {
+            return matchFields;
+        }
         List<MatchConfig> uniqueFields = new ArrayList<>();
         Set<String> seenFieldNames = new HashSet<>();
         for (MatchConfig matchField : matchFields) {

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,9 @@ protected void performAsync(Page inputPage, ActionListener<OngoingJoin> listener`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`private List<MatchConfig> uniqueMatchFieldsByName(List<MatchConfig> matchFields) {`
	`183`	`+ if (joinOnConditions == null) {`
	`184`	`+ return matchFields;`
	`185`	`+ }`
`183`	`186`	`List<MatchConfig> uniqueFields = new ArrayList<>();`
`184`	`187`	`Set<String> seenFieldNames = new HashSet<>();`
`185`	`188`	`for (MatchConfig matchField : matchFields) {`