This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 63ea57d7b22 branch-4.0: [fix](query cache) AggregateNode compute
digest of query cache should consider sortByGroupKey #60431 (#60457)
63ea57d7b22 is described below
commit 63ea57d7b227a4cc84dbf15b55dc4fc72d3add22
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Feb 3 14:28:48 2026 +0800
branch-4.0: [fix](query cache) AggregateNode compute digest of query cache
should consider sortByGroupKey #60431 (#60457)
Cherry-picked from #60431
Co-authored-by: 924060929 <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java | 3 +++
gensrc/thrift/Normalization.thrift | 1 +
2 files changed, 4 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
index 30730bf39fe..de190387d59 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/AggregationNode.java
@@ -177,6 +177,9 @@ public class AggregationNode extends PlanNode {
normalizedPlan.setNodeType(TPlanNodeType.AGGREGATION_NODE);
normalizedPlan.setAggregationNode(normalizedAggregateNode);
+ if (sortByGroupKey != null) {
+ normalizedAggregateNode.setSortInfo(sortByGroupKey.toThrift());
+ }
}
@Override
diff --git a/gensrc/thrift/Normalization.thrift
b/gensrc/thrift/Normalization.thrift
index 1eedfef6fbe..71899a4088f 100644
--- a/gensrc/thrift/Normalization.thrift
+++ b/gensrc/thrift/Normalization.thrift
@@ -44,6 +44,7 @@ struct TNormalizedAggregateNode {
6: optional bool use_streaming_preaggregation
7: optional list<Exprs.TExpr> projectToAggIntermediateTuple
8: optional list<Exprs.TExpr> projectToAggOutputTuple
+ 9: optional PlanNodes.TSortInfo sortInfo
}
struct TNormalizedPlanNode {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
