This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 6b0fcce9364 branch-3.1: [fix](nereids)use bigint instead of int
literal to compare with count() agg function #55545 (#55590)
6b0fcce9364 is described below
commit 6b0fcce9364d2ed4af76e37b7317042af17a3a79
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Sep 4 17:18:37 2025 +0800
branch-3.1: [fix](nereids)use bigint instead of int literal to compare with
count() agg function #55545 (#55590)
Cherry-picked from #55545
Co-authored-by: starocean999 <[email protected]>
---
.../java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java | 4 ++--
.../org/apache/doris/nereids/rules/rewrite/ExistsApplyToJoin.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
index 4165a9d0516..c0a62e0c991 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SubqueryToApply.java
@@ -46,8 +46,8 @@ import
org.apache.doris.nereids.trees.expressions.functions.agg.Count;
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;
@@ -499,7 +499,7 @@ public class SubqueryToApply implements AnalysisRuleFactory
{
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 {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/ExistsApplyToJoin.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/ExistsApplyToJoin.java
index 68383324856..3d3527c76dc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/ExistsApplyToJoin.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/ExistsApplyToJoin.java
@@ -24,7 +24,7 @@ import org.apache.doris.nereids.trees.expressions.Alias;
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;
@@ -127,7 +127,7 @@ public class ExistsApplyToJoin extends
OneRewriteRuleFactory {
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
