hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

replace ts related to ddl with scn.

Browse Source
This commit is contained in:
obdev
2022-11-28 02:21:13 +00:00
committed by ob-robot
parent bbec6aff49
commit 8a4d14122f
539 changed files with 17685 additions and 173434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/engine/aggregate/ob_scalar_aggregate_op.cpp
View File

@ -98,8 +98,6 @@ int ObScalarAggregateOp::inner_get_next_row()
LOG_WARN("fail to prepare the aggr func", K(ret));
}
} else {
clear_evaluated_flag();
ObAggregateProcessor::GroupRow *group_row = NULL;
if (OB_FAIL(aggr_processor_.get_group_row(0, group_row))) {
LOG_WARN("failed to get_group_row", K(ret));
@ -109,9 +107,13 @@ int ObScalarAggregateOp::inner_get_next_row()
} else if (OB_FAIL(aggr_processor_.prepare(*group_row))) {
LOG_WARN("fail to prepare the aggr func", K(ret));
} else {
while (OB_SUCC(ret) && OB_SUCC(child_->get_next_row())) {
while (OB_SUCC(ret)) {
clear_evaluated_flag();
if (OB_FAIL(try_check_status())) {
if (OB_FAIL((child_->get_next_row()))) {
if (OB_ITER_END != ret) {
LOG_WARN("fail to get row from child", K(ret));
}
} else if (OB_FAIL(try_check_status())) {
LOG_WARN("check status failed", K(ret));
} else if (OB_FAIL(aggr_processor_.process(*group_row))) {
LOG_WARN("fail to process the aggr func", K(ret));