Skip to content

ESQL: Fix release build only failures #144122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julian-elastic merged 5 commits into from
Mar 13, 2026
Merged

ESQL: Fix release build only failures #144122

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c116aa
Fix release build failures
julian-elastic Mar 12, 2026
3c02186
Address code review comments
julian-elastic Mar 12, 2026
3ef1821
Merge remote-tracking branch 'upstream/main' into streamingLookupRele…
julian-elastic Mar 13, 2026
c9a6d3c
Merge remote-tracking branch 'upstream/main' into streamingLookupRele…
julian-elastic Mar 13, 2026
4b764cf
Merge remote-tracking branch 'upstream/main' into streamingLookupRele…
julian-elastic Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 28 additions & 40 deletions ...javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushExpressionToLoadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,21 +442,14 @@ public void testLengthPushedWithTopN() throws IOException {
matchesList().item(matchesMap().entry("name", "test").entry("type", any(String.class))),
Map.of(
"data",
Build.current().isSnapshot()
? List.of(matchesMap().entry("ordering:column_at_a_time:IntsFromDocValues.Singleton", 1))
: List.of(
matchesMap().entry("ordering:column_at_a_time:IntsFromDocValues.Singleton", 1)
.entry("test:column_at_a_time:BytesRefsFromOrds.Singleton", 1)
),
List.of(matchesMap().entry("ordering:column_at_a_time:IntsFromDocValues.Singleton", 1)),
"node_reduce",
Build.current().isSnapshot()
? List.of(
// Pushed down function
matchesMap().entry("test:column_at_a_time:Utf8CodePointsFromOrds.Singleton", 1),
// Field
matchesMap().entry("test:column_at_a_time:BytesRefsFromOrds.Singleton", 1)
)
: List.of(matchesMap().entry("test:row_stride:BytesRefsFromOrds.Singleton", 1))
List.of(
// Pushed down function
matchesMap().entry("test:column_at_a_time:Utf8CodePointsFromOrds.Singleton", 1),
// Field
matchesMap().entry("test:column_at_a_time:BytesRefsFromOrds.Singleton", 1)
)
),
sig -> assertMap(
sig,
Expand Down Expand Up @@ -514,25 +507,20 @@ public void testLengthPushedWithTopNAsOrder() throws IOException {
*/
public void testLengthNotPushedToLookupJoinKeyword() throws IOException {
initLookupIndex();
test(
b -> b.startObject("main_matching").field("type", "keyword").endObject(),
b -> b.field("main_matching", "lookup"),
"""
| LOOKUP JOIN lookup ON matching == main_matching
| EVAL test = LENGTH(test)
""",
matchesList().item(1),
matchesMap().entry("main_matching:column_at_a_time:BytesRefsFromOrds.Singleton", 1),
sig -> assertMap(
test(b -> b.startObject("main_matching").field("type", "keyword").endObject(), b -> b.field("main_matching", "lookup"), """
| LOOKUP JOIN lookup ON matching == main_matching
| EVAL test = LENGTH(test)
""", matchesList().item(1), matchesMap().entry("main_matching:column_at_a_time:BytesRefsFromOrds.Singleton", 1), sig -> {
assertMap(
sig,
matchesList().item("LuceneSourceOperator")
.item("ValuesSourceReaderOperator") // the real work is here, checkOperatorProfile checks the status
.item("StreamingLookupOperator")
.item(lookupOperatorName())
.item("EvalOperator") // this one just renames the field
.item("AggregationOperator")
.item("ExchangeSinkOperator")
)
);
);
});
}

/**
Expand All @@ -546,25 +534,21 @@ public void testLengthNotPushedToLookupJoinKeywordSameName() throws IOException
test(b -> {
b.startObject("test").field("type", "keyword").endObject();
b.startObject("main_matching").field("type", "keyword").endObject();
},
b -> b.field("test", value).field("main_matching", "lookup"),
"""
| DROP test
| LOOKUP JOIN lookup ON matching == main_matching
| EVAL test = LENGTH(test)
""",
matchesList().item(1),
matchesMap().entry("main_matching:column_at_a_time:BytesRefsFromOrds.Singleton", 1),
sig -> assertMap(
}, b -> b.field("test", value).field("main_matching", "lookup"), """
| DROP test
| LOOKUP JOIN lookup ON matching == main_matching
| EVAL test = LENGTH(test)
""", matchesList().item(1), matchesMap().entry("main_matching:column_at_a_time:BytesRefsFromOrds.Singleton", 1), sig -> {
assertMap(
sig,
matchesList().item("LuceneSourceOperator")
.item("ValuesSourceReaderOperator") // the real work is here, checkOperatorProfile checks the status
.item("StreamingLookupOperator")
.item(lookupOperatorName())
.item("EvalOperator") // this one just renames the field
.item("AggregationOperator")
.item("ExchangeSinkOperator")
)
);
);
});
}

/**
Expand Down Expand Up @@ -948,6 +932,10 @@ private void initLookupIndex() throws IOException {
assertThat(entityToMap(bulkResponse.getEntity(), XContentType.JSON), matchesMap().entry("errors", false).extraOk());
}

private static String lookupOperatorName() {
return Build.current().isSnapshot() ? "StreamingLookupOperator" : "LookupOperator";
}

private CheckedConsumer<XContentBuilder, IOException> justType(String type) {
return justType("test", type);
}
Expand Down
Loading