You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/14 06:02:46 UTC
[doris] branch dev-1.1.1 updated: fix compatibility issue of using upgraded be with old fe (#10833)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
new 8b1818d839 fix compatibility issue of using upgraded be with old fe (#10833)
8b1818d839 is described below
commit 8b1818d839ae1844cd7f31935af9bfd0991e228b
Author: starocean999 <40...@users.noreply.github.com>
AuthorDate: Thu Jul 14 14:02:40 2022 +0800
fix compatibility issue of using upgraded be with old fe (#10833)
---
be/src/vec/exec/vaggregation_node.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/be/src/vec/exec/vaggregation_node.cpp b/be/src/vec/exec/vaggregation_node.cpp
index 2b09884575..172a194c47 100644
--- a/be/src/vec/exec/vaggregation_node.cpp
+++ b/be/src/vec/exec/vaggregation_node.cpp
@@ -77,10 +77,6 @@ static constexpr int STREAMING_HT_MIN_REDUCTION_SIZE =
AggregationNode::AggregationNode(ObjectPool* pool, const TPlanNode& tnode,
const DescriptorTbl& descs)
: ExecNode(pool, tnode, descs),
- _aggregate_evaluators_changed_flags(
- tnode.agg_node.__isset.aggregate_function_changed_flags
- ? tnode.agg_node.aggregate_function_changed_flags
- : std::vector<bool> {}),
_intermediate_tuple_id(tnode.agg_node.intermediate_tuple_id),
_intermediate_tuple_desc(NULL),
_output_tuple_id(tnode.agg_node.output_tuple_id),
@@ -101,6 +97,13 @@ AggregationNode::AggregationNode(ObjectPool* pool, const TPlanNode& tnode,
} else {
_is_streaming_preagg = false;
}
+
+ if (tnode.agg_node.__isset.aggregate_function_changed_flags) {
+ _aggregate_evaluators_changed_flags = tnode.agg_node.aggregate_function_changed_flags;
+ } else {
+ _aggregate_evaluators_changed_flags.resize(tnode.agg_node.aggregate_functions.size(),
+ false);
+ }
}
AggregationNode::~AggregationNode() = default;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org