From c04244902d251ca53124f9d3f2a6b013bf2b4f25 Mon Sep 17 00:00:00 2001 From: LINxiansheng Date: Tue, 7 Dec 2021 16:00:44 +0800 Subject: [PATCH] fix [WhiteScan] [EVALUATION_ORDER]#677#681 Co-authored-by: BlaBlaBlaWang Co-authored-by: Dousir9 <736191200@qq.com> --- .../ob_zone_server_recovery_machine.cpp | 4 ++-- src/sql/code_generator/ob_static_engine_cg.cpp | 6 +++--- src/sql/engine/set/ob_hash_except_op.cpp | 2 +- src/sql/rewrite/ob_expand_aggregate_utils.cpp | 15 ++++++++------- src/storage/ob_partition_migrator.cpp | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/rootserver/ob_zone_server_recovery_machine.cpp b/src/rootserver/ob_zone_server_recovery_machine.cpp index 8d4ed1c7ce..f12e00954e 100644 --- a/src/rootserver/ob_zone_server_recovery_machine.cpp +++ b/src/rootserver/ob_zone_server_recovery_machine.cpp @@ -1866,8 +1866,8 @@ int ObServerRecoveryInstance::switch_state(ObRecoveryTask* task, const ZoneServe } else if (OB_UNLIKELY(nullptr == task)) { ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid argument", K(ret)); - } else if (OB_FAIL(OB_FAIL(persis_info_proxy.update_server_recovery_status( - task->zone_, task->server_, task->svr_seq_, task->rescue_server_, task->progress_, new_progress)))) { + } else if (OB_FAIL(persis_info_proxy.update_server_recovery_status( + task->zone_, task->server_, task->svr_seq_, task->rescue_server_, task->progress_, new_progress))) { LOG_WARN("fail to switch server recovery status", K(ret), "server", task->server_); } else { ZoneServerRecoveryProgress cur_progress = task->progress_; diff --git a/src/sql/code_generator/ob_static_engine_cg.cpp b/src/sql/code_generator/ob_static_engine_cg.cpp index e4c063a97b..af0c2b9ff4 100644 --- a/src/sql/code_generator/ob_static_engine_cg.cpp +++ b/src/sql/code_generator/ob_static_engine_cg.cpp @@ -2245,7 +2245,7 @@ int ObStaticEngineCG::convert_global_index_delete_info(ObLogDelUpd& op, const Ta if (OB_SUCC(ret)) { int64_t index_col_cnt = index_exprs.count(); dml_subplan.access_exprs_.set_allocator(&phy_plan_->get_allocator()); - if (OB_FAIL(OB_FAIL(dml_subplan.access_exprs_.init(index_col_cnt)))) { + if (OB_FAIL(dml_subplan.access_exprs_.init(index_col_cnt))) { LOG_WARN("fail to allocate array", K(ret)); } } @@ -2440,7 +2440,7 @@ int ObStaticEngineCG::convert_update_subplan( int64_t access_cnt = index_dml_info.column_exprs_.count() + index_dml_info.assignments_.count() + 1 /*lock_row_flag_expr*/; dml_subplan.access_exprs_.set_allocator(&phy_plan_->get_allocator()); - if (OB_FAIL(OB_FAIL(dml_subplan.access_exprs_.init(access_cnt)))) { + if (OB_FAIL(dml_subplan.access_exprs_.init(access_cnt))) { LOG_WARN("fail to allocate array", K(ret)); } } @@ -2941,7 +2941,7 @@ int ObStaticEngineCG::convert_multi_table_insert_up_info(ObLogInsert& op, ObMult SeDMLSubPlan& insert_subplan = subplans.at(ObMultiPartUpdateOp::INSERT_OP); int64_t access_cnt = index_dml_info.column_exprs_.count(); insert_subplan.access_exprs_.set_allocator(&phy_plan_->get_allocator()); - if (OB_FAIL(OB_FAIL(insert_subplan.access_exprs_.init(access_cnt)))) { + if (OB_FAIL(insert_subplan.access_exprs_.init(access_cnt))) { LOG_WARN("fail to allocate array", K(ret)); } OZ(generate_exprs_replace_spk(index_dml_info.column_exprs_, insert_subplan.access_exprs_)); diff --git a/src/sql/engine/set/ob_hash_except_op.cpp b/src/sql/engine/set/ob_hash_except_op.cpp index 99ab3e522d..f21223ff0b 100644 --- a/src/sql/engine/set/ob_hash_except_op.cpp +++ b/src/sql/engine/set/ob_hash_except_op.cpp @@ -165,7 +165,7 @@ int ObHashExceptOp::inner_get_next_row() } } else { // insert and return row - if (OB_FAIL(OB_FAIL(hp_infras_.insert_row(*cur_exprs, exists, inserted)))) { + if (OB_FAIL(hp_infras_.insert_row(*cur_exprs, exists, inserted))) { LOG_WARN("failed to insert row", K(ret)); } else if (inserted) { got_row = true; diff --git a/src/sql/rewrite/ob_expand_aggregate_utils.cpp b/src/sql/rewrite/ob_expand_aggregate_utils.cpp index d88b232c9e..df9a2b6ea1 100644 --- a/src/sql/rewrite/ob_expand_aggregate_utils.cpp +++ b/src/sql/rewrite/ob_expand_aggregate_utils.cpp @@ -359,7 +359,7 @@ int ObExpandAggregateUtils::expand_covar_expr(ObTransformerCtx* ctx, ObAggFunRaw ObRawExpr* minus_expr2 = NULL; ObRawExpr* ne_expr = NULL; ObRawExpr* case_when_expr = NULL; - if (OB_FAIL(OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr)))) { + if (OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr))) { LOG_WARN("failed to build null expr", K(ret)); } else if (OB_FAIL(ObRawExprUtils::build_const_int_expr(*ctx->expr_factory_, ObIntType, 1, one_expr))) { LOG_WARN("failed to build const int expr", K(ret)); @@ -418,7 +418,7 @@ int ObExpandAggregateUtils::expand_corr_expr(ObTransformerCtx* ctx, ObAggFunRawE ObRawExpr* ne_expr = NULL; ObRawExpr* case_when_expr = NULL; ObConstRawExpr* zero_expr = NULL; - if (OB_FAIL(OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr)))) { + if (OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr))) { LOG_WARN("failed to build null expr", K(ret)); } else if (OB_FAIL(build_special_case_when_expr( *ctx->expr_factory_, parma_expr1, parma_expr2, parma_expr1, case_when_expr1))) { @@ -653,7 +653,7 @@ int ObExpandAggregateUtils::expand_var_expr(ObTransformerCtx* ctx, ObAggFunRawEx ObRawExpr* ne_expr = NULL; ObRawExpr* case_when_expr = NULL; ObRawExpr* null_expr = NULL; - if (OB_FAIL(OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr)))) { + if (OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr))) { LOG_WARN("failed to build null expr", K(ret)); } else if (OB_FAIL(ObRawExprUtils::build_const_int_expr(*ctx->expr_factory_, ObIntType, 1, one_expr))) { LOG_WARN("failed to build const int expr", K(ret)); @@ -766,7 +766,7 @@ int ObExpandAggregateUtils::expand_regr_slope_expr(ObTransformerCtx* ctx, ObAggF var_pop_expr->set_expr_level(aggr_expr->get_expr_level()); if (OB_FAIL(expand_var_expr(ctx, var_pop_expr, right_div_expr, new_aggr_items))) { LOG_WARN("failed to expand var expr", K(ret)); - } else if (OB_FAIL(OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr)))) { + } else if (OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr))) { LOG_WARN("failed to build null expr", K(ret)); } else if (OB_FAIL(ObRawExprUtils::build_const_int_expr(*ctx->expr_factory_, ObIntType, 0, zero_expr))) { LOG_WARN("failed to build const int expr", K(ret)); @@ -947,7 +947,7 @@ int ObExpandAggregateUtils::expand_regr_r2_expr(ObTransformerCtx* ctx, ObAggFunR ObRawExpr* eq_expr2 = NULL; ObRawExpr* power_param_expr = NULL; ObSysFunRawExpr* power_expr = NULL; - if (OB_FAIL(OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr)))) { + if (OB_FAIL(ObRawExprUtils::build_null_expr(*ctx->expr_factory_, null_expr))) { LOG_WARN("failed to build null expr", K(ret)); } else if (OB_FAIL(ObRawExprUtils::build_const_int_expr(*ctx->expr_factory_, ObIntType, 1, one_expr))) { LOG_WARN("failed to build const int expr", K(ret)); @@ -1173,9 +1173,10 @@ int ObExpandAggregateUtils::build_special_case_when_expr(ObRawExprFactory& expr_ ObRawExpr* is_not_expr2 = NULL; ObRawExpr* and_expr = NULL; case_when_expr = NULL; - if (OB_FAIL(OB_FAIL(ObRawExprUtils::build_null_expr(expr_factory, null_expr)))) { + if (OB_FAIL(ObRawExprUtils::build_null_expr(expr_factory, null_expr))) { LOG_WARN("failed to build null expr", K(ret)); - } else if (ObRawExprUtils::build_const_bool_expr(&expr_factory, false_expr, false)) { + } else if (OB_FAIL( + ObRawExprUtils::build_const_bool_expr(&expr_factory, false_expr, false))) { LOG_WARN("failed to build const bool expr", K(ret)); } else if (OB_FAIL( ObRawExprUtils::build_is_not_expr(expr_factory, param_expr1, null_expr, false_expr, is_not_expr1))) { diff --git a/src/storage/ob_partition_migrator.cpp b/src/storage/ob_partition_migrator.cpp index 324783638f..8c31ba0d04 100644 --- a/src/storage/ob_partition_migrator.cpp +++ b/src/storage/ob_partition_migrator.cpp @@ -9287,8 +9287,8 @@ int ObMigrateTaskGeneratorTask::build_backup_backupset_ctx_v2(ObBackupBackupsetP if (compatible >= ObBackupCompatibleVersion::OB_BACKUP_COMPATIBLE_VERSION_V3) { if (OB_FAIL(get_backup_backup_minor_task_id(path_info, pg_key, minor_task_id))) { LOG_WARN("failed to get backup backup minor task id", KR(ret), K(path_info), K(pg_key)); - } else if (OB_FAIL(OB_FAIL(ObBackupPathUtil::get_tenant_pg_minor_data_path( - path_info, table_id, partition_id, minor_task_id, minor_pg_path)))) { + } else if (OB_FAIL(ObBackupPathUtil::get_tenant_pg_minor_data_path( + path_info, table_id, partition_id, minor_task_id, minor_pg_path))) { LOG_WARN("failed to get tenant pg minor data path", KR(ret), K(path_info), K(pg_key)); // TODO()Backup backup Fix it //} else if (OB_FAIL(util.list_files(minor_pg_path.get_obstr(), -- GitLab