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

bugfix

Browse Source
This commit is contained in:
obdev
2023-02-20 13:17:03 +00:00
committed by ob-robot
parent 3a023bbae9
commit aa2e5c99dc
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/resolver/expr/ob_raw_expr_deduce_type.cpp
View File

@ -1951,7 +1951,7 @@ int ObRawExprDeduceType::check_group_aggr_param(ObAggFunRawExpr &expr)
&& !expr.is_need_deserialize_row()
&& !(T_FUN_PL_AGG_UDF == expr.get_expr_type() && !expr.is_param_distinct())
&& !(T_FUN_WM_CONCAT == expr.get_expr_type() && !expr.is_param_distinct()))) {
ret = ob_is_json(param_expr->get_data_type()) ?
ret = (ob_is_json(param_expr->get_data_type()) && !(expr.get_expr_type() == T_FUN_SUM || expr.get_expr_type() == T_FUN_AVG)) ?
OB_ERR_INVALID_CMP_OP : OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("lob or json type parameter not expected", K(ret));
}

7
src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp
View File

@ -1534,7 +1534,10 @@ int ObRawExprResolverImpl::check_name_type(ObQualifiedName &q_name,
if ((OB_SUCC(ret) && !check_success)
|| (OB_ERR_INVOKE_STATIC_BY_INSTANCE != ret && OB_FAIL(ret))) {
ret = OB_SUCCESS;
CK (q_name.access_idents_.count() <= 3 && q_name.access_idents_.count() >= 1);
if (!(q_name.access_idents_.count() <= 3 && q_name.access_idents_.count() >= 1)) {
ret = OB_WRONG_COLUMN_NAME;
LOG_WARN("check name type failed", K(ret), K(q_name));
}
if (3 == q_name.access_idents_.count()) {
OX (q_name.database_name_ = q_name.access_idents_.at(0).access_name_);
OX (q_name.tbl_name_ = q_name.access_idents_.at(1).access_name_);
@ -5375,7 +5378,7 @@ int ObRawExprResolverImpl::process_json_exists_node(const ParseNode *node, ObRaw
ObRawExpr *para_expr = NULL;
CK(OB_NOT_NULL(node->children_[i]->children_[name_idx]));
OZ(SMART_CALL(recursive_resolve(node->children_[i]->children_[name_idx], para_expr)));
if (name_idx % 2 == 0 && para_expr->get_expr_type() == T_REF_QUERY) {
if (OB_NOT_NULL(para_expr) && name_idx % 2 == 0 && para_expr->get_expr_type() == T_REF_QUERY) {
ret = OB_ERR_INVALID_VARIABLE_IN_JSON_PATH;
LOG_USER_ERROR(OB_ERR_INVALID_VARIABLE_IN_JSON_PATH);
} else {