Changes due to rebasing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/be43958f Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/be43958f Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/be43958f Branch: refs/heads/partitioned-aggregation Commit: be43958fc411238850f0af9d4737425968702716 Parents: 0957e7a Author: Harshad Deshmukh <hbdeshm...@apache.org> Authored: Tue Sep 6 15:14:16 2016 -0500 Committer: Harshad Deshmukh <hbdeshm...@apache.org> Committed: Fri Sep 16 13:28:00 2016 -0500 ---------------------------------------------------------------------- storage/AggregationOperationState.hpp | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/be43958f/storage/AggregationOperationState.hpp ---------------------------------------------------------------------- diff --git a/storage/AggregationOperationState.hpp b/storage/AggregationOperationState.hpp index 7a11e92..a3fe635 100644 --- a/storage/AggregationOperationState.hpp +++ b/storage/AggregationOperationState.hpp @@ -268,6 +268,9 @@ class AggregationOperationState { StorageManager *storage_manager_; + void mergeGroupByHashTables(AggregationStateHashTableBase *src, + AggregationStateHashTableBase *dst); + DISALLOW_COPY_AND_ASSIGN(AggregationOperationState); };
