database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge code to github (#187)

Browse Source 
* merge to 95787f8be1fd0ff215708fb0f49997b632876586
* Bugs fixed
This commit is contained in:
morningman
2018-03-23 14:04:55 +08:00
committed by GitHub
parent b8fa22ddd3
commit 5de798fdd6
133 changed files with 1717 additions and 5592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
be/src/exec/aggregation_node.cpp
View File

@ -1,23 +1,23 @@
// Modifications copyright (C) 2017, Baidu.com, Inc.
// Copyright 2017 The Apache Software Foundation
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
// Modifications copyright (C) 2017, Baidu.com, Inc.
// Copyright 2017 The Apache Software Foundation
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
#include "exec/aggregation_node.h"
#include <math.h>
@ -299,10 +299,10 @@ Status AggregationNode::get_next(RuntimeState* state, RowBatch* row_batch, bool*
++_num_rows_returned;
if (reached_limit()) {
// avoid calling finalize() duplicately with last tuple
// when _output_iterator don't reach end.
// chenhao added
_output_iterator.next<false>();
// avoid calling finalize() duplicately with last tuple
// when _output_iterator don't reach end.
// chenhao added
_output_iterator.next<false>();
break;
}
}