From 6759c0474e07afee3e1a347ef5da869e0fc65bec Mon Sep 17 00:00:00 2001
From: Jack Pan <35284546+jackpan123@users.noreply.github.com>
Date: Fri, 22 Nov 2024 20:52:57 +0800
Subject: [PATCH] ESQL: Fix double lookup and HashJoinExec.addedFields
 (#115616)

Fix a bug in HashJoinExec.addedFields that caused multiple LOOKUPs in a query to fail.
---
 docs/changelog/115616.yaml                                  | 6 ++++++
 .../xpack/esql/plan/physical/HashJoinExec.java              | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 docs/changelog/115616.yaml

diff --git a/docs/changelog/115616.yaml b/docs/changelog/115616.yaml
new file mode 100644
index 0000000000000..4fb4dc18538de
--- /dev/null
+++ 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/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/HashJoinExec.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/HashJoinExec.java
index 4574c3720f8ee..5ae3702993fcb 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/HashJoinExec.java
+++ b/x-pack/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;