Skip to content

[fix](nereids) topN filter: use ObjectId as map key instead of Topn node #46551

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
englefly merged 1 commit into from
Jan 8, 2025
Merged

[fix](nereids) topN filter: use ObjectId as map key instead of Topn node #46551

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
15 changes: 8 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/TopnFilterContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.doris.nereids.glue.translator.ExpressionTranslator;
import org.apache.doris.nereids.glue.translator.PlanTranslatorContext;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.plans.ObjectId;
import org.apache.doris.nereids.trees.plans.algebra.TopN;
import org.apache.doris.nereids.trees.plans.physical.PhysicalRelation;
import org.apache.doris.nereids.trees.plans.physical.TopnFilter;
Expand All @@ -38,22 +39,22 @@
* topN runtime filter context
*/
public class TopnFilterContext {
private final Map<TopN, TopnFilter> filters = Maps.newHashMap();
private final Map<ObjectId, TopnFilter> filters = Maps.newHashMap();

/**
* add topN filter
*/
public void addTopnFilter(TopN topn, PhysicalRelation scan, Expression expr) {
TopnFilter filter = filters.get(topn);
TopnFilter filter = filters.get(topn.getObjectId());
if (filter == null) {
filters.put(topn, new TopnFilter(topn, scan, expr));
filters.put(topn.getObjectId(), new TopnFilter(topn, scan, expr));
} else {
filter.addTarget(scan, expr);
}
}

public boolean isTopnFilterSource(TopN topn) {
return filters.containsKey(topn);
return filters.containsKey(topn.getObjectId());
}

public List<TopnFilter> getTopnFilters() {
Expand All @@ -77,7 +78,7 @@ public void translateTarget(PhysicalRelation relation, ScanNode legacyScan,
* translate topn-filter
*/
public void translateSource(TopN topn, SortNode sortNode) {
TopnFilter filter = filters.get(topn);
TopnFilter filter = filters.get(topn.getObjectId());
if (filter == null) {
return;
}
Expand All @@ -97,8 +98,8 @@ public String toString() {
String indent = " ";
String arrow = " -> ";
builder.append("filters:\n");
for (TopN topn : filters.keySet()) {
builder.append(indent).append(arrow).append(filters.get(topn)).append("\n");
for (ObjectId topnId : filters.keySet()) {
builder.append(indent).append(arrow).append(filters.get(topnId)).append("\n");
}
return builder.toString();
}
Expand Down
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/TopN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.doris.nereids.trees.plans.algebra;

import org.apache.doris.nereids.trees.plans.ObjectId;

/**
* Common interface for logical/physical TopN.
*/
Expand All @@ -25,4 +27,6 @@ public interface TopN extends Sort {
long getOffset();

long getLimit();

ObjectId getObjectId();
}
6 changes: 6 additions & 0 deletions ...c/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalDeferMaterializeTopN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.expressions.SlotReference;
import org.apache.doris.nereids.trees.plans.ObjectId;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.algebra.TopN;
Expand Down Expand Up @@ -198,4 +199,9 @@ public void computeFd(DataTrait.Builder builder) {
public void computeEqualSet(DataTrait.Builder builder) {
builder.addEqualSet(child().getLogicalProperties().getTrait());
}

@Override
public ObjectId getObjectId() {
return id;
}
}
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/logical/LogicalTopN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.doris.nereids.properties.OrderKey;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.plans.ObjectId;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.algebra.TopN;
Expand Down Expand Up @@ -186,4 +187,9 @@ public void computeEqualSet(DataTrait.Builder builder) {
public void computeFd(DataTrait.Builder builder) {
builder.addFuncDepsDG(child().getLogicalProperties().getTrait());
}

@Override
public ObjectId getObjectId() {
return id;
}
}
6 changes: 6 additions & 0 deletions ...main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalDeferMaterializeTopN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.doris.nereids.trees.expressions.ExprId;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.expressions.SlotReference;
import org.apache.doris.nereids.trees.plans.ObjectId;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.algebra.TopN;
import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor;
Expand Down Expand Up @@ -175,4 +176,9 @@ public String toString() {
"columnIdSlot", columnIdSlot
);
}

@Override
public ObjectId getObjectId() {
return id;
}
}
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalTopN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.doris.nereids.properties.OrderKey;
import org.apache.doris.nereids.properties.PhysicalProperties;
import org.apache.doris.nereids.trees.expressions.Slot;
import org.apache.doris.nereids.trees.plans.ObjectId;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.nereids.trees.plans.PlanType;
import org.apache.doris.nereids.trees.plans.SortPhase;
Expand Down Expand Up @@ -162,4 +163,8 @@ public PhysicalTopN<Plan> resetLogicalProperties() {
null, physicalProperties, statistics, child());
}

@Override
public ObjectId getObjectId() {
return id;
}
}
Loading