Address a rare issue in Generative tests

julian-elastic · julian-elastic · commit dd52c02f4aa3 · 2025-07-29T23:00:50.000-04:00
diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/command/pipe/LookupJoinGenerator.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/command/pipe/LookupJoinGenerator.java
@@ -48,10 +48,11 @@ public CommandDescription generate(
                 continue; // no candidate keys of the right type, skip this column
             }
             EsqlQueryGenerator.Column key = randomFrom(candidateKeys);
-            if (usedColumns.contains(key.name())) {
+            if (usedColumns.contains(key.name()) || usedColumns.contains(idxKey)) {
                 continue; // already used this column, skip
             } else {
                 usedColumns.add(key.name());
+                usedColumns.add(idxKey);
             }
             keyNames.add(key.name());
             joinOn.add(idxKey);

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,11 @@ public CommandDescription generate(`
`48`	`48`	`continue; // no candidate keys of the right type, skip this column`
`49`	`49`	`}`
`50`	`50`	`EsqlQueryGenerator.Column key = randomFrom(candidateKeys);`
`51`		`- if (usedColumns.contains(key.name())) {`
	`51`	`+ if (usedColumns.contains(key.name()) \|\| usedColumns.contains(idxKey)) {`
`52`	`52`	`continue; // already used this column, skip`
`53`	`53`	`} else {`
`54`	`54`	`usedColumns.add(key.name());`
	`55`	`+ usedColumns.add(idxKey);`
`55`	`56`	`}`
`56`	`57`	`keyNames.add(key.name());`
`57`	`58`	`joinOn.add(idxKey);`