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

timeguard and tenant config opt (5/5)

Browse Source
This commit is contained in:
obdev
2023-03-02 18:49:10 +00:00
committed by ob-robot
parent b382879cb3
commit a65db0d0f8
19 changed files with 94 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/aggregate/ob_aggregate_function.cpp
View File

@ -164,7 +164,7 @@ int ObGroupConcatRowStore::init(const uint64_t tenant_id,
iter_idx_ = 0;
if (sort_columns.empty()) {
int64_t sort_area_size = 0;
if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(SORT_WORK_AREA, tenant_id, sort_area_size))) {
if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(SORT_WORK_AREA, tenant_id, NULL, sort_area_size))) {
LOG_WARN("failed to get workarea size", K(ret), K(tenant_id));
} else if (OB_FAIL(rs_.init(sort_area_size,
tenant_id, ObCtxIds::WORK_AREA, ObModIds::OB_SQL_AGGR_FUN_GROUP_CONCAT,

2
src/sql/engine/aggregate/ob_aggregate_processor.cpp
View File

@ -353,7 +353,7 @@ int ObAggregateProcessor::GroupConcatExtraResult::init(const uint64_t tenant_id,
} else {
int64_t sort_area_size = 0;
if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(
SORT_WORK_AREA, tenant_id, sort_area_size))) {
SORT_WORK_AREA, tenant_id, &eval_ctx.exec_ctx_, sort_area_size))) {
LOG_WARN("failed to get workarea size", K(ret), K(tenant_id));
} else if (OB_FAIL(row_store_.init(sort_area_size,
tenant_id,