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

batch cherry-pick 31x bugfix to opensource branch

Browse Source
This commit is contained in:
raywill
2021-07-27 17:27:15 +08:00
committed by wangzelin.wzl
parent 2969037a8b
commit 9c76339e62
27 changed files with 174 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/share/system_variable/ob_system_variable_factory.cpp
View File

@ -19,6 +19,9 @@ using namespace oceanbase::common;
namespace oceanbase {
namespace share {
const int32_t ObSysVarFactory::OB_MAX_SYS_VAR_ID;
const char* ObSysVarBinlogRowImage::BINLOG_ROW_IMAGE_NAMES[] = {"MINIMAL", "NOBLOB", "FULL", 0};
const char* ObSysVarQueryCacheType::QUERY_CACHE_TYPE_NAMES[] = {"OFF", "ON", "DEMAND", 0};
const char* ObSysVarObReadConsistency::OB_READ_CONSISTENCY_NAMES[] = {"", "FROZEN", "WEAK", "STRONG", 0};
@ -695,9 +698,9 @@ int ObSysVarFactory::calc_sys_var_store_idx(ObSysVarClassType sys_var_id, int64_
if (ObSysVarsToIdxMap::has_invalid_sys_var_id()) {
ret = OB_INVALID_ARGUMENT;
LOG_ERROR("has invalid sys var id", K(ret), K(ObSysVarsToIdxMap::has_invalid_sys_var_id()));
} else if (OB_UNLIKELY(var_id < 0)) {
} else if (OB_UNLIKELY(var_id < 0 || var_id >= ObSysVarFactory::OB_MAX_SYS_VAR_ID)) {
ret = OB_INVALID_ARGUMENT;
LOG_ERROR("invalid sys var id", K(ret), K(var_id));
LOG_ERROR("invalid sys var id", K(ret), K(var_id), K(ObSysVarFactory::OB_MAX_SYS_VAR_ID));
} else {
real_idx = ObSysVarsToIdxMap::get_store_idx(var_id);
if (real_idx < 0) {