From 220e8fceacec8298c87d882856c9ea3ed48c101b Mon Sep 17 00:00:00 2001 From: stdliu Date: Wed, 26 Apr 2023 13:07:58 +0000 Subject: [PATCH] Do not print WDIAG log when syslog_level set to ERROR --- deps/oblib/src/lib/oblog/ob_log_module.h | 4 +++- src/sql/resolver/expr/ob_raw_expr.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deps/oblib/src/lib/oblog/ob_log_module.h b/deps/oblib/src/lib/oblog/ob_log_module.h index 12cf0e154..576b6823c 100644 --- a/deps/oblib/src/lib/oblog/ob_log_module.h +++ b/deps/oblib/src/lib/oblog/ob_log_module.h @@ -1138,7 +1138,9 @@ LOG_MOD_END(PL) #define _LOG_USER_MSG(level, errcode, umsg, args...) \ do {\ OB_LOGGER.log_user_message(level, errcode, umsg, ##args);\ - OB_LOGGER.log_message_fmt("", OB_LOG_NUM_LEVEL(OB_LOG_LEVEL_WARN), errcode, umsg, ##args);\ + if (OB_LOG_NEED_TO_PRINT(WARN)) { \ + OB_LOGGER.log_message_fmt("", OB_LOG_NUM_LEVEL(OB_LOG_LEVEL_WARN), errcode, umsg, ##args);\ + } \ } while(0) // diff --git a/src/sql/resolver/expr/ob_raw_expr.cpp b/src/sql/resolver/expr/ob_raw_expr.cpp index 9ed5e8db3..ad44e5c9f 100644 --- a/src/sql/resolver/expr/ob_raw_expr.cpp +++ b/src/sql/resolver/expr/ob_raw_expr.cpp @@ -3666,7 +3666,7 @@ ObExprOperator *ObSysFunRawExpr::get_op() } } if (OB_UNLIKELY(NULL == (op = ObOpRawExpr::get_op()))) { - LOG_ERROR_RET(OB_ERR_UNEXPECTED, "make function failed", K_(func_name)); + LOG_WARN_RET(OB_ALLOCATE_MEMORY_FAILED, "make function failed", K_(func_name)); } return op; }