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

fix issue/42559381,query result incorrect bug

Browse Source
This commit is contained in:
obdev
2022-07-05 16:15:47 +08:00
committed by wangzelin.wzl
parent b056d5d732
commit 031989c299
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/code_generator/ob_expr_generator_impl.cpp
View File

@ -1436,13 +1436,8 @@ int ObExprGeneratorImpl::visit(ObAggFunRawExpr& expr)
} else if (OB_FAIL(sql_expr_->add_expr_item(item, &expr))) { } else if (OB_FAIL(sql_expr_->add_expr_item(item, &expr))) {
LOG_WARN("failed to add expr item", K(ret)); LOG_WARN("failed to add expr item", K(ret));
} else { } else {
if (T_FUN_JSON_OBJECTAGG == expr.get_expr_type()) { aggr_expr->set_real_param_col_count(expr.get_real_param_count());
aggr_expr->set_real_param_col_count(expr.get_real_param_count()); aggr_expr->set_all_param_col_count(expr.get_param_count());
aggr_expr->set_all_param_col_count(expr.get_param_count());
} else {
aggr_expr->set_real_param_col_count(1);
aggr_expr->set_all_param_col_count(1);
}
if (OB_SUCCESS == ret && if (OB_SUCCESS == ret &&
(T_FUN_GROUP_CONCAT == expr.get_expr_type() || T_FUN_GROUP_RANK == expr.get_expr_type() || (T_FUN_GROUP_CONCAT == expr.get_expr_type() || T_FUN_GROUP_RANK == expr.get_expr_type() ||
T_FUN_GROUP_DENSE_RANK == expr.get_expr_type() || T_FUN_GROUP_PERCENT_RANK == expr.get_expr_type() || T_FUN_GROUP_DENSE_RANK == expr.get_expr_type() || T_FUN_GROUP_PERCENT_RANK == expr.get_expr_type() ||

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

@ -60,7 +60,7 @@ private:
DistinctObjMeta(ObObjType obj_type, ObCollationType coll_type, ObCollationLevel coll_level) DistinctObjMeta(ObObjType obj_type, ObCollationType coll_type, ObCollationLevel coll_level)
: obj_type_(obj_type), coll_type_(coll_type), coll_level_(coll_level) : obj_type_(obj_type), coll_type_(coll_type), coll_level_(coll_level)
{ {
if (!ObDatumFuncs::is_string_type(obj_type_) || !ObDatumFuncs::is_json(obj_type_)) { if (!ObDatumFuncs::is_string_type(obj_type_) && !ObDatumFuncs::is_json(obj_type_)) {
coll_type_ = CS_TYPE_MAX; coll_type_ = CS_TYPE_MAX;
coll_level_ = CS_LEVEL_INVALID; coll_level_ = CS_LEVEL_INVALID;
} }