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

[CP] [to #57604640]fix bug object type recompile

Browse Source
This commit is contained in:
seuwebber
2024-06-26 15:22:23 +00:00
committed by ob-robot
parent 035c04895c
commit 95f76b27c0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/share/schema/ob_error_info.cpp
View File

@ -462,7 +462,8 @@ int ObErrorInfo::handle_error_info(const IObErrorInfo *info,
return ret; return ret;
} }
int ObErrorInfo::delete_error(const IObErrorInfo *info) int ObErrorInfo::delete_error(const IObErrorInfo *info,
const ObObjectType obj_type)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObMySQLProxy *sql_proxy = nullptr; ObMySQLProxy *sql_proxy = nullptr;
@ -471,7 +472,7 @@ int ObErrorInfo::delete_error(const IObErrorInfo *info)
} else if (OB_ISNULL(sql_proxy = GCTX.sql_proxy_)) { } else if (OB_ISNULL(sql_proxy = GCTX.sql_proxy_)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
} else { } else {
if (OB_FAIL(collect_error_info(info, NULL, true))) { if (OB_FAIL(collect_error_info(info, NULL, true, obj_type))) {
LOG_WARN("collect error info failed.", K(ret), K(info), K(*this)); LOG_WARN("collect error info failed.", K(ret), K(info), K(*this));
} else { } else {
if (OB_FAIL(del_error(sql_proxy))) { if (OB_FAIL(del_error(sql_proxy))) {

3
src/share/schema/ob_error_info.h
View File

@ -118,7 +118,8 @@ public:
int del_error(common::ObMySQLProxy *sql_proxy); int del_error(common::ObMySQLProxy *sql_proxy);
int add_error(common::ObISQLClient & sql_client, bool is_replace, bool only_history); int add_error(common::ObISQLClient & sql_client, bool is_replace, bool only_history);
int get_error_obj_seq(common::ObISQLClient &sql_client, bool &exist); int get_error_obj_seq(common::ObISQLClient &sql_client, bool &exist);
int delete_error(const IObErrorInfo *info); int delete_error(const IObErrorInfo *info,
const ObObjectType obj_type = ObObjectType::INVALID);
TO_STRING_KV(K_(tenant_id), TO_STRING_KV(K_(tenant_id),
K_(obj_id), K_(obj_id),