Skip to content

Make inline sort alias name a prefix match in testPushTopNInlineDistanceToSource #114984

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
merged 2 commits into from
Oct 17, 2024
Merged

Make inline sort alias name a prefix match in testPushTopNInlineDistanceToSource #114984

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe7705
Make inline sort alias name a prefix match
craigtaverner Oct 17, 2024
2714c50
Added comments on prefix check for variable name
craigtaverner Oct 17, 2024
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
18 changes: 15 additions & 3 deletions ...esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4769,12 +4769,24 @@ public void testPushTopNInlineDistanceToSource() {
var exchange = asRemoteExchange(topN.child());

project = as(exchange.child(), ProjectExec.class);
assertThat(names(project.projections()), contains("abbrev", "name", "location", "country", "city", "$$order_by$0$0"));
// Depending on what is run before this test, the synthetic name could have variable suffixes, so we must only assert on the prefix
assertThat(
names(project.projections()),
contains(
equalTo("abbrev"),
equalTo("name"),
equalTo("location"),
equalTo("country"),
equalTo("city"),
startsWith("$$order_by$0$")
)
);
var extract = as(project.child(), FieldExtractExec.class);
assertThat(names(extract.attributesToExtract()), contains("abbrev", "name", "country", "city"));
var evalExec = as(extract.child(), EvalExec.class);
var alias = as(evalExec.fields().get(0), Alias.class);
assertThat(alias.name(), is("$$order_by$0$0"));
assertThat(alias.name(), startsWith("$$order_by$0$"));
var aliasName = alias.name(); // We need this name to know what to assert on later when comparing the Order to the Sort
var stDistance = as(alias.child(), StDistance.class);
assertThat(stDistance.left().toString(), startsWith("location"));
extract = as(evalExec.child(), FieldExtractExec.class);
Expand All @@ -4784,7 +4796,7 @@ public void testPushTopNInlineDistanceToSource() {
// Assert that the TopN(distance) is pushed down as geo-sort(location)
assertThat(source.limit(), is(topN.limit()));
Set<String> orderSet = orderAsSet(topN.order());
Set<String> sortsSet = sortsAsSet(source.sorts(), Map.of("location", "$$order_by$0$0"));
Set<String> sortsSet = sortsAsSet(source.sorts(), Map.of("location", aliasName));
assertThat(orderSet, is(sortsSet));

// Fine-grained checks on the pushed down sort
Expand Down