hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enhanced compatibility for illegal date comparisons in T_OP_ROW

Browse Source
This commit is contained in:
obdev
2023-11-30 09:45:55 +00:00
committed by ob-robot
parent 19a1c56239
commit d505b4ceb5
2 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/sql/rewrite/ob_transform_pre_process.cpp
View File

@ -5917,6 +5917,48 @@ int ObTransformPreProcess::replace_cast_expr_align_date4cmp(ObRawExprFactory &ex
return ret; return ret;
} }
int ObTransformPreProcess::replace_op_row_expr_align_date4cmp(ObRawExprFactory &expr_factory,
const ObItemType &cmp_type,
ObRawExpr *&left_row_expr,
ObRawExpr *&right_row_expr)
{
int ret = OB_SUCCESS;
if (left_row_expr->get_expr_type() == T_OP_ROW &&
right_row_expr->get_expr_type() == T_OP_ROW) {
int64_t expr_cnt = left_row_expr->get_param_count();
if (right_row_expr->get_param_count() != expr_cnt) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid param cnt", K(ret), KPC(left_row_expr),
KPC(right_row_expr));
} else {
int64_t last_expr_idx = expr_cnt - 1;
ObRawExpr *expr0 = left_row_expr->get_param_expr(last_expr_idx);
ObRawExpr *expr1 = right_row_expr->get_param_expr(last_expr_idx);
if (OB_ISNULL(expr0) || OB_ISNULL(expr1)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid null params", K(ret), KPC(left_row_expr),
KPC(right_row_expr));
} else {
const ObItemType reverse_cmp_type = reverse_cmp_type_of_align_date4cmp(cmp_type);
if (OB_FAIL(replace_cast_expr_align_date4cmp(expr_factory, reverse_cmp_type, expr0))) {
LOG_WARN("replace left cast_expr fail.", K(ret), KPC(expr0));
} else {
left_row_expr->get_param_expr(last_expr_idx) = expr0;
}
if (OB_SUCC(ret)) {
if (OB_FAIL(replace_cast_expr_align_date4cmp(expr_factory, cmp_type, expr1))) {
LOG_WARN("replace right cast_expr fail.", K(ret), KPC(expr1));
} else {
right_row_expr->get_param_expr(last_expr_idx) = expr1;
}
}
}
}
}
return ret;
}
int ObTransformPreProcess::check_and_transform_align_date4cmp(ObRawExprFactory &expr_factory, int ObTransformPreProcess::check_and_transform_align_date4cmp(ObRawExprFactory &expr_factory,
ObRawExpr *&cmp_expr, ObRawExpr *&cmp_expr,
const ObItemType &cmp_type) const ObItemType &cmp_type)
@ -5932,6 +5974,9 @@ int ObTransformPreProcess::check_and_transform_align_date4cmp(ObRawExprFactory &
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid null params", K(ret), K(cmp_expr->get_param_expr(0)), LOG_WARN("invalid null params", K(ret), K(cmp_expr->get_param_expr(0)),
K(cmp_expr->get_param_expr(1))); K(cmp_expr->get_param_expr(1)));
} else if (OB_FAIL(replace_op_row_expr_align_date4cmp(expr_factory,
cmp_type, expr0, expr1))){
LOG_WARN("fail to replace op_row_expr", K(ret));
} else { } else {
// By default, align_date4cmp_expr expects the first parameter to be // By default, align_date4cmp_expr expects the first parameter to be
// the value on the right side of the comparison operator. // the value on the right side of the comparison operator.

4
src/sql/rewrite/ob_transform_pre_process.h
View File

@ -434,6 +434,10 @@ struct DistinctObjMeta
static int replace_cast_expr_align_date4cmp(ObRawExprFactory &expr_factory, static int replace_cast_expr_align_date4cmp(ObRawExprFactory &expr_factory,
const ObItemType &cmp_type, const ObItemType &cmp_type,
ObRawExpr *&expr); ObRawExpr *&expr);
static int replace_op_row_expr_align_date4cmp(ObRawExprFactory &expr_factory,
const ObItemType &cmp_type,
ObRawExpr *&left_row_expr,
ObRawExpr *&right_row_expr);
static int check_and_transform_align_date4cmp(ObRawExprFactory &expr_factory, static int check_and_transform_align_date4cmp(ObRawExprFactory &expr_factory,
ObRawExpr *&in_expr, ObRawExpr *&in_expr,
const ObItemType &cmp_type); const ObItemType &cmp_type);