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

fix CTE in mysql mode bug

Browse Source
This commit is contained in:
st0
2022-01-24 15:57:49 +08:00
committed by LINxiansheng
parent 568b45a826
commit d6fa144191
8 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sql/optimizer/ob_optimizer_util.cpp
View File

@ -4816,15 +4816,16 @@ int ObOptimizerUtil::is_lossless_column_cast(const ObRawExpr* expr, bool& is_los
}
int ObOptimizerUtil::gen_set_target_list(ObIAllocator* allocator, ObSQLSessionInfo* session_info,
ObRawExprFactory* expr_factory, ObSelectStmt& left_stmt, ObSelectStmt& right_stmt, ObSelectStmt* select_stmt)
ObRawExprFactory* expr_factory, ObSelectStmt& left_stmt, ObSelectStmt& right_stmt,
ObSelectStmt* select_stmt, const bool to_left_type /* false */)
{
int ret = OB_SUCCESS;
ObSEArray<ObSelectStmt*, 1> left_stmts;
ObSEArray<ObSelectStmt*, 1> right_stmts;
if (OB_FAIL(left_stmts.push_back(&left_stmt)) || OB_FAIL(right_stmts.push_back(&right_stmt))) {
LOG_WARN("failed to pushback stmt", K(ret));
} else if (OB_FAIL(
gen_set_target_list(allocator, session_info, expr_factory, left_stmts, right_stmts, select_stmt))) {
} else if (OB_FAIL(gen_set_target_list(
allocator, session_info, expr_factory, left_stmts, right_stmts, select_stmt, to_left_type))) {
LOG_WARN("failed to get set target list", K(ret));
}
return ret;
@ -4832,7 +4833,7 @@ int ObOptimizerUtil::gen_set_target_list(ObIAllocator* allocator, ObSQLSessionIn
int ObOptimizerUtil::gen_set_target_list(ObIAllocator* allocator, ObSQLSessionInfo* session_info,
ObRawExprFactory* expr_factory, ObIArray<ObSelectStmt*>& left_stmts, ObIArray<ObSelectStmt*>& right_stmts,
ObSelectStmt* select_stmt)
ObSelectStmt* select_stmt, const bool to_left_type /* false */)
{
int ret = OB_SUCCESS;
UNUSED(allocator);
@ -4847,7 +4848,8 @@ int ObOptimizerUtil::gen_set_target_list(ObIAllocator* allocator, ObSQLSessionIn
select_stmt->is_set_distinct(),
left_stmts,
right_stmts,
&res_types))) {
&res_types,
to_left_type))) {
LOG_WARN("failed to try add cast to set child list", K(ret));
} else if (OB_ISNULL(child_stmt = select_stmt->get_set_query(0)) ||
OB_UNLIKELY(res_types.count() != child_stmt->get_select_item_size())) {
@ -5031,7 +5033,7 @@ int ObOptimizerUtil::get_set_res_types(ObIAllocator* allocator, ObSQLSessionInfo
int ObOptimizerUtil::try_add_cast_to_set_child_list(ObIAllocator* allocator, ObSQLSessionInfo* session_info,
ObRawExprFactory* expr_factory, const bool is_distinct, ObIArray<ObSelectStmt*>& left_stmts,
ObIArray<ObSelectStmt*>& right_stmts, ObIArray<ObExprResType>* res_types)
ObIArray<ObSelectStmt*>& right_stmts, ObIArray<ObExprResType>* res_types, const bool to_left_type /* false */)
{
int ret = OB_SUCCESS;
ObExprResType res_type;
@ -5107,6 +5109,8 @@ int ObOptimizerUtil::try_add_cast_to_set_child_list(ObIAllocator* allocator, ObS
}
const ObLengthSemantics length_semantics = session_info->get_actual_nls_length_semantics();
if (OB_FAIL(ret)) {
} else if (to_left_type) {
res_type = left_type;
} else if (OB_FAIL(types.push_back(left_type)) || OB_FAIL(types.push_back(right_type))) {
LOG_WARN("failed to push back", K(ret));
} else if (OB_FAIL(session_info->get_collation_connection(coll_type))) {
@ -5114,6 +5118,8 @@ int ObOptimizerUtil::try_add_cast_to_set_child_list(ObIAllocator* allocator, ObS
} else if (OB_FAIL(dummy_op.aggregate_result_type_for_merge(
res_type, &types.at(0), 2, coll_type, is_oracle_mode(), length_semantics, session_info))) {
LOG_WARN("failed to aggregate result type for merge", K(ret));
}
if (OB_FAIL(ret)) {
} else if (ObMaxType == res_type.get_type()) {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("column type incompatible", K(left_type), K(right_type));