[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

@ -92,7 +92,7 @@ public:
|| OB_ISNULL(r)
|| (l->cnt_ != r->cnt_)) {
*err_ = OB_ERR_UNEXPECTED;
SQL_LOG(WARN, "invalid parameter", KPC(l), KPC(r), K(*err_));
SQL_LOG_RET(WARN, *err_, "invalid parameter", KPC(l), KPC(r), K(*err_));
} else {
const ObDatum *lcells = l->cells();
const ObDatum *rcells = r->cells();
@ -101,7 +101,7 @@ public:
const int64_t idx = sort_collations_.at(i).field_idx_;
if (idx >= exprs_.count()) {
*err_ = OB_ERR_UNEXPECTED;
SQL_LOG(WARN, "compare column id greater than exprs count", K(*err_),
SQL_LOG_RET(WARN, *err_, "compare column id greater than exprs count", K(*err_),
K(idx), K(exprs_.count()));
} else {
bool null_first = (NULL_FIRST == sort_collations_.at(i).null_pos_);