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

fix two bugs:

Browse Source
This commit is contained in:
LINxiansheng 2022-06-29 11:06:16 +08:00 committed by wangzelin.wzl
parent 90003168d2
commit 9add78d42b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/observer/mysql/ob_query_response_time.cpp
View File

@ -176,7 +176,10 @@ int ObRSTCollector::flush_query_response_time(uint64_t tenant_id,const ObString&
int ObRSTCollector::enable_query_response_time(uint64_t tenant_id){
int ret = OB_SUCCESS;
if (OB_FAIL(ret = collector_map_.set_refactored(tenant_id, new ObRSTTimeCollector()))) {
omt::ObTenantConfigGuard tenant_config(TENANT_CONF(tenant_id));
if(tenant_config->query_response_time_stats){
SERVER_LOG(INFO, "query_response_time_stats already turn on", K(ret), K(tenant_id));
} else if (OB_FAIL(ret = collector_map_.set_refactored(tenant_id, new ObRSTTimeCollector()))) {
if (OB_HASH_EXIST == ret) {
ret = OB_ERR_ALREADY_EXISTS;
}
@ -186,7 +189,10 @@ int ObRSTCollector::enable_query_response_time(uint64_t tenant_id){
int ObRSTCollector::free_query_response_time(uint64_t tenant_id){
int ret = OB_SUCCESS;
if (OB_FAIL(collector_map_.erase_refactored(tenant_id))) {
omt::ObTenantConfigGuard tenant_config(TENANT_CONF(tenant_id));
if(!tenant_config->query_response_time_stats){
SERVER_LOG(INFO, "query_response_time_stats already turn off", K(ret), K(tenant_id));
} else if (OB_FAIL(collector_map_.erase_refactored(tenant_id))) {
SERVER_LOG(WARN,"erase the time collector failed", K(tenant_id));
}
return ret;

2
src/sql/resolver/cmd/ob_show_resolver.cpp
View File

@ -1113,7 +1113,7 @@ int ObShowResolver::resolve(const ParseNode& parse_tree)
} else {
show_resv_ctx.stmt_type_ = stmt::T_SHOW_QUERY_RESPONSE_TIME;
GEN_SQL_STEP_1(ObShowSqlSet::SHOW_QUERY_RESPONSE_TIME);
GEN_SQL_STEP_2(ObShowSqlSet::SHOW_QUERY_RESPONSE_TIME, OB_INFORMATION_SCHEMA_NAME, OB_QUERY_RESPONSE_TIME_TNAME);
GEN_SQL_STEP_2(ObShowSqlSet::SHOW_QUERY_RESPONSE_TIME, OB_SYS_DATABASE_NAME, OB_ALL_VIRTUAL_QUERY_RESPONSE_TIME_TNAME);
}
break;
}