Merge pull request from GitHub pr175

This commit is contained in:
LINxiansheng
2021-08-11 17:50:35 +08:00
committed by wangzelin.wzl
parent 99f2835249
commit 58f7fb882e
14 changed files with 800 additions and 7 deletions

View File

@ -4776,8 +4776,10 @@ int ObRelationalExprOperator::cg_row_cmp_expr(const int row_dimension, ObIAlloca
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error", K(ret));
}
if (OB_UNLIKELY(left_row->arg_cnt_ != right_row->arg_cnt_)) {
if (OB_ISNULL(right_row) || OB_ISNULL(left_row)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("right_row or left_row is null ptr", K(ret), K(right_row), K(left_row));
} else if (OB_UNLIKELY(left_row->arg_cnt_ != right_row->arg_cnt_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected row cnt", K(left_row->arg_cnt_), K(right_row->arg_cnt_));
}