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

Do not restrict datum buffer size in aggregate pushdown

Browse Source
This commit is contained in:
XIAO-HOU 2024-11-20 04:45:02 +00:00 committed by ob-robot
parent 302b2152ac
commit 2211d1b2b1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/access/ob_aggregate_base.cpp
View File

@ -275,7 +275,7 @@ int ObPushdownAggContext::prepare_aggregate_rows(const int64_t count)
int ret = OB_SUCCESS;
int64_t row_size = 0;
void *buf = nullptr;
if (count > USE_GROUP_BY_MAX_DISTINCT_CNT) {
if (OB_UNLIKELY(count > USE_GROUP_BY_MAX_DISTINCT_CNT)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("Unexpected agg row count", K(ret), K(count));
} else if (count > agg_row_num_) {
@ -412,12 +412,12 @@ int ObAggDatumBuf::new_agg_datum_buf(
{
int ret = OB_SUCCESS;
int64_t new_size = size;
if (size > USE_GROUP_BY_MAX_DISTINCT_CNT) {
if (OB_UNLIKELY(size <= 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("Invalid size", K(size));
LOG_WARN("Invalid size", K(ret), K(size));
} else if (nullptr != datum_buf) {
if (size > datum_buf->get_capacity()) {
new_size = MIN(MAX(size, 2 * datum_buf->get_capacity()), USE_GROUP_BY_MAX_DISTINCT_CNT);
new_size = MAX(size, 2 * datum_buf->get_capacity());
allocator.reuse();
datum_buf = nullptr;
} else {

2
src/storage/access/ob_pushdown_aggregate_vec.cpp
View File

@ -938,7 +938,7 @@ int ObGroupByCellVec::init(const ObTableAccessParam &param, const ObTableAccessC
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(pd_agg_ctx_.init(param, batch_size_))) {
} else if (OB_FAIL(pd_agg_ctx_.init(param, MIN(batch_size_, USE_GROUP_BY_MAX_DISTINCT_CNT)))) {
LOG_WARN("Failed to init agg context", K(ret), K(param));
} else if (OB_FAIL(init_agg_cells(param, context, eval_ctx, false))) {
LOG_WARN("Failed to init agg cells", K(ret));