Merge branch 'column_store'

Co-authored-by: wangt1xiuyi <13547954130@163.com>
Co-authored-by: yangqise7en <877793735@qq.com>
Co-authored-by: Zach41 <zach_41@163.com>
This commit is contained in:
chaser-ch
2023-10-31 15:39:20 +00:00
committed by ob-robot
parent 4057fbc4ae
commit 566e920620
1375 changed files with 239147 additions and 56014 deletions

View File

@ -864,7 +864,7 @@ int ObTenantSqlMemoryManager::get_max_work_area_size(
wash_ratio = -tmp_ret;
}
if (0 <= wash_ratio && wash_ratio <=6 && auto_calc) {
if (OB_FAIL(ObKVGlobalCache::get_instance().get_washable_size(tenant_id_, washable_size, wash_ratio))) {
if (OB_FAIL(ObKVGlobalCache::get_instance().get_washable_size(tenant_id_, washable_size))) {
LOG_WARN("failed to get washable memory size", K(ret));
} else {
max_tenant_memory_size += washable_size;