[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

@ -220,7 +220,7 @@ int32_t ObExprLower::get_case_mutiply(const ObCollationType cs_type) const
{
int32_t mutiply_num = 0;
if (OB_UNLIKELY(!ObCharset::is_valid_collation(cs_type))) {
LOG_WARN("invalid charset", K(cs_type));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid charset", K(cs_type));
} else {
mutiply_num = ObCharset::get_charset(cs_type)->casedn_multiply;
}
@ -245,7 +245,7 @@ int32_t ObExprUpper::get_case_mutiply(const ObCollationType cs_type) const
{
int32_t mutiply_num = 0;
if (OB_UNLIKELY(!ObCharset::is_valid_collation(cs_type))) {
LOG_WARN("invalid charset", K(cs_type));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid charset", K(cs_type));
} else {
mutiply_num = ObCharset::get_charset(cs_type)->caseup_multiply;
}
@ -537,7 +537,7 @@ int32_t ObExprNlsLower::get_case_mutiply(const ObCollationType cs_type) const
{
int32_t mutiply_num = 0;
if (OB_UNLIKELY(!ObCharset::is_valid_collation(cs_type))) {
LOG_WARN("invalid charset", K(cs_type));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid charset", K(cs_type));
} else {
mutiply_num = ObCharset::get_charset(cs_type)->casedn_multiply;
}
@ -579,7 +579,7 @@ int32_t ObExprNlsUpper::get_case_mutiply(const ObCollationType cs_type) const
{
int32_t mutiply_num = 0;
if (OB_UNLIKELY(!ObCharset::is_valid_collation(cs_type))) {
LOG_WARN("invalid charset", K(cs_type));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid charset", K(cs_type));
} else {
mutiply_num = ObCharset::get_charset(cs_type)->casedn_multiply;
}