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

Fix core at RCTE

Browse Source
This commit is contained in:
xianyu-w 2023-10-17 06:39:31 +00:00 committed by ob-robot
parent 4bc4349d20
commit 86d7a2b8d6
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6293,9 +6293,8 @@ int ObOptimizerUtil::try_add_cast_to_set_child_list(ObIAllocator *allocator,
if (OB_FAIL(ret)) {
} else if (is_mysql_recursive_union) {
if (left_type.is_null()) {
res_type.set_binary();
res_type.set_length(0);
res_type.set_collation_level(CS_LEVEL_IMPLICIT);
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected rcte type", K(ret), K(left_stmts));
} else {
res_type = left_type;
}

35
src/sql/resolver/dml/ob_dml_resolver.cpp
View File

@ -14657,14 +14657,37 @@ int ObDMLResolver::add_fake_schema(ObSelectStmt *left_stmt)
}
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < select_stmt->get_select_item_size(); ++i) {
ObRawExpr *expr = select_stmt->get_select_item(i).expr_;
ObRawExpr *&expr = select_stmt->get_select_item(i).expr_;
ObColumnSchemaV2 *new_col = static_cast<ObColumnSchemaV2 *>(
allocator_->alloc(sizeof(ObColumnSchemaV2)));
if (OB_ISNULL(expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr is null", K(ret), K(expr));
} else {
ObColumnRefRawExpr *select_expr = static_cast<ObColumnRefRawExpr *>(expr);
ObColumnSchemaV2 *new_col = static_cast<ObColumnSchemaV2 *>(
allocator_->alloc(sizeof(ObColumnSchemaV2)));
} else if (OB_ISNULL(new_col)) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate memory", K(ret));
} else if (lib::is_mysql_mode() &&
expr->get_result_type().is_null()) {
ObRawExpr *new_expr = NULL;
ObExprResType bin_type;
bin_type.set_binary();
bin_type.set_length(0);
bin_type.set_collation_level(CS_LEVEL_IMPLICIT);
if (OB_FAIL(ObRawExprUtils::try_add_cast_expr_above(params_.expr_factory_,
session_info_,
*expr,
bin_type,
new_expr))) {
LOG_WARN("create cast expr for null expr failed", K(ret));
} else if (expr == new_expr) {
/*do nothing*/
} else if (OB_FAIL(new_expr->add_flag(IS_INNER_ADDED_EXPR))) {
LOG_WARN("failed to add flag", K(ret));
} else {
expr = new_expr;
}
}
if (OB_SUCC(ret)) {
new_col = new (new_col) ObColumnSchemaV2(allocator_);
new_col->set_column_name(cte_ctx_.cte_col_names_.at(i));
new_col->set_tenant_id(tbl_schema->get_tenant_id());
@ -14672,7 +14695,7 @@ int ObDMLResolver::add_fake_schema(ObSelectStmt *left_stmt)
new_col->set_column_id(magic_col_id+i);
new_col->set_meta_type(expr->get_result_type());
new_col->set_accuracy(expr->get_accuracy());
new_col->set_collation_type(select_expr->get_collation_type());
new_col->set_collation_type(expr->get_collation_type());
new_col->set_extended_type_info(expr->get_enum_set_values());
new_col->add_column_flag(CTE_GENERATED_COLUMN_FLAG);
if (OB_FAIL(tbl_schema->add_column(*new_col))) {