[FEAT MERGE] Merge syslog user experience improvement to master

Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: chaser-ch <chaser.ch@antgroup.com>
This commit is contained in:
stdliu
2023-02-06 15:52:23 +08:00
committed by ob-robot
parent 1de9266dd0
commit f8c5c2647f
796 changed files with 4465 additions and 3036 deletions

View File

@ -224,11 +224,11 @@ bool stat_compare(const LCKeyValue &left, const LCKeyValue &right)
bool cmp_ret = false;
if (OB_ISNULL(left.node_) || OB_ISNULL(right.node_)) {
cmp_ret = false;
SQL_PC_LOG(ERROR, "invalid argument", KP(left.node_), KP(right.node_), K(cmp_ret));
SQL_PC_LOG_RET(ERROR, OB_INVALID_ARGUMENT, "invalid argument", KP(left.node_), KP(right.node_), K(cmp_ret));
} else if (OB_ISNULL(left.node_->get_node_stat())
|| OB_ISNULL(right.node_->get_node_stat())) {
cmp_ret = false;
SQL_PC_LOG(ERROR, "invalid argument", K(left.node_->get_node_stat()),
SQL_PC_LOG_RET(ERROR, OB_INVALID_ARGUMENT, "invalid argument", K(left.node_->get_node_stat()),
K(right.node_->get_node_stat()), K(cmp_ret));
} else {
cmp_ret = left.node_->get_node_stat()->weight() < right.node_->get_node_stat()->weight();
@ -318,7 +318,7 @@ void ObPlanCache::destroy()
if (inited_) {
TG_DESTROY(tg_id_);
if (OB_SUCCESS != (cache_evict_all_obj())) {
SQL_PC_LOG(WARN, "fail to evict all lib cache cache");
SQL_PC_LOG_RET(WARN, OB_ERROR, "fail to evict all lib cache cache");
}
inited_ = false;
}