Skip to content
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.

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

[feature](Nereids) eliminate sort under subquery #26993

Merged
merged 2 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.apache.doris.nereids.rules.rewrite.EliminateNullAwareLeftAntiJoin;
import org.apache.doris.nereids.rules.rewrite.EliminateOrderByConstant;
import org.apache.doris.nereids.rules.rewrite.EliminateSort;
import org.apache.doris.nereids.rules.rewrite.EliminateSortUnderSubquery;
import org.apache.doris.nereids.rules.rewrite.EliminateUnnecessaryProject;
import org.apache.doris.nereids.rules.rewrite.EnsureProjectOnTopJoin;
import org.apache.doris.nereids.rules.rewrite.ExtractAndNormalizeWindowExpression;
Expand Down Expand Up @@ -124,6 +125,7 @@ public class Rewriter extends AbstractBatchJobExecutor {
topic("Plan Normalization",
topDown(
new EliminateOrderByConstant(),
new EliminateSortUnderSubquery(),
new EliminateGroupByConstant(),
// MergeProjects depends on this rule
new LogicalSubQueryAliasToLogicalProject(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package org.apache.doris.nereids.rules.rewrite;

import org.apache.doris.nereids.rules.Rule;
import org.apache.doris.nereids.rules.RuleType;

/**
* SELECT * FROM lineorder ORDER BY 'f' -> SELECT * FROM lineorder
*/
public class EliminateSortUnderSubquery extends OneRewriteRuleFactory {
@Override
public Rule build() {
return logicalSubQueryAlias(logicalSort())
.then(subq -> subq.withChildren(subq.child().child(0)))
.toRule(RuleType.ELIMINATE_ORDER_BY_CONSTANT);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* column prune ut.
*/
public class EliminateSortTest extends TestWithFeService implements MemoPatternMatchSupported {
class EliminateSortTest extends TestWithFeService implements MemoPatternMatchSupported {
keanji-x marked this conversation as resolved.
Show resolved Hide resolved
@Override
protected void runBeforeAll() throws Exception {
createDatabase("test");
Expand All @@ -37,7 +37,7 @@ protected void runBeforeAll() throws Exception {
}

@Test
public void test() {
void test() {
PlanChecker.from(connectContext)
.analyze("select * from student order by id")
.rewrite()
Expand All @@ -47,4 +47,27 @@ public void test() {
.rewrite()
.nonMatch(logicalSort());
}

@Test
void testSortLimit() {
PlanChecker.from(connectContext)
.analyze("select count(*) from (select * from student order by id) t limit 1")
.rewrite()
.nonMatch(logicalTopN());
PlanChecker.from(connectContext)
.analyze("select count(*) from (select * from student order by id limit 1) t")
.rewrite()
.matches(logicalTopN());

PlanChecker.from(connectContext)
.analyze("select count(*) from "
+ "(select * from student order by id limit 1) t1 left join student t2 on t1.id = t2.id")
.rewrite()
.matches(logicalTopN());
PlanChecker.from(connectContext)
.analyze("select count(*) from "
+ "(select * from student order by id) t1 left join student t2 on t1.id = t2.id limit 1")
.rewrite()
.nonMatch(logicalTopN());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ suite("test_group_concat") {
"""

sql """create view if not exists test_view as SELECT b1, group_concat(cast(abs(b3) as varchar) order by abs(b2) desc, b3 desc) FROM table_group_concat group by b1 order by b1;"""
qt_select_group_concat_order_by_desc4 """
order_qt_select_group_concat_order_by_desc4 """
select * from test_view;
"""
sql """drop view if exists test_view"""
Expand Down