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/20 08:18:18 UTC

[doris] branch dev-1.1.1 updated: [enhancement] partitioned agg node return error when increase reserva… (#11012)

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 4993ccfb95 [enhancement] partitioned agg node return error when increase reserva… (#11012)
4993ccfb95 is described below

commit 4993ccfb95b60534007b1f797c6cdea5577f952e
Author: yixiutt <10...@users.noreply.github.com>
AuthorDate: Wed Jul 20 16:18:10 2022 +0800

    [enhancement] partitioned agg node return error when increase reserva… (#11012)
    
    * [enhancement] partitioned agg node return error when increase reservation failed
    Co-authored-by: yixiutt <yi...@selectdb.com>
    Co-authored-by: Yongqiang YANG <98...@users.noreply.github.com>
---
 be/src/exec/partitioned_aggregation_node.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/be/src/exec/partitioned_aggregation_node.cc b/be/src/exec/partitioned_aggregation_node.cc
index a30c2f5a47..614f03ab47 100644
--- a/be/src/exec/partitioned_aggregation_node.cc
+++ b/be/src/exec/partitioned_aggregation_node.cc
@@ -745,9 +745,12 @@ Status PartitionedAggregationNode::Partition::InitStreams() {
     RETURN_IF_ERROR(aggregated_row_stream->Init(parent->id(), true));
     bool got_buffer;
     RETURN_IF_ERROR(aggregated_row_stream->PrepareForWrite(&got_buffer));
-    DCHECK(got_buffer) << "Buffer included in reservation " << parent->_id << "\n"
-                       << parent->_buffer_pool_client.DebugString() << "\n"
-                       << parent->DebugString(2);
+    if (!got_buffer) {
+        LOG(WARNING) << "Buffer included in reservation " << parent->_id << "\n"
+                     << parent->_buffer_pool_client.DebugString() << "\n"
+                     << parent->DebugString(2);
+        return Status::BufferAllocFailed("PartitionedAggregationNode buffer prepare failed");
+    }
 
     if (!parent->is_streaming_preagg_) {
         unaggregated_row_stream.reset(new BufferedTupleStream3(


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org