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

fix: match error in killing inner sql when __all_virtual_session_info has no user tenant name in inner sql

Browse Source
This commit is contained in:
JLY2015
2023-05-22 12:11:31 +00:00
committed by ob-robot
parent 19035231a9
commit 058c604632
8 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sql/session/ob_basic_session_info.cpp
View File

@ -535,6 +535,27 @@ int ObBasicSessionInfo::set_tenant(const common::ObString &tenant_name,
return ret;
}
int ObBasicSessionInfo::switch_tenant_with_name(
uint64_t effective_tenant_id, const common::ObString &tenant_name)
{
int ret = OB_SUCCESS;
if (!is_valid_tenant_id(effective_tenant_id)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid tenant id", K(ret), K(effective_tenant_id));
} else if (tenant_name.empty()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("tenant name is empty", K(ret), K(tenant_name));
} else if (tenant_name.length() > OB_MAX_TENANT_NAME_LENGTH) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("tenant name too long", K(ret), K(tenant_name));
} else if (OB_FAIL(switch_tenant(effective_tenant_id))) {
LOG_WARN("fail to switch tenant", K(ret), K(effective_tenant_id));
} else if (OB_FAIL(ob_cstrcopy(effective_tenant_, sizeof(effective_tenant_), tenant_name))) {
LOG_WARN("tenant name too long", K(ret), K(tenant_name));
}
return ret;
}
int ObBasicSessionInfo::switch_tenant(uint64_t effective_tenant_id)
{
int ret = OB_SUCCESS;