Skip to content

branch-2.1: [fix](planner) fix core when select and filter by slot in old planner #46541 #46638

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

branch-2.1: [fix](planner) fix core when select and filter by slot in old planner #46541 #46638

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
20 changes: 20 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.doris.analysis.TupleId;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Type;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.NotImplementedException;
import org.apache.doris.common.TreeNode;
Expand All @@ -51,6 +52,8 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -77,6 +80,7 @@
* its children (= are bound by tupleIds).
*/
public abstract class PlanNode extends TreeNode<PlanNode> implements PlanStats {
private static final Logger LOG = LogManager.getLogger(PlanNode.class);

protected String planNodeName;

Expand Down Expand Up @@ -195,6 +199,7 @@ protected PlanNode(PlanNodeId id, PlanNode node, String planNodeName, Statistica
this.tblRefIds = Lists.newArrayList(node.tblRefIds);
this.nullableTupleIds = Sets.newHashSet(node.nullableTupleIds);
this.conjuncts = Expr.cloneList(node.conjuncts, null);

this.cardinality = -1;
this.compactData = node.compactData;
this.planNodeName = "V" + planNodeName;
Expand Down Expand Up @@ -792,6 +797,21 @@ public void init() throws UserException {}
public void init(Analyzer analyzer) throws UserException {
assignConjuncts(analyzer);
createDefaultSmap(analyzer);
castConjuncts();
}

private void castConjuncts() throws AnalysisException {
for (int i = 0; i < conjuncts.size(); ++i) {
Expr expr = conjuncts.get(i);
if (!expr.getType().isBoolean()) {
try {
conjuncts.set(i, expr.castTo(Type.BOOLEAN));
} catch (AnalysisException e) {
LOG.warn("{} is not boolean and can not be cast to boolean", expr.toSql(), e);
throw new AnalysisException("conjuncts " + expr.toSql() + " is not boolean");
}
}
}
}

/**
Expand Down