diff --git a/dbms/src/Operators/LocalAggregateRestorer.cpp b/dbms/src/Operators/LocalAggregateRestorer.cpp index b3ba02d2698..12527c97e29 100644 --- a/dbms/src/Operators/LocalAggregateRestorer.cpp +++ b/dbms/src/Operators/LocalAggregateRestorer.cpp @@ -31,21 +31,6 @@ LocalAggregateRestorer::LocalAggregateRestorer( assert(!bucket_inputs.empty()); } -bool LocalAggregateRestorer::loadFromInputs() -{ - assert(!bucket_inputs.empty()); - for (auto & bucket_input : bucket_inputs) - { - if unlikely (is_cancelled()) - return false; - if (bucket_input.needLoad()) - bucket_input.load(); - } - if unlikely (is_cancelled()) - return false; - return true; -} - void LocalAggregateRestorer::storeToBucketData() { assert(!finished); @@ -80,9 +65,19 @@ void LocalAggregateRestorer::loadBucketData() if unlikely (finished || is_cancelled()) return; + // load bucket data from inputs. assert(bucket_data.empty()); - if (loadFromInputs()) - storeToBucketData(); + for (auto & bucket_input : bucket_inputs) + { + if unlikely (is_cancelled()) + return; + if (bucket_input.needLoad()) + bucket_input.load(); + } + if unlikely (is_cancelled()) + return; + + storeToBucketData(); } bool LocalAggregateRestorer::tryPop(Block & block) diff --git a/dbms/src/Operators/LocalAggregateRestorer.h b/dbms/src/Operators/LocalAggregateRestorer.h index 24aa569a173..df71bcc595a 100644 --- a/dbms/src/Operators/LocalAggregateRestorer.h +++ b/dbms/src/Operators/LocalAggregateRestorer.h @@ -56,8 +56,6 @@ class LocalAggregateRestorer bool tryPop(Block & block); private: - bool loadFromInputs(); - void storeToBucketData(); private: