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

[CP] Relax the collation type check defense for runtime filters.

Browse Source
This commit is contained in:
obdev
2023-10-19 07:09:24 +00:00
committed by ob-robot
parent af7068fe4a
commit 763d2240d5
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/optimizer/ob_logical_operator.cpp
View File

@ -4534,12 +4534,21 @@ int ObLogicalOperator::cal_runtime_filter_compare_func(
ObRawExpr *join_create_expr) ObRawExpr *join_create_expr)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
common::ObCollationType cs_type = join_use_expr->get_collation_type();
if (ob_is_string_or_lob_type(join_use_expr->get_result_type().get_type()) if (ob_is_string_or_lob_type(join_use_expr->get_result_type().get_type())
|| ob_is_string_or_lob_type(join_create_expr->get_result_type().get_type())) { || ob_is_string_or_lob_type(join_create_expr->get_result_type().get_type())) {
if (OB_UNLIKELY(join_use_expr->get_collation_type() != join_create_expr->get_collation_type())) { if (OB_UNLIKELY(join_use_expr->get_collation_type() != join_create_expr->get_collation_type())) {
ret = OB_ERR_UNEXPECTED; // it's ok if one side of the join is a null type because null types can always be compared.
LOG_WARN("collation type not match", K(join_use_expr->get_result_type()), if (ob_is_null(join_use_expr->get_result_type().get_type())) {
K(join_create_expr->get_result_type())); // use create's cs_type
cs_type = join_create_expr->get_collation_type();
} else if (ob_is_null(join_create_expr->get_result_type().get_type())) {
// use use's cs_type
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("collation type not match", K(join_use_expr->get_result_type()),
K(join_create_expr->get_result_type()));
}
} }
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
@ -4552,7 +4561,7 @@ int ObLogicalOperator::cal_runtime_filter_compare_func(
join_use_expr->get_data_type(), join_use_expr->get_data_type(),
join_create_expr->get_data_type(), join_create_expr->get_data_type(),
lib::is_oracle_mode()? NULL_LAST : NULL_FIRST, lib::is_oracle_mode()? NULL_LAST : NULL_FIRST,
join_use_expr->get_collation_type(), cs_type,
scale, scale,
lib::is_oracle_mode(), lib::is_oracle_mode(),
has_lob_header); has_lob_header);