diff --git a/src/sql/code_generator/ob_dml_cg_service.cpp b/src/sql/code_generator/ob_dml_cg_service.cpp index 759d69acdf..038dcab1b9 100644 --- a/src/sql/code_generator/ob_dml_cg_service.cpp +++ b/src/sql/code_generator/ob_dml_cg_service.cpp @@ -806,6 +806,7 @@ int ObDmlCgService::generate_conflict_checker_ctdef(ObLogInsert &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)); diff --git a/src/sql/code_generator/ob_tsc_cg_service.cpp b/src/sql/code_generator/ob_tsc_cg_service.cpp index c535ddae4c..df0981de8c 100644 --- a/src/sql/code_generator/ob_tsc_cg_service.cpp +++ b/src/sql/code_generator/ob_tsc_cg_service.cpp @@ -165,7 +165,7 @@ int ObTscCgService::generate_tsc_ctdef(ObLogTableScan &op, ObTableScanCtDef &tsc tsc_ctdef.lookup_loc_meta_, tsc_ctdef.calc_part_id_expr_))) { LOG_WARN("fail to generate calc part id expr", K(ret), KP(op.get_calc_part_id_expr())); - } else if (cg_.generate_rt_exprs(op.get_rowkey_exprs(), tsc_ctdef.global_index_rowkey_exprs_)) { + } else if (OB_FAIL(cg_.generate_rt_exprs(op.get_rowkey_exprs(), tsc_ctdef.global_index_rowkey_exprs_))) { LOG_WARN("fail to generate rowkey exprs", K(ret)); } } diff --git a/src/sql/engine/aggregate/ob_aggregate_processor.cpp b/src/sql/engine/aggregate/ob_aggregate_processor.cpp index 12e2ecb40c..98f56e1579 100644 --- a/src/sql/engine/aggregate/ob_aggregate_processor.cpp +++ b/src/sql/engine/aggregate/ob_aggregate_processor.cpp @@ -6484,7 +6484,7 @@ int ObAggregateProcessor::get_ora_json_arrayagg_result(const ObAggrInfo &aggr_in ret = OB_ERR_TOO_LONG_STRING_IN_CONCAT; LOG_WARN("result of json_arrar is too long", K(ret), K(json_array_buf.length()), K(OB_MAX_PACKET_LENGTH)); - } else if (json_array_buf.append(",")) { + } else if (OB_FAIL(json_array_buf.append(","))) { LOG_WARN("fail to append comma", K(ret)); } } @@ -6893,7 +6893,7 @@ int ObAggregateProcessor::get_ora_json_objectagg_result(const ObAggrInfo &aggr_i ret = OB_ERR_TOO_LONG_STRING_IN_CONCAT; LOG_WARN("result of json_objectagg is too long", K(ret), K(json_object_buf.length()), K(OB_MAX_PACKET_LENGTH)); - } else if (json_object_buf.append(",")) { + } else if (OB_FAIL(json_object_buf.append(","))) { LOG_WARN("fail to append comma", K(ret)); } } diff --git a/src/sql/engine/basic/ob_ra_datum_store.cpp b/src/sql/engine/basic/ob_ra_datum_store.cpp index cd8a3aabdc..6b7537f912 100644 --- a/src/sql/engine/basic/ob_ra_datum_store.cpp +++ b/src/sql/engine/basic/ob_ra_datum_store.cpp @@ -1309,7 +1309,7 @@ int ObRADatumStore::finish_add_row() const bool finish_add = true; if (OB_FAIL(switch_block(min_size))) { LOG_WARN("write last block to file failed", K(ret), K(min_size)); - } else if (switch_idx_block(finish_add)) { + } else if (OB_FAIL(switch_idx_block(finish_add))) { LOG_WARN("write last index block to file failed", K(ret), K(ret)); } else if (OB_FAIL(get_timeout(timeout_ms))) { LOG_WARN("get timeout failed", K(ret)); diff --git a/src/sql/engine/basic/ob_ra_row_store.cpp b/src/sql/engine/basic/ob_ra_row_store.cpp index f871248285..5ee252d3b3 100644 --- a/src/sql/engine/basic/ob_ra_row_store.cpp +++ b/src/sql/engine/basic/ob_ra_row_store.cpp @@ -1089,7 +1089,7 @@ int ObRARowStore::finish_add_row() const bool finish_add = true; if (OB_FAIL(switch_block(min_size))) { LOG_WARN("write last block to file failed", K(ret), K(min_size)); - } else if (switch_idx_block(finish_add)) { + } else if (OB_FAIL(switch_idx_block(finish_add))) { LOG_WARN("write last index block to file failed", K(ret), K(ret)); } else if (OB_FAIL(get_timeout(timeout_ms))) { LOG_WARN("get timeout failed", K(ret)); diff --git a/src/sql/engine/dml/ob_conflict_checker.cpp b/src/sql/engine/dml/ob_conflict_checker.cpp index a59917a1d4..1b01d0940c 100644 --- a/src/sql/engine/dml/ob_conflict_checker.cpp +++ b/src/sql/engine/dml/ob_conflict_checker.cpp @@ -376,6 +376,7 @@ int ObConflictChecker::build_base_conflict_map( if (OB_FAIL(build_rowkey(rowkey, checker_ctdef_.cst_ctdefs_.at(i)))) { LOG_WARN("fail to build rowkey", K(ret)); } else if (OB_ISNULL(rowkey)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("rowkey is null", K(ret)); } else { ObConflictValue constraint_value; @@ -790,6 +791,7 @@ int ObConflictChecker::build_data_table_range(ObNewRange &lookup_range) } else if (OB_FAIL(expr->eval(eval_ctx_, col_datum))) { LOG_WARN("failed to evaluate expr in rowkey", K(ret), K(i)); } else if (OB_ISNULL(col_datum)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("evaluated column datum in rowkey is nullptr", K(ret), K(i)); } else if (OB_FAIL(col_datum->to_obj(tmp_obj, expr->obj_meta_, expr->obj_datum_map_))) { LOG_WARN("convert datum to obj failed", K(ret)); diff --git a/src/sql/engine/dml/ob_dml_service.cpp b/src/sql/engine/dml/ob_dml_service.cpp index c6510e1531..0a4d7a0fd1 100644 --- a/src/sql/engine/dml/ob_dml_service.cpp +++ b/src/sql/engine/dml/ob_dml_service.cpp @@ -187,6 +187,7 @@ int ObDMLService::check_rowkey_whether_distinct(const ObExprPtrIArray &row, } else if (OB_FAIL(expr->eval(eval_ctx, col_datum))) { LOG_WARN("failed to evaluate expr in rowkey", K(ret), K(i)); } else if (OB_ISNULL(col_datum)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("evaluated column datum in rowkey is nullptr", K(ret), K(i)); } else if (OB_FAIL(col_datum->to_obj(tmp_obj_ptr[i], expr->obj_meta_, expr->obj_datum_map_))) { LOG_WARN("convert datum to obj failed", K(ret), K(i)); diff --git a/src/sql/engine/expr/ob_datum_cast.cpp b/src/sql/engine/expr/ob_datum_cast.cpp index 2943a9606e..014c881c54 100644 --- a/src/sql/engine/expr/ob_datum_cast.cpp +++ b/src/sql/engine/expr/ob_datum_cast.cpp @@ -801,7 +801,7 @@ static OB_INLINE int common_int_number(const ObExpr &expr, ObObjType out_type = expr.datum_meta_.type_; if ((ObUNumberType == out_type) && CAST_FAIL(numeric_negative_check(in_val))) { LOG_WARN("numeric_negative_check faield", K(ret), K(in_val)); - } else if (nmb.from(in_val, alloc)) { + } else if (OB_FAIL(nmb.from(in_val, alloc))) { LOG_WARN("nmb.from failed", K(ret), K(in_val)); } return ret; @@ -6005,7 +6005,7 @@ CAST_FUNC_NAME(time, date) if (OB_FAIL(ObTimeConverter::time_to_datetime(in_val, cur_time, session->get_timezone_info(), datetime_value, ObDateTimeType))) { LOG_WARN("datetime_to_date failed", K(ret), K(cur_time)); - } else if (ObTimeConverter::datetime_to_date(datetime_value, NULL, out_val)) { + } else if (OB_FAIL(ObTimeConverter::datetime_to_date(datetime_value, NULL, out_val))) { LOG_WARN("date to datetime failed", K(ret), K(datetime_value)); } else { res_datum.set_date(out_val); diff --git a/src/sql/engine/expr/ob_expr_frame_info.cpp b/src/sql/engine/expr/ob_expr_frame_info.cpp index 0e334edaf5..20b64b7308 100644 --- a/src/sql/engine/expr/ob_expr_frame_info.cpp +++ b/src/sql/engine/expr/ob_expr_frame_info.cpp @@ -49,7 +49,7 @@ int ObExprFrameInfo::assign(const ObExprFrameInfo &other, LOG_WARN("failed to copy dynamic frames", K(ret)); } else if (OB_FAIL(datum_frame_.assign(other.datum_frame_))) { LOG_WARN("failed to copy datum frame", K(ret)); - } else if (const_frame_ptrs_.prepare_allocate(other.const_frame_ptrs_.count())) { + } else if (OB_FAIL(const_frame_ptrs_.prepare_allocate(other.const_frame_ptrs_.count()))) { LOG_WARN("failed to prepare allocate array", K(ret)); } else { char *frame_mem = NULL; diff --git a/src/sql/engine/expr/ob_expr_func_sleep.cpp b/src/sql/engine/expr/ob_expr_func_sleep.cpp index cfa4f4cec2..56aeb49bd9 100644 --- a/src/sql/engine/expr/ob_expr_func_sleep.cpp +++ b/src/sql/engine/expr/ob_expr_func_sleep.cpp @@ -87,7 +87,7 @@ int ObExprSleep::get_usec(const number::ObNumber &nmb, int64_t &value, ObIAlloca LOG_WARN("copy nmb failed", K(ret), K(nmb)); } else if (OB_FAIL(tmp_nmb.round(SCALE_OF_SECOND))) { LOG_WARN("round nmb failed", K(ret), K(tmp_nmb)); - } else if (tmp_nmb.mul(other, res, alloc)) { + } else if (OB_FAIL(tmp_nmb.mul(other, res, alloc))) { LOG_WARN("mul op failed", K(ret), K(other), K(tmp_nmb)); } else if (!res.is_valid_uint64(tmp)) { //based on the behaviour of mysql. ret = OB_INVALID_ARGUMENT; diff --git a/src/sql/engine/expr/ob_expr_json_array.cpp b/src/sql/engine/expr/ob_expr_json_array.cpp index 725c657be7..d41fd3fef9 100644 --- a/src/sql/engine/expr/ob_expr_json_array.cpp +++ b/src/sql/engine/expr/ob_expr_json_array.cpp @@ -277,7 +277,7 @@ int ObExprJsonArray::eval_ora_json_array(const ObExpr &expr, ObEvalCtx &ctx, ObD } ret = OB_OPERATE_OVERFLOW; LOG_USER_ERROR(OB_OPERATE_OVERFLOW, res_ptr, "json_array"); - } else if (ObJsonExprHelper::pack_json_str_res(expr, ctx, res, res_string)) { + } else if (OB_FAIL(ObJsonExprHelper::pack_json_str_res(expr, ctx, res, res_string))) { LOG_WARN("fail to pack ressult.", K(ret)); } } diff --git a/src/sql/engine/expr/ob_expr_json_exists.cpp b/src/sql/engine/expr/ob_expr_json_exists.cpp index b1539c6ad8..8960c12f11 100644 --- a/src/sql/engine/expr/ob_expr_json_exists.cpp +++ b/src/sql/engine/expr/ob_expr_json_exists.cpp @@ -188,6 +188,7 @@ int ObExprJsonExists::get_var_data(const ObExpr &expr, ObEvalCtx &ctx, common::O if (OB_UNLIKELY(OB_FAIL(json_arg->eval(ctx, json_datum)))) { LOG_WARN("eval json arg failed", K(ret)); } else if (OB_ISNULL(json_datum)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("eval json arg failed", K(ret)); } else if (val_type == ObNullType) { ret = OB_ERR_INVALID_VARIABLE_IN_JSON_PATH; diff --git a/src/sql/engine/expr/ob_expr_json_merge_patch.cpp b/src/sql/engine/expr/ob_expr_json_merge_patch.cpp index 23506a549d..73b96ecd19 100644 --- a/src/sql/engine/expr/ob_expr_json_merge_patch.cpp +++ b/src/sql/engine/expr/ob_expr_json_merge_patch.cpp @@ -381,7 +381,7 @@ int ObExprJsonMergePatch::eval_ora_json_merge_patch(const ObExpr &expr, ObEvalCt ret = OB_SUCCESS; res.set_null(); } - } else if (ObJsonExprHelper::pack_json_str_res(expr, ctx, res, res_string)) { + } else if (OB_FAIL(ObJsonExprHelper::pack_json_str_res(expr, ctx, res, res_string))) { LOG_WARN("fail to pack ressult.", K(ret)); } } diff --git a/src/sql/engine/expr/ob_expr_json_query.cpp b/src/sql/engine/expr/ob_expr_json_query.cpp index 0135930bbd..4ffdff51cf 100644 --- a/src/sql/engine/expr/ob_expr_json_query.cpp +++ b/src/sql/engine/expr/ob_expr_json_query.cpp @@ -523,7 +523,7 @@ int ObExprJsonQuery::set_result(ObObjType dst_type, ObIJsonBase *jb_res_bin = NULL; if (OB_FAIL(ret)) { LOG_WARN("json extarct get results failed", K(ret)); - } else if (ObJsonBaseFactory::transform(allocator, jb_res, ObJsonInType::JSON_BIN, jb_res_bin)) { // to BIN + } else if (OB_FAIL(ObJsonBaseFactory::transform(allocator, jb_res, ObJsonInType::JSON_BIN, jb_res_bin))) { // to BIN LOG_WARN("fail to transform to tree", K(ret)); } else if (OB_FAIL(jb_res_bin->get_raw_binary(raw_str, allocator))) { LOG_WARN("json extarct get result binary failed", K(ret)); diff --git a/src/sql/engine/expr/ob_expr_st_aswkb.cpp b/src/sql/engine/expr/ob_expr_st_aswkb.cpp index 04271edd8d..3795813d19 100644 --- a/src/sql/engine/expr/ob_expr_st_aswkb.cpp +++ b/src/sql/engine/expr/ob_expr_st_aswkb.cpp @@ -191,7 +191,7 @@ int ObExprGeomWkb::eval_geom_wkb(const ObExpr &expr, ObLobLocatorV2 lob(res_wkb, expr.obj_meta_.has_lob_header()); if (OB_FAIL(lob.get_inrow_data(res_wkb))) { LOG_WARN("failed to get inrow data", K(ret), K(lob)); - } else if (ObGeoTypeUtil::get_wkb_from_swkb(res_wkb, wkb, offset)) { + } else if (OB_FAIL(ObGeoTypeUtil::get_wkb_from_swkb(res_wkb, wkb, offset))) { LOG_WARN("failed to get wkb from swkb", K(ret)); } else { MEMMOVE(res_wkb.ptr(), res_wkb.ptr() + offset, res_wkb.length() - offset); diff --git a/src/sql/engine/expr/ob_expr_substrb.cpp b/src/sql/engine/expr/ob_expr_substrb.cpp index b73277aa1a..a0b373a7f6 100644 --- a/src/sql/engine/expr/ob_expr_substrb.cpp +++ b/src/sql/engine/expr/ob_expr_substrb.cpp @@ -451,7 +451,7 @@ int ObExprSubstrb::calc_substrb_expr(const ObExpr &expr, ObEvalCtx &ctx, ObDatum } else { output_result.set_result(); } - } else if (output_result.init(result_byte_len)) { + } else if (OB_FAIL(output_result.init(result_byte_len))) { LOG_WARN("Lob: init stringtext result failed", K(ret)); } else if (OB_FAIL(output_result.get_reserved_buffer(buf, buf_size))) { LOG_WARN("Lob: stringtext result reserve buffer failed", K(ret)); diff --git a/src/sql/engine/expr/ob_expr_sys_connect_by_path.cpp b/src/sql/engine/expr/ob_expr_sys_connect_by_path.cpp index ffa51eda6f..1bf8b3ae7a 100644 --- a/src/sql/engine/expr/ob_expr_sys_connect_by_path.cpp +++ b/src/sql/engine/expr/ob_expr_sys_connect_by_path.cpp @@ -127,6 +127,7 @@ int ObExprSysConnectByPath::eval_sys_connect_by_path(const ObExpr &expr, ret = OB_ERR_TOO_LONG_STRING_IN_CONCAT; LOG_WARN("sys cnnt by path result too long", K(ret), K(res_length)); } else if (OB_ISNULL(res_buf = expr.get_str_res_mem(ctx, res_length))) { + ret = OB_ALLOCATE_MEMORY_FAILED; LOG_WARN("allocate failed", K(ret)); } else { memcpy(res_buf, parent_path.ptr(), parent_path.length()); diff --git a/src/sql/engine/expr/ob_expr_tz_offset.cpp b/src/sql/engine/expr/ob_expr_tz_offset.cpp index aff287f300..4e51aa704d 100644 --- a/src/sql/engine/expr/ob_expr_tz_offset.cpp +++ b/src/sql/engine/expr/ob_expr_tz_offset.cpp @@ -150,7 +150,7 @@ int ObExprTzOffset::eval_tz_offset(const ObExpr &expr, ObEvalCtx &ctx, ObDatum & res_str_utf8, ObCharset::get_system_collation(), res_str, out_cs_type, calc_alloc))) { LOG_WARN("convert string coll failed", K(ret), K(res_str_utf8), K(out_cs_type)); - } else if (ObExprUtil::deep_copy_str(res_str, res_str, res_alloc)) { + } else if (OB_FAIL(ObExprUtil::deep_copy_str(res_str, res_str, res_alloc))) { LOG_WARN("copy str failed", K(ret)); } else { res.set_string(res_str); diff --git a/src/sql/engine/expr/ob_number_format_models.cpp b/src/sql/engine/expr/ob_number_format_models.cpp index 431ca1b99d..f033bf547b 100644 --- a/src/sql/engine/expr/ob_number_format_models.cpp +++ b/src/sql/engine/expr/ob_number_format_models.cpp @@ -2353,7 +2353,7 @@ int ObNFMToNumber::process_hex_format(const common::ObString &in_str, number::ObNumber res; if (base_num.from(base, allocator)) { LOG_WARN("fail to cast uint64 to number", K(ret), K(base)); - } else if (base_num.power(exponent, power_num, allocator)) { + } else if (OB_FAIL(base_num.power(exponent, power_num, allocator))) { LOG_WARN("power calc failed", K(ret)); } else { for (int32_t i = 0; OB_SUCC(ret) && i < hex_num_size; i++) { diff --git a/src/sql/engine/expr/ob_postfix_expression.cpp b/src/sql/engine/expr/ob_postfix_expression.cpp index 31aae0e26c..d8a3801339 100644 --- a/src/sql/engine/expr/ob_postfix_expression.cpp +++ b/src/sql/engine/expr/ob_postfix_expression.cpp @@ -517,6 +517,7 @@ int ObPostfixExpression::calc_result_row(ObExprCtx &expr_ctx, const common::ObNe if (OB_FAIL(ret)) { LOG_WARN("no memory or deep copy has failed", K(ret)); } else if (OB_ISNULL(result_row.cells_)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("result row cells is null", K(ret)); } else { result_row.cells_[0].set_type(ObMaxType); @@ -596,6 +597,7 @@ int ObPostfixExpression::calc_result_row(ObExprCtx &expr_ctx, const common::ObNe if (OB_FAIL(ret)) { LOG_WARN("no memory or deep copy has failed", K(ret)); } else if (OB_ISNULL(result_row.cells_)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("result row cells is null", K(ret)); } else { result_row.cells_[0].set_type(ObMaxType); diff --git a/src/sql/engine/join/ob_join_filter_op.cpp b/src/sql/engine/join/ob_join_filter_op.cpp index 8a60b3addf..175b2ade71 100644 --- a/src/sql/engine/join/ob_join_filter_op.cpp +++ b/src/sql/engine/join/ob_join_filter_op.cpp @@ -344,6 +344,7 @@ int ObJoinFilterOp::link_ch_sets(ObPxBloomFilterChSets &ch_sets, } else if (OB_FAIL(dtl::ObDtlChannelGroup::link_channel(ci, ch, NULL))) { LOG_WARN("fail link channel", K(ci), K(ret)); } else if (OB_ISNULL(ch)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("ch channel is null", K(ret)); } else if (OB_FAIL(channels.push_back(ch))) { LOG_WARN("fail push back channel ptr", K(ci), K(ret)); @@ -409,9 +410,9 @@ int ObJoinFilterOp::do_use_filter_rescan() int ObJoinFilterOp::inner_rescan() { int ret = OB_SUCCESS; - if (MY_SPEC.is_create_mode() && do_create_filter_rescan()) { + if (MY_SPEC.is_create_mode() && OB_FAIL(do_create_filter_rescan())) { LOG_WARN("fail to do create filter rescan", K(ret)); - } else if (MY_SPEC.is_use_mode() && do_use_filter_rescan()) { + } else if (MY_SPEC.is_use_mode() && OB_FAIL(do_use_filter_rescan())) { LOG_WARN("fail to do use filter rescan", K(ret)); } else if (OB_FAIL(ObOperator::inner_rescan())) { LOG_WARN("operator rescan failed", K(ret)); diff --git a/src/sql/engine/ob_operator.cpp b/src/sql/engine/ob_operator.cpp index fc774b79b0..16dffbbf58 100644 --- a/src/sql/engine/ob_operator.cpp +++ b/src/sql/engine/ob_operator.cpp @@ -1480,6 +1480,7 @@ inline int ObOperator::init_dummy_mem_context(uint64_t tenant_id) if (OB_FAIL(CURRENT_CONTEXT->CREATE_CONTEXT(dummy_mem_context_, param))) { SQL_ENG_LOG(WARN, "create entity failed", K(ret)); } else if (OB_ISNULL(dummy_mem_context_)) { + ret = OB_ALLOCATE_MEMORY_FAILED; SQL_ENG_LOG(WARN, "mem entity is null", K(ret)); } } diff --git a/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp b/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp index 2bbaffca63..8cf5ed7d11 100644 --- a/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp +++ b/src/sql/engine/px/datahub/components/ob_dh_range_dist_wf.cpp @@ -245,7 +245,7 @@ int ObRDWFPieceMsgCtx::send_whole_msg(common::ObIArray &sqcs) auto wf = static_cast(op_kit->spec_); if (OB_FAIL(wf->rd_generate_patch(*this))) { LOG_WARN("calculate range distribution window function final res failed", K(ret)); - } else if (formalize_store_row()) { + } else if (OB_FAIL(formalize_store_row())) { LOG_WARN("formalize store row failed", K(ret)); } else { LOG_DEBUG("after formalize", K(infos_)); diff --git a/src/sql/engine/px/exchange/ob_px_transmit_op.cpp b/src/sql/engine/px/exchange/ob_px_transmit_op.cpp index 0fd6b3129d..855879150c 100644 --- a/src/sql/engine/px/exchange/ob_px_transmit_op.cpp +++ b/src/sql/engine/px/exchange/ob_px_transmit_op.cpp @@ -1014,6 +1014,7 @@ int ObPxTransmitOp::link_ch_sets(ObPxTaskChSet &ch_set, } else if (OB_FAIL(ObDtlChannelGroup::link_channel(ci, ch, dfc))) { LOG_WARN("fail link channel", K(ci), K(ret)); } else if (OB_ISNULL(ch)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("fail add qc channel", K(ret)); } else if (OB_FAIL(channels.push_back(ch))) { failed_in_push_back_to_channels = true; diff --git a/src/sql/engine/px/ob_dfo_scheduler.cpp b/src/sql/engine/px/ob_dfo_scheduler.cpp index e67d409d61..e0bde0bb0a 100644 --- a/src/sql/engine/px/ob_dfo_scheduler.cpp +++ b/src/sql/engine/px/ob_dfo_scheduler.cpp @@ -572,6 +572,7 @@ int ObSerialDfoScheduler::do_schedule_dfo(ObExecContext &ctx, ObDfo &dfo) const if (OB_FAIL(ObDtlChannelGroup::link_channel(ci, ch))) { LOG_WARN("fail link channel", K(ci), K(ret)); } else if (OB_ISNULL(ch)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("fail add qc channel", K(ret)); } else { ch->set_qc_owner(); @@ -732,6 +733,7 @@ int ObParallelDfoScheduler::do_schedule_dfo(ObExecContext &exec_ctx, ObDfo &dfo) if (OB_FAIL(ObDtlChannelGroup::link_channel(ci, ch))) { LOG_WARN("fail link channel", K(ci), K(ret)); } else if (OB_ISNULL(ch)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("fail add qc channel", K(ret)); } else { ch->set_qc_owner(); diff --git a/src/sql/engine/px/ob_granule_iterator_op.cpp b/src/sql/engine/px/ob_granule_iterator_op.cpp index 30a9061f11..b7cdefe634 100644 --- a/src/sql/engine/px/ob_granule_iterator_op.cpp +++ b/src/sql/engine/px/ob_granule_iterator_op.cpp @@ -820,7 +820,7 @@ int ObGranuleIteratorOp::get_gi_task_consumer_node(ObOperator *cur, PHY_BLOCK_SAMPLE_SCAN == first_child->get_spec().type_ || PHY_ROW_SAMPLE_SCAN == first_child->get_spec().type_) { child = first_child; - } else if (get_gi_task_consumer_node(first_child, child)) { + } else if (OB_FAIL(get_gi_task_consumer_node(first_child, child))) { LOG_WARN("failed to get gi task consumer node", K(ret)); } if (OB_SUCC(ret) && OB_ISNULL(child)) { diff --git a/src/sql/engine/px/ob_px_task_process.cpp b/src/sql/engine/px/ob_px_task_process.cpp index ef1fe746e5..bf77895a6e 100644 --- a/src/sql/engine/px/ob_px_task_process.cpp +++ b/src/sql/engine/px/ob_px_task_process.cpp @@ -77,6 +77,7 @@ int ObPxTaskProcess::check_inner_stat() ret = OB_ERR_UNEXPECTED; LOG_WARN("phy plan ctx is NULL", K(ret), K(exec_ctx)); } else if (OB_ISNULL(arg_.get_sqc_handler())) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("sqc hanlder is null", K(ret)); } else { // 为了尽快确定任务超时，启动 task 的超时时间很短，10ms 左右 diff --git a/src/sql/engine/px/ob_px_worker.cpp b/src/sql/engine/px/ob_px_worker.cpp index 6b6976176b..7d9f501bb2 100644 --- a/src/sql/engine/px/ob_px_worker.cpp +++ b/src/sql/engine/px/ob_px_worker.cpp @@ -233,6 +233,7 @@ void PxWorkerFunctor::operator ()() ObThreadLogLevelUtils::clear(); } } else if (OB_ISNULL(sqc_handler)) { + ret = OB_ERR_UNEXPECTED; LOG_ERROR("Unexpected null sqc handler", K(sqc_handler)); } else { LOG_WARN("already interrupted"); diff --git a/src/sql/executor/ob_execute_result.cpp b/src/sql/executor/ob_execute_result.cpp index 6f55bb5ae8..4b790984ec 100644 --- a/src/sql/executor/ob_execute_result.cpp +++ b/src/sql/executor/ob_execute_result.cpp @@ -169,7 +169,7 @@ int ObAsyncExecuteResult::open(ObExecContext &ctx) if (OB_ISNULL(scanner_) || OB_ISNULL(plan_ctx) || OB_ISNULL(session)) { ret = OB_NOT_INIT; LOG_WARN("scanner is invalid", K(ret), K(scanner_), K(plan_ctx), K(session)); - } else if (ObTaskExecutorCtxUtil::merge_task_result_meta(*plan_ctx, *scanner_)) { + } else if (OB_FAIL(ObTaskExecutorCtxUtil::merge_task_result_meta(*plan_ctx, *scanner_))) { LOG_WARN("merge task result meta failed", K(ret), KPC_(scanner)); } else if (OB_FAIL(session->replace_user_variables(ctx, scanner_->get_session_var_map()))) { LOG_WARN("replace user variables failed", K(ret)); diff --git a/src/sql/monitor/flt/ob_flt_control_info_mgr.cpp b/src/sql/monitor/flt/ob_flt_control_info_mgr.cpp index 23ddca8d1f..327d9750be 100644 --- a/src/sql/monitor/flt/ob_flt_control_info_mgr.cpp +++ b/src/sql/monitor/flt/ob_flt_control_info_mgr.cpp @@ -269,7 +269,7 @@ int ObFLTControlInfoManager::set_control_info(sql::ObExecContext &ctx) if (OB_ISNULL(sql_proxy)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("sql_proxy is null", K(ret)); - } else if (sql.assign_fmt("ALTER SYSTEM SET `_trace_control_info` = '%s'", trace_info.ptr())) { + } else if (OB_FAIL(sql.assign_fmt("ALTER SYSTEM SET `_trace_control_info` = '%s'", trace_info.ptr()))) { LOG_WARN("failed to set trace control info", K(ret)); } else if (OB_FAIL(sql_proxy->write(tenant_id_, sql.ptr(), affected_rows))) { LOG_WARN("execute sql failed", K(ret), K(sql)); diff --git a/src/sql/monitor/ob_exec_stat_collector.cpp b/src/sql/monitor/ob_exec_stat_collector.cpp index ae54a17c50..4122e847db 100644 --- a/src/sql/monitor/ob_exec_stat_collector.cpp +++ b/src/sql/monitor/ob_exec_stat_collector.cpp @@ -81,6 +81,7 @@ int ObExecStatCollector::collect_plan_monitor_info(uint64_t job_id, if (OB_FAIL(monitor_info->get_operator_info_by_index(i, op_info))) { SQL_MONITOR_LOG(WARN, "fail to get operator info by index", K(ret), K(i)); } else if (OB_ISNULL(op_info)) { + ret = OB_ERR_UNEXPECTED; SQL_MONITOR_LOG(WARN, "get invalie op_info", K(ret), K(op_info)); } else if (OB_FAIL(op_info->set_job_id(job_id))) { SQL_MONITOR_LOG(WARN, "fail to set job id", K(ret), K(job_id)); diff --git a/src/sql/ob_sql_utils.cpp b/src/sql/ob_sql_utils.cpp index 9de5e82b17..a20a7b466c 100644 --- a/src/sql/ob_sql_utils.cpp +++ b/src/sql/ob_sql_utils.cpp @@ -415,7 +415,7 @@ int ObSQLUtils::calc_const_or_calculable_expr( if (OB_SUCC(ret) && !is_valid) { if (NULL == constraints) { // do nothing - } else if (add_calc_failure_constraint(raw_expr, *constraints)) { + } else if (OB_FAIL(add_calc_failure_constraint(raw_expr, *constraints))) { LOG_WARN("failed to add calc failure constraint", K(ret)); } } diff --git a/src/sql/optimizer/ob_dynamic_sampling.cpp b/src/sql/optimizer/ob_dynamic_sampling.cpp index fb125b66c0..5af0220e5a 100644 --- a/src/sql/optimizer/ob_dynamic_sampling.cpp +++ b/src/sql/optimizer/ob_dynamic_sampling.cpp @@ -888,7 +888,7 @@ int ObDynamicSampling::get_all_tablet_id_and_object_id(const ObDSTableParam &par } else if (OB_FAIL(ctx_->get_exec_ctx()->get_das_ctx().get_das_tablet_mapper(param.table_id_, tablet_mapper))) { LOG_WARN("fail to get das tablet mapper", K(ret)); - } else if (tablet_mapper.get_non_partition_tablet_id(tmp_tablet_ids, tmp_part_ids)) { + } else if (OB_FAIL(tablet_mapper.get_non_partition_tablet_id(tmp_tablet_ids, tmp_part_ids))) { LOG_WARN("failed to get non partition tablet id", K(ret)); } else if (OB_UNLIKELY(tmp_part_ids.count() != 1 || tmp_tablet_ids.count() != 1)) { ret = OB_ERR_UNEXPECTED; diff --git a/src/sql/optimizer/ob_join_order.cpp b/src/sql/optimizer/ob_join_order.cpp index d8cca57849..271234152f 100644 --- a/src/sql/optimizer/ob_join_order.cpp +++ b/src/sql/optimizer/ob_join_order.cpp @@ -1402,6 +1402,7 @@ int ObJoinOrder::refine_table_heuristics_result(const uint64_t table_id, temp_ordering_info))) { LOG_WARN("failed to get ordering info", K(table_id), K(index_id), K(ret)); } else if (OB_ISNULL(temp_ordering_info)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("ordering info is null", K(ret)); } else { /* do nothing*/ } // examine all matched unique index @@ -2064,6 +2065,7 @@ int ObJoinOrder::cal_dimension_info(const uint64_t table_id, //alias table id if (OB_FAIL(guard->get_table_schema(index_table_id, index_schema))) { LOG_WARN("failed to get table schema", K(ret)); } else if (OB_ISNULL(index_schema)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("index schema should not be null", K(ret)); } else if (OB_FAIL(extract_filter_column_ids(restrict_infos, data_table_id == index_table_id, @@ -3510,7 +3512,7 @@ int ObJoinOrder::sort_predicate_by_index_column(const ObIArray &rang } else if (!is_in_expr && OB_FAIL(candi_exprs->eq_exprs_.push_back(expr))) { LOG_WARN("failed to push back expr", K(ret)); - } else if (sort_exprs.push_back(candi_exprs)) { + } else if (OB_FAIL(sort_exprs.push_back(candi_exprs))) { LOG_WARN("failed to push back expr", K(ret)); } } @@ -11204,9 +11206,9 @@ int ObJoinOrder::fill_filters(const ObIArray &all_filters, LOG_WARN("unexpected null expr", K(ret)); } else if (expr->has_flag(CNT_DYNAMIC_PARAM)) { ret = est_cost_info.pushdown_prefix_filters_.push_back(expr); - } else if (ObOptimizerUtil::extract_column_ids(expr, + } else if (OB_FAIL(ObOptimizerUtil::extract_column_ids(expr, est_cost_info.table_id_, - column_bs)) { + column_bs))) { LOG_WARN("failed to extract column ids", K(ret)); } else { ret = new_prefix_filters.push_back(expr); @@ -11250,8 +11252,8 @@ int ObJoinOrder::fill_filters(const ObIArray &all_filters, LOG_WARN("unexpected null expr", K(ret)); } else if (ObOptimizerUtil::find_equal_expr(est_cost_info.prefix_filters_, filter)) { /*do nothing*/ - } else if (ObOptimizerUtil::extract_column_ids(filter, est_cost_info.table_id_, - expr_column_bs)) { + } else if (OB_FAIL(ObOptimizerUtil::extract_column_ids(filter, est_cost_info.table_id_, + expr_column_bs))) { LOG_WARN("failed to extract column ids", K(ret)); } else if (!expr_column_bs.is_subset(index_column_bs)) { ret = est_cost_info.table_filters_.push_back(filter); @@ -11286,9 +11288,9 @@ int ObJoinOrder::fill_filters(const ObIArray &all_filters, if (OB_ISNULL(filter)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpected null expr", K(ret)); - } else if (ObOptimizerUtil::extract_column_ids(filter, + } else if (OB_FAIL(ObOptimizerUtil::extract_column_ids(filter, est_cost_info.table_id_, - expr_column_bs)) { + expr_column_bs))) { LOG_WARN("failed to extract column ids", K(ret)); } else if (expr_column_bs.is_subset(prefix_column_bs)) { ret = est_cost_info.prefix_filters_.push_back(filter); @@ -13921,7 +13923,7 @@ int ObJoinOrder::try_get_generated_col_index_expr(ObRawExpr *qual, if (OB_ISNULL(child)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("child is null", K(ret)); - } else if (ObOptimizerUtil::get_expr_without_lossless_cast(child, child)) { + } else if (OB_FAIL(ObOptimizerUtil::get_expr_without_lossless_cast(child, child))) { LOG_WARN("fail to get real child without lossless cast", K(ret)); } else if (OB_ISNULL(child)) { ret = OB_ERR_UNEXPECTED; diff --git a/src/sql/optimizer/ob_log_plan.cpp b/src/sql/optimizer/ob_log_plan.cpp index c3d3f156ed..05c3ce7388 100644 --- a/src/sql/optimizer/ob_log_plan.cpp +++ b/src/sql/optimizer/ob_log_plan.cpp @@ -1901,7 +1901,7 @@ int ObLogPlan::generate_cross_product_conflict_rule(ConflictDetector *cross_prod //do nothing } else if (OB_FAIL(used_infos.add_member(j))) { LOG_WARN("failed to add member", K(ret)); - } else if (connect_tables.add_members(connect_infos.at(j))) { + } else if (OB_FAIL(connect_tables.add_members(connect_infos.at(j)))) { LOG_WARN("failed to add members", K(ret)); } } @@ -13271,11 +13271,11 @@ int ObLogPlan::compute_subplan_filter_repartition_distribution_info(ObLogicalOpe right_keys, null_safe_info))) { LOG_WARN("failed to get subplan filter equal key", K(ret)); - } else if (compute_repartition_distribution_info(input_esets, + } else if (OB_FAIL(compute_repartition_distribution_info(input_esets, left_keys, right_keys, *right_child, - exch_info)) { + exch_info))) { LOG_WARN("failed to compute repartition distribution info", K(ret)); } else if (OB_FAIL(exch_info.server_list_.assign(max_parallel_child->get_server_list()))) { LOG_WARN("failed to assign server list", K(ret)); diff --git a/src/sql/optimizer/ob_log_set.cpp b/src/sql/optimizer/ob_log_set.cpp index 151858379e..eae5e5e3aa 100644 --- a/src/sql/optimizer/ob_log_set.cpp +++ b/src/sql/optimizer/ob_log_set.cpp @@ -428,7 +428,7 @@ int ObLogSet::get_re_est_cost_infos(const EstimateCostInfo ¶m, if (OB_ISNULL(child)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("set operator i-th child is null", K(ret), K(i)); - } else if (cur_param.assign(param)) { + } else if (OB_FAIL(cur_param.assign(param))) { LOG_WARN("failed to assign param", K(ret)); } else if (OB_FALSE_IT(cur_param.need_row_count_ = need_row_count)) { } else if (OB_FAIL(get_child(i)->re_est_cost(cur_param, cur_child_card, cur_child_cost))) { @@ -723,7 +723,7 @@ int ObLogSet::print_outline_data(PlanText &plan_text) } else if (hint.get_dist_methods().empty() && hint.get_left_branch().empty()) { /*do nothing*/ } else if (OB_FALSE_IT(hint.set_qb_name(qb_name))) { - } else if (hint.print_hint(plan_text)) { + } else if (OB_FAIL(hint.print_hint(plan_text))) { LOG_WARN("fail to print buffer", K(ret), K(buf), K(buf_len), K(pos)); } else { /*do nothing*/ } return ret; diff --git a/src/sql/optimizer/ob_log_subplan_filter.cpp b/src/sql/optimizer/ob_log_subplan_filter.cpp index 72209808b3..f0571bffb0 100644 --- a/src/sql/optimizer/ob_log_subplan_filter.cpp +++ b/src/sql/optimizer/ob_log_subplan_filter.cpp @@ -279,7 +279,7 @@ int ObLogSubPlanFilter::get_re_est_cost_infos(const EstimateCostInfo ¶m, if (OB_ISNULL(child)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("set operator i-th child is null", K(ret), K(i)); - } else if (cur_param.assign(param)) { + } else if (OB_FAIL(cur_param.assign(param))) { LOG_WARN("failed to assign param", K(ret)); } else if (0 != i && OB_FALSE_IT(cur_param.need_row_count_ = -1)) { } else if (OB_FAIL(SMART_CALL(get_child(i)->re_est_cost(cur_param, cur_child_card, cur_child_cost)))) { diff --git a/src/sql/optimizer/ob_log_subplan_scan.cpp b/src/sql/optimizer/ob_log_subplan_scan.cpp index 87f9469749..8feb52961e 100644 --- a/src/sql/optimizer/ob_log_subplan_scan.cpp +++ b/src/sql/optimizer/ob_log_subplan_scan.cpp @@ -50,7 +50,7 @@ int ObLogSubPlanScan::get_op_exprs(ObIArray &all_exprs) LOG_WARN("failed to generate access exprs", K(ret)); } else if (OB_FAIL(append(all_exprs, access_exprs_))) { LOG_WARN("failed to append exprs", K(ret)); - } else if (ObLogicalOperator::get_op_exprs(all_exprs)) { + } else if (OB_FAIL(ObLogicalOperator::get_op_exprs(all_exprs))) { LOG_WARN("failed to append op exprs", K(ret)); } else { /*do nothing*/ } diff --git a/src/sql/optimizer/ob_logical_operator.cpp b/src/sql/optimizer/ob_logical_operator.cpp index 91bd4a4cb0..b6ac568595 100644 --- a/src/sql/optimizer/ob_logical_operator.cpp +++ b/src/sql/optimizer/ob_logical_operator.cpp @@ -1676,7 +1676,7 @@ int ObLogicalOperator::mark_expr_produced(ObRawExpr *expr, ExprProducer new_expr_producer(expr, id_); new_expr_producer.producer_branch_ = branch_id; new_expr_producer.producer_id_ = producer_id; - if (gen_expr_ctx.add(new_expr_producer)) { + if (OB_FAIL(gen_expr_ctx.add(new_expr_producer))) { LOG_WARN("failed to add expr producer", K(ret)); } else { /*do nothing*/ } } else { diff --git a/src/sql/optimizer/ob_optimizer_util.cpp b/src/sql/optimizer/ob_optimizer_util.cpp index 0903e58512..46060f19ac 100644 --- a/src/sql/optimizer/ob_optimizer_util.cpp +++ b/src/sql/optimizer/ob_optimizer_util.cpp @@ -3824,7 +3824,7 @@ int ObOptimizerUtil::check_need_sort(const ObIArray &expected_order_ // do nothing } else if (fd_item->is_unique()) { find_unique = true; - } else if (used_fd.add_member(fd_idx)) { + } else if (OB_FAIL(used_fd.add_member(fd_idx))) { LOG_WARN("failed to add member to set", K(ret)); } else if (OB_FAIL(split_child_exprs(fd_item, equal_sets, fd_set_parent_exprs, extend_exprs))) { @@ -4046,7 +4046,7 @@ int ObOptimizerUtil::create_interesting_merge_key(const ObIArray &me } else if (!ObOptimizerUtil::is_expr_equivalent(expect_key.at(i).expr_, merge_exprs.at(j), equal_sets)) { /* do nothing */ - } else if (found_bs.add_member(j)) { + } else if (OB_FAIL(found_bs.add_member(j))) { LOG_WARN("failed to add member", K(ret)); } else if (OB_FAIL(sort_exprs.push_back(merge_exprs.at(j)))) { LOG_WARN("failed to push back", K(ret)); @@ -4918,12 +4918,12 @@ public: new_expr = NULL; if (old_expr->is_const_or_param_expr()) { new_expr = old_expr; - } else if (ObOptimizerUtil::get_parent_stmt_expr(equal_sets_, + } else if (OB_FAIL(ObOptimizerUtil::get_parent_stmt_expr(equal_sets_, table_id_, parent_stmt_, child_stmt_, old_expr, - new_expr)) { + new_expr))) { LOG_WARN("failed to get parent stmt expr", K(ret)); } else { // does not replace the old_expr, iterate its child expr diff --git a/src/sql/plan_cache/ob_plan_match_helper.cpp b/src/sql/plan_cache/ob_plan_match_helper.cpp index 16350b918d..723d84984d 100644 --- a/src/sql/plan_cache/ob_plan_match_helper.cpp +++ b/src/sql/plan_cache/ob_plan_match_helper.cpp @@ -327,6 +327,7 @@ int ObPlanMatchHelper::check_partition_constraint( ret = OB_ERR_UNEXPECTED; LOG_WARN("get unexpected null", K(ret)); } else if (OB_ISNULL(GET_MY_SESSION(pc_ctx.exec_ctx_))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("fail to get session", KR(ret)); } else { const uint64_t tenant_id = GET_MY_SESSION(pc_ctx.exec_ctx_)->get_effective_tenant_id(); @@ -476,6 +477,7 @@ int ObPlanMatchHelper::check_strict_pwj_cons( } } } else if (OB_ISNULL(GET_MY_SESSION(pc_ctx.exec_ctx_))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("fail to get session", KR(ret)); } else { // distribute partition wise join diff --git a/src/sql/resolver/cmd/ob_alter_system_resolver.cpp b/src/sql/resolver/cmd/ob_alter_system_resolver.cpp index 2a7664b748..428915068e 100644 --- a/src/sql/resolver/cmd/ob_alter_system_resolver.cpp +++ b/src/sql/resolver/cmd/ob_alter_system_resolver.cpp @@ -4514,7 +4514,7 @@ int resolve_restore_until(const ParseNode &time_node, time_val))) { ret = OB_ERR_WRONG_VALUE; LOG_USER_ERROR(OB_ERR_WRONG_VALUE, "TIMESTAMP", to_cstring(time_str)); - } else if (recovery_until_scn.convert_for_sql(time_val)) { + } else if (OB_FAIL(recovery_until_scn.convert_for_sql(time_val))) { LOG_WARN("fail to set scn", K(ret)); } else { with_restore_scn = true; diff --git a/src/sql/resolver/dcl/ob_grant_resolver.cpp b/src/sql/resolver/dcl/ob_grant_resolver.cpp index f8f0251335..3ecab1134c 100644 --- a/src/sql/resolver/dcl/ob_grant_resolver.cpp +++ b/src/sql/resolver/dcl/ob_grant_resolver.cpp @@ -1880,7 +1880,7 @@ int ObGrantResolver::resolve_obj_priv_list_ora( } else if (OB_ISNULL(priv_type_node = role_sys_obj_all_col_priv->children_[0])) { ret = OB_INVALID_ARGUMENT; LOG_WARN("priv_type_node is NULL", K(ret)); - } else if (trans_ora_sys_priv_to_obj(priv_type_node)) { + } else if (OB_FAIL(trans_ora_sys_priv_to_obj(priv_type_node))) { // For compatibility with 2_2_1 on backup LOG_WARN("failed to trans_ora_sys_priv_to_obj", K(ret)); } else if (FALSE_IT(opt_colnames_node = role_sys_obj_all_col_priv->children_[1])) { diff --git a/src/sql/resolver/ddl/ob_analyze_stmt_resolver.cpp b/src/sql/resolver/ddl/ob_analyze_stmt_resolver.cpp index 53d1a49390..ffcb1deda4 100644 --- a/src/sql/resolver/ddl/ob_analyze_stmt_resolver.cpp +++ b/src/sql/resolver/ddl/ob_analyze_stmt_resolver.cpp @@ -227,6 +227,7 @@ int ObAnalyzeStmtResolver::resolve_table_info(const ParseNode *table_node, table_name, false, table_schema))){ LOG_WARN("failed to get table schema", K(ret)); } else if (OB_ISNULL(table_schema)) { + ret = OB_TABLE_NOT_EXIST; LOG_WARN("null table schema", K(ret)); } else if (OB_FAIL(pl::ObDbmsStats::init_column_stat_params(*allocator_, *schema_checker_->get_schema_guard(), diff --git a/src/sql/resolver/ddl/ob_create_dblink_resolver.cpp b/src/sql/resolver/ddl/ob_create_dblink_resolver.cpp index 14af5eb335..05b6ed1013 100644 --- a/src/sql/resolver/ddl/ob_create_dblink_resolver.cpp +++ b/src/sql/resolver/ddl/ob_create_dblink_resolver.cpp @@ -185,7 +185,7 @@ int ObCreateDbLinkResolver::resolve(const ParseNode &parse_tree) ret = OB_ERR_UNEXPECTED; LOG_WARN("invalid parse tree", K(ret)); } else if (FALSE_IT(host_str.assign_ptr(host_node->str_value_, static_cast(host_node->str_len_)))) { - } else if (cut_host_string(host_str, ip_port, conn_str)) { + } else if (OB_FAIL(cut_host_string(host_str, ip_port, conn_str))) { LOG_WARN("failed to cut host string", K(ret), K(host_str)); } else if (OB_FAIL(host.parse_from_string(ip_port))) { LOG_WARN("parse ip port failed", K(ret), K(host_str), K(ip_port)); @@ -286,7 +286,7 @@ int ObCreateDbLinkResolver::resolve_opt_reverse_link(const ParseNode *node, sql: ret = OB_ERR_UNEXPECTED; LOG_WARN("invalid parse tree", K(ret)); } else if (FALSE_IT(host_str.assign_ptr(host_node->str_value_, static_cast(host_node->str_len_)))) { - } else if (cut_host_string(host_str, ip_port, conn_str)) { + } else if (OB_FAIL(cut_host_string(host_str, ip_port, conn_str))) { LOG_WARN("failed to cut host string", K(ret), K(host_str)); } else if (OB_FAIL(host.parse_from_string(ip_port))) { LOG_WARN("parse ip port failed", K(ret), K(host_str), K(ip_port)); diff --git a/src/sql/resolver/ddl/ob_purge_resolver.cpp b/src/sql/resolver/ddl/ob_purge_resolver.cpp index d35c92212d..a3f820b09a 100644 --- a/src/sql/resolver/ddl/ob_purge_resolver.cpp +++ b/src/sql/resolver/ddl/ob_purge_resolver.cpp @@ -114,9 +114,9 @@ int ObPurgeIndexResolver::resolve(const ParseNode &parser_tree) if (OB_ISNULL(table_node)) { ret = OB_ERR_UNEXPECTED; LOG_WARN("table_node should not be null", K(ret)); - } else if (resolve_table_relation_node(table_node, + } else if (OB_FAIL(resolve_table_relation_node(table_node, table_name, - db_name)){ + db_name))){ LOG_WARN("failed to resolve_table_relation_node", K(ret)); } else if (session_info_->get_database_name() != db_name){ ret = OB_NOT_SUPPORTED; diff --git a/src/sql/resolver/dml/ob_del_upd_resolver.cpp b/src/sql/resolver/dml/ob_del_upd_resolver.cpp index 4b5d2c10b7..a66d747982 100644 --- a/src/sql/resolver/dml/ob_del_upd_resolver.cpp +++ b/src/sql/resolver/dml/ob_del_upd_resolver.cpp @@ -606,6 +606,7 @@ int ObDelUpdResolver::resolve_additional_assignments(ObIArray LOG_WARN("no column expr returned", K(ret)); } else if (OB_ISNULL(col_item = stmt->get_column_item_by_id( table_item->table_id_, col_exprs.at(0)->get_column_id()))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("get column item failed", K(ret)); } else { assignment.column_expr_ = col_item->expr_; @@ -3597,9 +3598,11 @@ int ObDelUpdResolver::build_hidden_pk_assignment(ObTableAssignment &ta, ret = OB_ERR_UNEXPECTED; LOG_WARN("no column expr returned", K(ret)); } else if (OB_ISNULL(col_expr = col_exprs.at(0))) { - + ret = OB_ERR_UNEXPECTED; + LOG_WARN("no column expr returned", K(ret)); } else if (OB_ISNULL(col_item = stmt->get_column_item_by_id(table_item->table_id_, col_exprs.at(0)->get_column_id()))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("get column item failed", K(ret), "table_id", table_item->table_id_, "column_id", col_exprs.at(0)->get_column_id()); diff --git a/src/sql/resolver/dml/ob_select_resolver.cpp b/src/sql/resolver/dml/ob_select_resolver.cpp index f31a000d80..19d0441376 100644 --- a/src/sql/resolver/dml/ob_select_resolver.cpp +++ b/src/sql/resolver/dml/ob_select_resolver.cpp @@ -2451,7 +2451,7 @@ int ObSelectResolver::resolve_star_for_table_groups() //如果是only full group by，所有target list中的列都必须检查是否满足group约束 if (OB_FAIL(standard_group_checker_.add_unsettled_column(item.expr_))) { LOG_WARN("add unsettled column failed", K(ret)); - } else if (standard_group_checker_.add_unsettled_expr(item.expr_)) { + } else if (OB_FAIL(standard_group_checker_.add_unsettled_expr(item.expr_))) { LOG_WARN("add unsettled expr failed", K(ret)); } //对于select * from t1 group by c1, c2;这样的语句，*展开就是column，所以表达式以及表达式引用到的列都是自己 @@ -2608,8 +2608,8 @@ int ObSelectResolver::resolve_star(const ParseNode *node) if (!is_in_exists_subquery()) { ret = OB_ERR_NO_TABLES_USED; LOG_WARN("No tables used"); - } else if (ObRawExprUtils::build_const_int_expr(*params_.expr_factory_, - ObIntType, 1, c_expr)) { + } else if (OB_FAIL(ObRawExprUtils::build_const_int_expr(*params_.expr_factory_, + ObIntType, 1, c_expr))) { LOG_WARN("fail to build const int expr", K(ret)); } else if (OB_FALSE_IT(select_item.expr_ = c_expr)) { } else if (OB_FAIL(select_stmt->add_select_item(select_item))) { @@ -5579,7 +5579,7 @@ int ObSelectResolver::resolve_win_func_exprs(ObRawExpr *&expr, common::ObIArray< LOG_WARN("failed to handle compat with mysql ntile.", K(ret)); } else if (OB_ISNULL(final_win_expr = select_stmt->get_same_win_func_item(win_expr))) { ret = select_stmt->add_window_func_expr(win_expr); - } else if (ObRawExprUtils::replace_ref_column(expr, win_exprs.at(i), final_win_expr)) { + } else if (OB_FAIL(ObRawExprUtils::replace_ref_column(expr, win_exprs.at(i), final_win_expr))) { LOG_WARN("failed to replace ref column.", K(ret), K(*win_exprs.at(i))); } else {/*do nothing.*/} } diff --git a/src/sql/resolver/dml/ob_sql_hint.cpp b/src/sql/resolver/dml/ob_sql_hint.cpp index 63c8bf248f..94ed10ba93 100644 --- a/src/sql/resolver/dml/ob_sql_hint.cpp +++ b/src/sql/resolver/dml/ob_sql_hint.cpp @@ -2049,6 +2049,7 @@ int LogLeadingHint::init_leading_info_from_ordered_hint(const ObDMLStmt &stmt) LOG_WARN("failed to init leading infos from table.", K(ret)); } } else if (OB_ISNULL(semi_info = semi_infos.at(i - from_items.count()))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpect null semi info", K(ret)); } else if (OB_FAIL(leading_info.right_table_set_.add_member( stmt.get_table_bit_index(semi_info->right_table_id_)))) { diff --git a/src/sql/resolver/expr/ob_raw_expr.cpp b/src/sql/resolver/expr/ob_raw_expr.cpp index 0b0619a817..964b614db5 100644 --- a/src/sql/resolver/expr/ob_raw_expr.cpp +++ b/src/sql/resolver/expr/ob_raw_expr.cpp @@ -2757,6 +2757,7 @@ int ObObjAccessRawExpr::add_access_indexs(const ObIArray &ac if (OB_FAIL(access_indexs_.push_back(tmp_idx))) { LOG_WARN("store access index failed", K(ret)); } else if (OB_ISNULL(access_idx.get_sysfunc_)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("null param function", K(ret), K(access_idx.var_name_)); } else if (OB_FAIL(add_param_expr(access_idx.get_sysfunc_))) { LOG_WARN("Failed to add param expr", K(ret)); @@ -3511,6 +3512,7 @@ int ObAggFunRawExpr::get_name_internal(char *buf, const int64_t buf_len, int64_t if (OB_FAIL(ret)) { //do nothing } else if (OB_ISNULL(order_items_.at(i).expr_)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("expr is NULL", K(i), K(ret)); } else if (OB_FAIL(order_items_.at(i).expr_->get_name(buf, buf_len, pos, type))) { LOG_WARN("fail to get_name", K(i), K(ret)); diff --git a/src/sql/resolver/expr/ob_raw_expr_copier.h b/src/sql/resolver/expr/ob_raw_expr_copier.h index bcce9cf94f..2ca648b6f3 100644 --- a/src/sql/resolver/expr/ob_raw_expr_copier.h +++ b/src/sql/resolver/expr/ob_raw_expr_copier.h @@ -43,6 +43,7 @@ public: if (OB_FAIL(copy(input_exprs.at(i), temp_expr))) { SQL_RESV_LOG(WARN, "failed to copy expr", K(ret)); } else if (OB_ISNULL(temp_expr)) { + ret = common::OB_ERR_UNEXPECTED; SQL_RESV_LOG(WARN, "null expr", K(ret)); } else { T cast_expr = static_cast(temp_expr); diff --git a/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp b/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp index 962f714238..9f82a37bbf 100644 --- a/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp +++ b/src/sql/resolver/expr/ob_raw_expr_resolver_impl.cpp @@ -1158,6 +1158,7 @@ int ObRawExprResolverImpl::process_multiset_node(const ParseNode *node, ObRawExp } else if (OB_FAIL(process_operator_node(node, expr))) { LOG_WARN("process node failed.", K(ret)); } else if (OB_ISNULL(expr)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("expr is null", K(ret)); } else { if (T_OP_MULTISET == node->type_) { @@ -1682,7 +1683,7 @@ int ObRawExprResolverImpl::process_sys_connect_by_path_node(const ParseNode *nod } else if (OB_UNLIKELY(false == is_sys_connect_by_path_expr_valid_scope(ctx_.current_scope_))) { ret = OB_ERR_CBY_CONNECT_BY_PATH_NOT_ALLOWED; LOG_WARN("Connect by path not allowed here", K(ret)); - } else if (ctx_.expr_factory_.create_raw_expr(T_FUN_SYS_CONNECT_BY_PATH, path_expr)) { + } else if (OB_FAIL(ctx_.expr_factory_.create_raw_expr(T_FUN_SYS_CONNECT_BY_PATH, path_expr))) { LOG_WARN("fail to create raw expr", K(ret)); } else if (OB_ISNULL(path_expr)) { ret = OB_ERR_UNEXPECTED; @@ -3282,6 +3283,7 @@ int ObRawExprResolverImpl::process_between_node(const ParseNode *node, ObRawExpr if (OB_FAIL(recursive_resolve(node->children_[i], btw_params[i]))) { SQL_RESV_LOG(WARN, "resolve child expr failed", K(ret), K(i)); } else if (OB_ISNULL(btw_params[i])) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpected null", K(ret), K(i)); } } @@ -3291,6 +3293,7 @@ int ObRawExprResolverImpl::process_between_node(const ParseNode *node, ObRawExpr } else if (OB_FAIL(recursive_resolve(node->children_[0], btw_params[BTW_PARAM_NUM]))) { SQL_RESV_LOG(WARN, "resolve child expr failed", K(ret), K(BTW_PARAM_NUM)); } else if (OB_ISNULL(btw_params[BTW_PARAM_NUM])) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpected null", K(ret), K(BTW_PARAM_NUM)); } if (OB_SUCC(ret) && lib::is_mysql_mode()) { diff --git a/src/sql/resolver/ob_resolver_utils.cpp b/src/sql/resolver/ob_resolver_utils.cpp index b7e398eb16..bcfc8c2246 100644 --- a/src/sql/resolver/ob_resolver_utils.cpp +++ b/src/sql/resolver/ob_resolver_utils.cpp @@ -6291,6 +6291,7 @@ int ObResolverUtils::check_pk_idx_duplicate(const ObTableSchema &table_schema, if (OB_FAIL(rowkey.get_column_id(rowkey_idx, column_id))) { LOG_WARN("fail to get column id", K(ret)); } else if (OB_ISNULL(column = table_schema.get_column_schema(column_id))) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("fail to get column schema", K(ret), K(column_id), K(rowkey)); } else if (column->is_hidden()) { // skip hidden pk col diff --git a/src/sql/resolver/ob_stmt_resolver.h b/src/sql/resolver/ob_stmt_resolver.h index a122820bd5..f98190749c 100644 --- a/src/sql/resolver/ob_stmt_resolver.h +++ b/src/sql/resolver/ob_stmt_resolver.h @@ -119,6 +119,7 @@ public: } else if (OB_FAIL(params_.stmt_factory_->create_stmt(stmt))) { SQL_RESV_LOG(WARN, "create stmt failed", K(ret)); } else if (OB_ISNULL(stmt)) { + ret = common::OB_ERR_UNEXPECTED; SQL_RESV_LOG(WARN, "create stmt success, but stmt is null"); } else { stmt_ = stmt; diff --git a/src/sql/resolver/prepare/ob_execute_resolver.cpp b/src/sql/resolver/prepare/ob_execute_resolver.cpp index 7f057d4318..1fe915e241 100644 --- a/src/sql/resolver/prepare/ob_execute_resolver.cpp +++ b/src/sql/resolver/prepare/ob_execute_resolver.cpp @@ -55,6 +55,7 @@ int ObExecuteResolver::resolve(const ParseNode &parse_tree) } else if (OB_FAIL(session_info_->get_ps_session_info(ps_id, ps_session_info))) { LOG_WARN("failed to get ps session info", K(ret)); } else if (OB_ISNULL(ps_session_info)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("ps session info is NULL", K(stmt_name), K(ps_id), K(ret)); } else { ps_type = ps_session_info->get_stmt_type(); diff --git a/src/sql/rewrite/ob_query_range.cpp b/src/sql/rewrite/ob_query_range.cpp index 299627fb15..570be3f6df 100644 --- a/src/sql/rewrite/ob_query_range.cpp +++ b/src/sql/rewrite/ob_query_range.cpp @@ -8648,6 +8648,7 @@ int ObQueryRange::add_prefix_pattern_constraint(const ObRawExpr *expr) if (OB_FAIL(ObRawExprUtils::get_real_expr_without_cast(expr, expr))) { LOG_WARN("fail to get real expr", K(ret)); } else if (OB_ISNULL(expr)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpected null", K(ret)); } else if (T_FUN_SYS_PREFIX_PATTERN == expr->get_expr_type()) { ObExprConstraint cons(const_cast(expr), PreCalcExprExpectResult::PRE_CALC_RESULT_NOT_NULL); diff --git a/src/sql/rewrite/ob_transform_dblink.cpp b/src/sql/rewrite/ob_transform_dblink.cpp index 2b303a9cb1..1005a71242 100644 --- a/src/sql/rewrite/ob_transform_dblink.cpp +++ b/src/sql/rewrite/ob_transform_dblink.cpp @@ -536,10 +536,10 @@ int ObTransformDBlink::collect_link_table(ObDMLStmt *stmt, if (OB_ISNULL(semi_info = stmt->get_semi_infos().at(i))) { ret = OB_ERR_UNEXPECTED; LOG_WARN("unexpect null stmt", K(ret)); - } else if (inner_collect_link_table(stmt, + } else if (OB_FAIL(inner_collect_link_table(stmt, semi_info, helpers, - all_table_from_one_dblink)) { + all_table_from_one_dblink))) { LOG_WARN("failed to collect link table", K(ret)); } } diff --git a/src/sql/rewrite/ob_transform_expr_pullup.cpp b/src/sql/rewrite/ob_transform_expr_pullup.cpp index 46220a55b0..993d5a9ee1 100644 --- a/src/sql/rewrite/ob_transform_expr_pullup.cpp +++ b/src/sql/rewrite/ob_transform_expr_pullup.cpp @@ -527,7 +527,7 @@ int ObTransformExprPullup::search_expr_cannot_pullup(ObRawExpr *expr, if (OB_FAIL(expr_cannot_pullup.push_back(expr))) { LOG_WARN("fail to push back expr", K(ret)); } - } else if (expr_map.get_ref_count(expr, ref_count)) { + } else if (OB_FAIL(expr_map.get_ref_count(expr, ref_count))) { LOG_WARN("failed to get expr ref count", K(ret)); } else if (ref_count > 1) { if (OB_FAIL(expr_cannot_pullup.push_back(expr))) { diff --git a/src/sql/rewrite/ob_transform_join_limit_pushdown.cpp b/src/sql/rewrite/ob_transform_join_limit_pushdown.cpp index 8f6d3d0b70..e5bf11d351 100644 --- a/src/sql/rewrite/ob_transform_join_limit_pushdown.cpp +++ b/src/sql/rewrite/ob_transform_join_limit_pushdown.cpp @@ -857,10 +857,10 @@ int ObTransformJoinLimitPushDown::do_transform(ObSelectStmt *select_stmt, } else if (OB_FAIL(ObOptimizerUtil::remove_item(select_stmt->get_semi_infos(), helper.pushdown_semi_infos_))) { LOG_WARN("failed to remove semi infos from stmt", K(ret)); - } else if (ObTransformUtils::add_new_table_item(ctx_, + } else if (OB_FAIL(ObTransformUtils::add_new_table_item(ctx_, select_stmt, NULL, - helper.view_table_)) { + helper.view_table_))) { LOG_WARN("failed to create table item", K(ret)); } else if (OB_FAIL(select_stmt->add_from_item(helper.view_table_->table_id_, false))) { LOG_WARN("failed to add from item", K(ret)); diff --git a/src/sql/rewrite/ob_transform_pre_process.cpp b/src/sql/rewrite/ob_transform_pre_process.cpp index 9582956f1e..08edb0ceb9 100644 --- a/src/sql/rewrite/ob_transform_pre_process.cpp +++ b/src/sql/rewrite/ob_transform_pre_process.cpp @@ -2860,6 +2860,7 @@ int ObTransformPreProcess::recursive_replace_func_is_serving_tenant(ObDMLStmt &s ret = OB_INVALID_ARGUMENT; LOG_WARN("convert server addr to ip failed", K(ret), K(i), K(server)); } else if (OB_ISNULL(row_op) || OB_ISNULL(ip_expr) || OB_ISNULL(port_expr)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("expr is null", K(row_op), K(ip_expr), K(port_expr)); } else { ip_obj.set_varchar(ObString(ip_buf)); @@ -7954,7 +7955,7 @@ int ObTransformPreProcess::mock_select_list_for_ins_select(ObDMLStmt &batch_stmt } else if (OB_ISNULL(param_store = &plan_ctx->get_param_store())) { ret = OB_ERR_UNEXPECTED; LOG_WARN("param store is null", K(ret)); - } else if (batch_stmt.get_child_stmt_size(child_size)) { + } else if (OB_FAIL(batch_stmt.get_child_stmt_size(child_size))) { LOG_WARN("get child size failed", K(ret)); } else if (child_size > 0) { ret = OB_BATCHED_MULTI_STMT_ROLLBACK; diff --git a/src/sql/rewrite/ob_transform_subquery_coalesce.cpp b/src/sql/rewrite/ob_transform_subquery_coalesce.cpp index f915882639..cc751f7366 100644 --- a/src/sql/rewrite/ob_transform_subquery_coalesce.cpp +++ b/src/sql/rewrite/ob_transform_subquery_coalesce.cpp @@ -1135,9 +1135,9 @@ int ObTransformSubqueryCoalesce::merge_any_all_subqueries(ObQueryRefRawExpr *any ret = OB_ERR_UNEXPECTED; LOG_WARN("any/all exprs are not valid", K(ret), K(expr_factory), K(stmt_factory), K(any_query_ref), K(all_query_ref), K(any_stmt), K(all_stmt)); - } else if (ObRawExprCopier::copy_expr_node(*expr_factory, + } else if (OB_FAIL(ObRawExprCopier::copy_expr_node(*expr_factory, trans_param.any_expr_, - new_any_all_query)) { + new_any_all_query))) { LOG_WARN("failed to copy expr node", K(ret)); } else if (OB_FAIL(expr_factory->create_raw_expr(T_REF_QUERY, new_query_ref))) { LOG_WARN("failed to create query ref expr", K(ret)); diff --git a/src/sql/rewrite/ob_transform_utils.cpp b/src/sql/rewrite/ob_transform_utils.cpp index 5b435e885e..efdf71421d 100644 --- a/src/sql/rewrite/ob_transform_utils.cpp +++ b/src/sql/rewrite/ob_transform_utils.cpp @@ -484,6 +484,7 @@ int ObTransformUtils::is_columns_unique(const ObIArray &exprs, LOG_WARN("failed to get table schema", K(ret), "index_id", simple_index_infos.at(i).table_id_); } else if (OB_ISNULL(index_schema)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("index schema should not be null", K(ret)); } else if (index_schema->is_unique_index() && index_schema->get_index_column_num() > 0) { const ObIndexInfo &index_info = index_schema->get_index_info(); @@ -634,6 +635,7 @@ int ObTransformUtils::create_new_column_expr(ObTransformerCtx *ctx, } else if (OB_FAIL(ctx->expr_factory_->create_raw_expr(T_REF_COLUMN, new_column_ref))) { LOG_WARN("failed to create a new column ref expr", K(ret)); } else if (OB_ISNULL(new_column_ref)) { + ret = OB_ERR_UNEXPECTED; LOG_WARN("new_column_ref should not be null", K(ret)); } else if (OB_FAIL(is_expr_not_null(ctx, table_item.ref_query_, diff --git a/src/sql/session/ob_sql_session_info.cpp b/src/sql/session/ob_sql_session_info.cpp index 3af77e4b06..fe7c5a10e2 100644 --- a/src/sql/session/ob_sql_session_info.cpp +++ b/src/sql/session/ob_sql_session_info.cpp @@ -2681,6 +2681,7 @@ inline int ObSQLSessionInfo::init_mem_context(uint64_t tenant_id) if (OB_FAIL(ROOT_CONTEXT->CREATE_CONTEXT(mem_context_, param))) { SQL_ENG_LOG(WARN, "create entity failed", K(ret)); } else if (OB_ISNULL(mem_context_)) { + ret = OB_ALLOCATE_MEMORY_FAILED; SQL_ENG_LOG(WARN, "mem entity is null", K(ret)); } } @@ -3117,11 +3118,11 @@ int ObAppInfoEncoder::deserialize(ObSQLSessionInfo &sess, const char *buf, const ObSQLSessionInfo::ApplicationInfo app_info; if (OB_FAIL(app_info.deserialize(buf, length, pos))) { LOG_WARN("failed to deserialize application info.", K(ret), K(pos), K(length)); - } else if (sess.set_client_info(app_info.client_info_)) { + } else if (OB_FAIL(sess.set_client_info(app_info.client_info_))) { LOG_WARN("failed to set client info", K(ret)); - } else if (sess.set_action_name(app_info.action_name_)) { + } else if (OB_FAIL(sess.set_action_name(app_info.action_name_))) { LOG_WARN("failed to set action name", K(ret)); - } else if (sess.set_module_name(app_info.module_name_)) { + } else if (OB_FAIL(sess.set_module_name(app_info.module_name_))) { LOG_WARN("failed to set module name", K(ret)); } else { LOG_TRACE("get encoder app info", K(sess.get_client_app_info().module_name_),