[impala] 03/03: IMPALA-7240: Fix missing QueryMaintenance call in AddBatchStreaming

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

arodoni pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 52e5e1813a2801d9db0c2f1edc2c23802106397c
Author: Thomas Tauber-Marshall <tm...@cloudera.com>
AuthorDate: Wed Jul 4 00:00:17 2018 +0000

    IMPALA-7240: Fix missing QueryMaintenance call in AddBatchStreaming
    
    A recent change, IMPALA-110 (part 2), refactored the aggregation code.
    During this refactor, a call to QueryMaintenance() was inadvertantely
    dropped in the AddBatchStreaming() path, causing
    test_spilling_regression_exhaustive to fail by hitting the memory
    limit.
    
    Testing:
    - Ran test_spilling_regression_exhaustive
    
    Change-Id: I150a46d00acad139d186a150d9706ef47a10ac36
    Reviewed-on: http://gerrit.cloudera.org:8080/10863
    Reviewed-by: Michael Ho <kw...@cloudera.com>
    Reviewed-by: Tim Armstrong <ta...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 be/src/exec/grouping-aggregator.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/be/src/exec/grouping-aggregator.cc b/be/src/exec/grouping-aggregator.cc
index 60001a6..0eb4a3f 100644
--- a/be/src/exec/grouping-aggregator.cc
+++ b/be/src/exec/grouping-aggregator.cc
@@ -420,6 +420,7 @@ Status GroupingAggregator::AddBatch(RuntimeState* state, RowBatch* batch) {
 Status GroupingAggregator::AddBatchStreaming(
     RuntimeState* state, RowBatch* out_batch, RowBatch* child_batch) {
   SCOPED_TIMER(streaming_timer_);
+  RETURN_IF_ERROR(QueryMaintenance(state));
   num_input_rows_ += child_batch->num_rows();
 
   int remaining_capacity[PARTITION_FANOUT];