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

[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Browse Source 
Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65
2024-06-17 13:46:15 +00:00
committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/code_generator/ob_dml_cg_service.cpp
View File

@ -1768,11 +1768,13 @@ int ObDmlCgService::append_all_uk_column_id(ObSchemaGetterGuard *schema_guard,
// not unique index, skip
} else {
ObTableSchema::const_column_iterator iter = index_table_schema->column_begin();
for ( ; iter != index_table_schema->column_end(); iter++) {
for ( ; OB_SUCC(ret) && iter != index_table_schema->column_end(); iter++) {
const ObColumnSchemaV2 *column_schema = *iter;
if (OB_ISNULL(column_schema)) {
LOG_WARN("unexpected err", KPC(column_schema));
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected null", K(ret), KPC(column_schema));
} else if (!column_schema->is_index_column()) {
// ignore ret
// skip non index column
} else if (OB_FAIL(add_var_to_array_no_dup(minimal_column_ids, column_schema->get_column_id()))) {
LOG_WARN("add column_id to list failed",
@ -2395,11 +2397,11 @@ int ObDmlCgService::generate_dml_base_ctdef(ObLogicalOperator &op,
ObLogDelUpd &dml_op = static_cast<ObLogDelUpd&>(op);
// Cg is only needed when the current trans_info_expr_ has a producer operator
if (has_exist_in_array(dml_op.get_produced_trans_exprs(), index_dml_info.trans_info_expr_)) {
if (cg_.generate_rt_expr(*index_dml_info.trans_info_expr_, dml_base_ctdef.trans_info_expr_)) {
if (OB_FAIL(cg_.generate_rt_expr(*index_dml_info.trans_info_expr_, dml_base_ctdef.trans_info_expr_))) {
LOG_WARN("fail to cg trans_info expr", K(ret), KPC(index_dml_info.trans_info_expr_));
}
} else {
LOG_TRACE("this trans_info_expr not produced", K(ret), K(index_dml_info));
LOG_TRACE("this trans_info_expr not produced", K(index_dml_info));
}
}
@ -3445,6 +3447,7 @@ int ObDmlCgService::generate_fk_arg(ObForeignKeyArg &fk_arg,
if (check_parent_table) {
ObDMLCtDefAllocator<ObForeignKeyCheckerCtdef> fk_allocator(cg_.phy_plan_->get_allocator());
if (OB_ISNULL(fk_arg.fk_ctdef_ = fk_allocator.alloc())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to alocate foreign key ctdef", K(ret));
} else if (OB_FAIL(generate_fk_check_ctdef(op, name_table_id,
fk_part_id_expr,
@ -3510,6 +3513,7 @@ int ObDmlCgService::generate_fk_check_ctdef(const ObLogDelUpd &op,
} else if (OB_FAIL(cg_.generate_calc_part_id_expr(*part_id_expr_for_lookup, nullptr, rt_part_id_expr))) {
LOG_WARN("generate rt part_id_expr failed", K(ret), KPC(part_id_expr_for_lookup));
} else if (OB_ISNULL(rt_part_id_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("rt part_id_expr for lookup is null", K(ret));
} else if (OB_FAIL(constraint_raw_exprs.push_back(part_id_expr_for_lookup))) {
LOG_WARN("fail to push part_id_expr to constraint_raw_exprs", K(ret));
@ -3650,6 +3654,7 @@ int ObDmlCgService::generate_fk_scan_part_id_expr(ObLogDelUpd &op,
} else if (OB_FAIL(cg_.generate_calc_part_id_expr(*part_id_expr_for_lookup, nullptr, rt_part_id_expr))) {
LOG_WARN("generate rt part_id_expr failed", K(ret), KPC(part_id_expr_for_lookup));
} else if (OB_ISNULL(rt_part_id_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("rt part_id_expr for lookup is null", K(ret));
} else if (OB_FAIL(constraint_raw_exprs.push_back(part_id_expr_for_lookup))) {
LOG_WARN("fail to push part_id_expr to constraint_raw_exprs", K(ret));

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

@ -190,6 +190,7 @@ int ObExprGeneratorImpl::add_child_infix_expr(ObRawExpr &raw_expr, const int64_t
for (int64_t i = start_pos; i < end_pos && OB_SUCC(ret); i++) {
ObRawExpr *e = visited_exprs.at(i);
if (OB_ISNULL(e)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("NULL raw expr pointer", K(ret));
} else if (OB_FAIL(add_child_infix_expr(*e, i, visited_exprs))) {
LOG_WARN("add child infix expr failed", K(ret), K(*e));
@ -974,7 +975,7 @@ int ObExprGeneratorImpl::visit_strcmp_expr(ObNonTerminalRawExpr &expr, ObExprStr
if (OB_ISNULL(strcmp_op)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("strcmp_op expr op is null", K(ret));
} else if (strcmp_op->set_cmp_func(ObVarcharType, ObVarcharType)) {
} else if (OB_FAIL(strcmp_op->set_cmp_func(ObVarcharType, ObVarcharType))) {
LOG_WARN("set cmp func failed", K(ret), K(expr), K(*strcmp_op));
}
return ret;
@ -1892,7 +1893,7 @@ int ObExprGeneratorImpl::visit(ObAggFunRawExpr &expr)
}
} // end for
FOREACH(e, columnlized_exprs) {
FOREACH_X(e, columnlized_exprs, OB_SUCC(ret)) {
if (OB_FAIL((*e)->clear_flag(IS_COLUMNLIZED))) {
LOG_WARN("failed to clear flag", K(ret));
}

6
src/sql/code_generator/ob_static_engine_cg.cpp
View File

@ -5720,7 +5720,8 @@ int ObStaticEngineCG::generate_join_spec(ObLogJoin &op, ObJoinSpec &spec)
}
ARRAY_FOREACH(op.get_above_pushdown_right_params(), i) {
ObExecParamRawExpr* param_expr = op.get_above_pushdown_right_params().at(i);
if (OB_FAIL(batch_exec_param_caches_.push_back(BatchExecParamCache(param_expr,
if (OB_FAIL(ret)) {
} else if (OB_FAIL(batch_exec_param_caches_.push_back(BatchExecParamCache(param_expr,
&nlj,
false)))) {
LOG_WARN("fail to push back param expr", K(ret));
@ -6152,7 +6153,8 @@ int ObStaticEngineCG::generate_spec(
}
ARRAY_FOREACH(op.get_above_pushdown_right_params(), i) {
ObExecParamRawExpr* param_expr = op.get_above_pushdown_right_params().at(i);
if (OB_FAIL(batch_exec_param_caches_.push_back(BatchExecParamCache(param_expr,
if (OB_FAIL(ret)) {
} else if (OB_FAIL(batch_exec_param_caches_.push_back(BatchExecParamCache(param_expr,
&spec,
false)))) {
LOG_WARN("fail to push back param expr", K(ret));