Skip to content

Remove eliminating sort optimization #19387

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
martint merged 1 commit into from
Oct 19, 2023
Merged

Remove eliminating sort optimization #19387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions core/trino-main/src/main/java/io/trino/sql/planner/optimizations/AddExchanges.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,18 +608,6 @@ public PlanWithProperties visitSort(SortNode node, PreferredProperties preferred
{
PlanWithProperties child = planChild(node, PreferredProperties.undistributed());

if (child.getProperties().isSingleNode()) {
// current plan so far is single node, so local properties are effectively global properties
// skip the SortNode if the local properties guarantee ordering on Sort keys
// TODO: This should be extracted as a separate optimizer once the planner is able to reason about the ordering of each operator
List<LocalProperty<Symbol>> desiredProperties = node.getOrderingScheme().toLocalProperties();

if (LocalProperties.match(child.getProperties().getLocalProperties(), desiredProperties).stream()
.noneMatch(Optional::isPresent)) {
return child;
}
}

if (isDistributedSortEnabled(session)) {
child = planChild(node, PreferredProperties.any());
// insert round robin exchange to eliminate skewness issues
Expand Down
16 changes: 0 additions & 16 deletions core/trino-main/src/test/java/io/trino/sql/planner/optimizations/TestEliminateSorts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import static io.trino.sql.planner.TypeAnalyzer.createTestingTypeAnalyzer;
import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
import static io.trino.sql.planner.assertions.PlanMatchPattern.functionCall;
import static io.trino.sql.planner.assertions.PlanMatchPattern.output;
import static io.trino.sql.planner.assertions.PlanMatchPattern.sort;
import static io.trino.sql.planner.assertions.PlanMatchPattern.specification;
import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
Expand All @@ -56,21 +55,6 @@ public class TestEliminateSorts
"lineitem",
ImmutableMap.of(QUANTITY_ALIAS, "quantity"));

@Test
public void testEliminateSorts()
{
@Language("SQL") String sql = "SELECT quantity, row_number() OVER (ORDER BY quantity) FROM lineitem ORDER BY quantity";

PlanMatchPattern pattern =
output(
window(windowMatcherBuilder -> windowMatcherBuilder
.specification(windowSpec)
.addFunction(functionCall("row_number", Optional.empty(), ImmutableList.of())),
anyTree(LINEITEM_TABLESCAN_Q)));

assertUnitPlan(sql, pattern);
}

@Test
public void testNotEliminateSorts()
{
Expand Down