ESQL: Fix double lookup and HashJoinExec.addedFields (elastic#115616)

Fix a bug in HashJoinExec.addedFields that caused multiple LOOKUPs in a query to fail.
alexey-ivanov-es · Nov 28, 2024 · 6759c04 · 6759c04
1 parent b5d4815
commit 6759c04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/docs/changelog/115616.yaml b/docs/changelog/115616.yaml
@@ -0,0 +1,6 @@
+pr: 115616
+summary: Fix double lookup failure on ESQL
+area: ES|QL
+type: bug
+issues:
+  - 111398
diff --git a/...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/HashJoinExec.java b/...ck/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/HashJoinExec.java
@@ -91,7 +91,7 @@ public List<Attribute> rightFields() {
 
     public Set<Attribute> addedFields() {
         if (lazyAddedFields == null) {
-            lazyAddedFields = outputSet();
+            lazyAddedFields = new AttributeSet(output());
             lazyAddedFields.removeAll(left().output());
         }
         return lazyAddedFields;