patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -15,8 +15,11 @@
#include "sql/engine/aggregate/ob_scalar_aggregate_op.h"
#include "lib/number/ob_number_v2.h"
namespace oceanbase {
namespace sql {
namespace oceanbase
{
namespace sql
{
OB_SERIALIZE_MEMBER((ObScalarAggregateSpec, ObGroupBySpec));
@ -28,8 +31,9 @@ int ObScalarAggregateOp::inner_open()
} else if (OB_FAIL(ObChunkStoreUtil::alloc_dir_id(dir_id_))) {
LOG_WARN("failed to alloc dir id", K(ret));
} else if (FALSE_IT(aggr_processor_.set_dir_id(dir_id_))) {
} else if (FALSE_IT(aggr_processor_.set_io_event_observer(&io_event_observer_))) {
} else if (OB_FAIL(aggr_processor_.init_one_group())) {
LOG_WARN("failed to init one group", K(ret));
LOG_WARN("failed to init one group", K(ret));
} else {
started_ = false;
}
@ -48,26 +52,26 @@ void ObScalarAggregateOp::destroy()
ObGroupByOp::destroy();
}
int ObScalarAggregateOp::switch_iterator()
int ObScalarAggregateOp::inner_switch_iterator()
{
int ret = OB_SUCCESS;
if (OB_FAIL(ObGroupByOp::switch_iterator())) {
if (OB_FAIL(ObGroupByOp::inner_switch_iterator())) {
LOG_WARN("failed to switch_iterator", K(ret));
} else if (OB_FAIL(aggr_processor_.init_one_group())) {
LOG_WARN("failed to init one group", K(ret));
LOG_WARN("failed to init one group", K(ret));
} else {
started_ = false;
}
return ret;
}
int ObScalarAggregateOp::rescan()
int ObScalarAggregateOp::inner_rescan()
{
int ret = OB_SUCCESS;
if (OB_FAIL(ObGroupByOp::rescan())) {
if (OB_FAIL(ObGroupByOp::inner_rescan())) {
LOG_WARN("failed to rescan", K(ret));
} else if (OB_FAIL(aggr_processor_.init_one_group())) {
LOG_WARN("failed to init one group", K(ret));
LOG_WARN("failed to init one group", K(ret));
} else {
started_ = false;
}
@ -81,23 +85,20 @@ int ObScalarAggregateOp::inner_get_next_row()
ret = OB_ITER_END;
} else {
LOG_DEBUG("before inner_get_next_row",
"aggr_hold_size",
aggr_processor_.get_aggr_hold_size(),
"aggr_used_size",
aggr_processor_.get_aggr_used_size());
"aggr_hold_size", aggr_processor_.get_aggr_hold_size(),
"aggr_used_size", aggr_processor_.get_aggr_used_size());
started_ = true;
clear_evaluated_flag();
if (OB_FAIL(child_->get_next_row())) {
if (OB_ITER_END != ret) {
LOG_WARN("fail to get next row", K(ret));
//聚集的整个集合为空集,对外返回空集分组生成的行
} else if (OB_FAIL(aggr_processor_.collect_for_empty_set())) {
LOG_WARN("fail to prepare the aggr func", K(ret));
}
} else {
clear_evaluated_flag();
ObAggregateProcessor::GroupRow* group_row = NULL;
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));
} else if (OB_ISNULL(group_row)) {
@ -106,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));
@ -122,13 +127,70 @@ int ObScalarAggregateOp::inner_get_next_row()
}
}
LOG_DEBUG("after inner_get_next_row",
"hold_mem_size",
aggr_processor_.get_aggr_hold_size(),
"used_mem_size",
aggr_processor_.get_aggr_used_size());
"hold_mem_size", aggr_processor_.get_aggr_hold_size(),
"used_mem_size", aggr_processor_.get_aggr_used_size());
}
return ret;
}
} // end namespace sql
} // end namespace oceanbase
int ObScalarAggregateOp::inner_get_next_batch(const int64_t max_row_cnt)
{
int ret = OB_SUCCESS;
int64_t batch_cnt = min(max_row_cnt, MY_SPEC.max_batch_size_);
ObAggregateProcessor::GroupRow *group_row = nullptr;
const ObBatchRows * child_brs = nullptr;
LOG_DEBUG("before inner_get_next_batch",
"aggr_hold_size", aggr_processor_.get_aggr_hold_size(),
"aggr_used_size", aggr_processor_.get_aggr_used_size(), K(batch_cnt));
if (OB_FAIL(aggr_processor_.get_group_row(0, group_row))) {
LOG_WARN("failed to get_group_row", K(ret));
} else if (OB_ISNULL(group_row)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("group_row is null", K(ret));
} else if (OB_FAIL(aggr_processor_.prepare_in_batch_mode(group_row))) {
LOG_WARN("fail to prepare the aggr func", K(ret));
} else {
ObEvalCtx::BatchInfoScopeGuard guard(eval_ctx_);
while (OB_SUCC(ret)
&& OB_SUCC(child_->get_next_batch(batch_cnt, child_brs))) {
clear_evaluated_flag();
if (!started_ && child_brs->end_ && child_brs->size_ == 0) {
// no result from 1st iteration, just return empty
guard.set_batch_size(1);
guard.set_batch_idx(0);
if (OB_FAIL(aggr_processor_.collect_for_empty_set())) {
LOG_WARN("fail to prepare the aggr func", K(ret));
}
break;
} else if (OB_FAIL(try_check_status())) {
LOG_WARN("check status failed", K(ret));
} else if (OB_FAIL(aggr_processor_.eval_aggr_param_batch(*child_brs))) {
LOG_WARN("fail to eval aggr param batch", K(ret), K(*child_brs));
} else if (OB_FAIL(aggr_processor_.process_batch(*group_row, *child_brs, 0, child_brs->size_))) {
LOG_WARN("fail to process the aggr func", K(ret));
}
started_ = true;
if (child_brs->end_) {
break;
}
}
if (OB_SUCC(ret) && child_brs->end_ && started_) {
guard.set_batch_size(1);
guard.set_batch_idx(0);
if (OB_FAIL(aggr_processor_.collect_scalar_batch(*child_brs, 0, nullptr, batch_cnt))) {
LOG_WARN("fail to collect result", K(ret));
}
}
brs_.size_ = 1; // make sure return one line for scalar groupby
brs_.end_ = true;
}
LOG_DEBUG("after inner_get_next_batch",
"hold_mem_size", aggr_processor_.get_aggr_hold_size(),
"used_mem_size", aggr_processor_.get_aggr_used_size(), K(batch_cnt));
return ret;
}
} // end namespace sql
} // end namespace oceanbase