Skip to content

branch-3.1: [fix](nereids)use bigint instead of int literal to compare with count() agg function #55545 #55590

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
morrySnow merged 1 commit into from
Sep 4, 2025
Merged

branch-3.1: [fix](nereids)use bigint instead of int literal to compare with count() agg function #55545 #55590

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
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
import org.apache.doris.nereids.trees.expressions.functions.agg.NotNullableAggregateFunction;
import org.apache.doris.nereids.trees.expressions.functions.scalar.AssertTrue;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Nvl;
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral;
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
import org.apache.doris.nereids.trees.expressions.visitor.DefaultExpressionRewriter;
import org.apache.doris.nereids.trees.plans.Plan;
Expand Down Expand Up @@ -499,7 +499,7 @@ private Pair<LogicalPlan, Optional<Expression>> addApply(SubqueryExpr subquery,
upperProjects.addAll(projects.build());
projects.add(new Alias(new AssertTrue(
ExpressionUtils.or(new IsNull(countSlot),
new LessThanEqual(countSlot, new IntegerLiteral(1))),
new LessThanEqual(countSlot, new BigIntLiteral(1))),
new VarcharLiteral("correlate scalar subquery must return only 1 row"))));
logicalProject = new LogicalProject(projects.build(), newApply);
} else {
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/ExistsApplyToJoin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.apache.doris.nereids.trees.expressions.EqualTo;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.agg.Count;
import org.apache.doris.nereids.trees.expressions.literal.IntegerLiteral;
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.plans.DistributeType;
import org.apache.doris.nereids.trees.plans.JoinType;
import org.apache.doris.nereids.trees.plans.LimitPhase;
Expand Down Expand Up @@ -127,7 +127,7 @@ private Plan unCorrelatedNotExist(LogicalApply<?, ?> unapply) {
unapply.getMarkJoinSlotReference(),
(LogicalPlan) unapply.left(), newAgg, null);
return new LogicalFilter<>(ImmutableSet.of(new EqualTo(newAgg.getOutput().get(0),
new IntegerLiteral(0))), newJoin);
new BigIntLiteral(0))), newJoin);
}

private Plan unCorrelatedExist(LogicalApply<?, ?> unapply) {
Expand Down