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

revert tenant config opt for sql module

Browse Source
This commit is contained in:
obdev
2023-03-08 04:14:03 +00:00
committed by ob-robot
parent e2ffa5a173
commit ebefd2bd67
10 changed files with 35 additions and 68 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, NULL, sort_area_size))) {
if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(SORT_WORK_AREA, tenant_id, 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, &eval_ctx.exec_ctx_, sort_area_size))) {
SORT_WORK_AREA, tenant_id, 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,

4
src/sql/engine/join/ob_hash_join_op.cpp
View File

@ -1417,7 +1417,7 @@ int ObHashJoinOp::get_max_memory_size(int64_t input_size)
int64_t extra_memory_size = get_extra_memory_size();
int64_t memory_size = (extra_memory_size + input_size) < 0 ? input_size : (extra_memory_size + input_size);
if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(
ObSqlWorkAreaType::HASH_WORK_AREA, tenant_id, &ctx_, hash_area_size))) {
ObSqlWorkAreaType::HASH_WORK_AREA, tenant_id, hash_area_size))) {
LOG_WARN("failed to get workarea size", K(ret), K(tenant_id));
} else if (FALSE_IT(remain_data_memory_size_ = hash_area_size * 80 / 100)) {
// default data memory size: 80%
@ -1670,7 +1670,7 @@ int ObHashJoinOp::get_processor_type()
int64_t hash_area_size = 0;
if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(
ObSqlWorkAreaType::HASH_WORK_AREA,
ctx_.get_my_session()->get_effective_tenant_id(), &ctx_, hash_area_size))) {
ctx_.get_my_session()->get_effective_tenant_id(), hash_area_size))) {
LOG_WARN("failed to get workarea size", K(ret));
}
remain_data_memory_size_ = hash_area_size * 10;

49
src/sql/engine/ob_sql_mem_mgr_processor.cpp
View File

@ -92,7 +92,7 @@ int ObSqlMemMgrProcessor::init(
int64_t max_mem_size = MAX_SQL_MEM_SIZE;
if (OB_FAIL(ret)) {
} else if (OB_FAIL(ObSqlWorkareaUtil::get_workarea_size(
profile_.get_work_area_type(), tenant_id_, exec_ctx, max_mem_size))) {
profile_.get_work_area_type(), tenant_id_, max_mem_size))) {
LOG_WARN("failed to get workarea size", K(ret), K(tenant_id_), K(max_mem_size));
}
if (!profile_.get_auto_policy()) {
@ -305,47 +305,24 @@ int ObSqlMemMgrProcessor::alloc_dir_id(int64_t &dir_id)
return ret;
}
int ObSqlWorkareaUtil::get_workarea_size(const ObSqlWorkAreaType wa_type,
const int64_t tenant_id,
ObExecContext *exec_ctx,
int64_t &value)
int ObSqlWorkareaUtil::get_workarea_size(const ObSqlWorkAreaType wa_type, const int64_t tenant_id, int64_t &value)
{
int ret = OB_SUCCESS;
if (NULL != exec_ctx) {
if (OB_ISNULL(exec_ctx->get_my_session())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected exec_ctx or session", K(ret), K(wa_type), K(tenant_id), KP(exec_ctx));
ObTenantConfigGuard tenant_config(TENANT_CONF(tenant_id));
if (tenant_config.is_valid()) {
if (HASH_WORK_AREA == wa_type) {
value = tenant_config->_hash_area_size;
} else if (SORT_WORK_AREA == wa_type) {
value = tenant_config->_sort_area_size;
} else {
if (HASH_WORK_AREA == wa_type) {
value = exec_ctx->get_my_session()->get_tenant_hash_area_size();
} else if (SORT_WORK_AREA == wa_type) {
value = exec_ctx->get_my_session()->get_tenant_sort_area_size();
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected status: workarea type", K(wa_type), K(tenant_id));
}
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected status: workarea type", K(wa_type), K(tenant_id));
}
LOG_DEBUG("debug workarea size", K(value), K(tenant_id), K(lbt()));
} else {
ObTenantConfigGuard tenant_config(TENANT_CONF(tenant_id));
if (tenant_config.is_valid()) {
if (HASH_WORK_AREA == wa_type) {
value = tenant_config->_hash_area_size;
} else if (SORT_WORK_AREA == wa_type) {
value = tenant_config->_sort_area_size;
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected status: workarea type", K(wa_type), K(tenant_id));
}
LOG_DEBUG("debug workarea size", K(value), K(tenant_id), K(lbt()));
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to init tenant config", K(tenant_id), K(ret));
}
ret = OB_ERR_UNEXPECTED;
LOG_WARN("failed to init tenant config", K(tenant_id), K(ret));
}
LOG_DEBUG("debug workarea size", K(value), K(tenant_id), K(lbt()));
return ret;
}

1
src/sql/engine/ob_sql_mem_mgr_processor.h
View File

@ -183,7 +183,6 @@ public:
static int get_workarea_size(
const ObSqlWorkAreaType wa_type,
const int64_t tenant_id,
ObExecContext *exec_ctx,
int64_t &value
);
};