diff --git a/src/sql/optimizer/ob_explain_log_plan.cpp b/src/sql/optimizer/ob_explain_log_plan.cpp index 46d342b45d..96284dc5ba 100644 --- a/src/sql/optimizer/ob_explain_log_plan.cpp +++ b/src/sql/optimizer/ob_explain_log_plan.cpp @@ -52,8 +52,6 @@ int ObExplainLogPlan::generate_normal_raw_plan() create(optimizer_context_, *child_stmt))) { ret = OB_ALLOCATE_MEMORY_FAILED; LOG_ERROR("failed to create log plan for explain stmt"); - } else if (OB_FAIL(child_plan->init_plan_info())) { - LOG_WARN("failed to init equal_sets"); } else if (OB_FAIL(child_plan->generate_plan())) { LOG_WARN("failed to generate plan tree for explain", K(ret)); } else if (OB_FAIL(ObCodeGenerator::detect_batch_size(*child_plan, batch_size))) { diff --git a/src/sql/optimizer/ob_join_order.cpp b/src/sql/optimizer/ob_join_order.cpp index a98fbefc0c..dd313c0b5a 100644 --- a/src/sql/optimizer/ob_join_order.cpp +++ b/src/sql/optimizer/ob_join_order.cpp @@ -6510,8 +6510,6 @@ int ObJoinOrder::generate_subquery_paths(PathHelper &helper) LOG_WARN("failed to create plan", K(ret)); } else if (OB_FAIL(log_plan->add_pushdown_filters(helper.pushdown_filters_))) { LOG_WARN("failed to add pushdown filters", K(ret)); - } else if (OB_FAIL(log_plan->init_plan_info())) { - LOG_WARN("failed to init equal sets", K(ret)); } else { log_plan->set_is_subplan_scan(true); if (parent_stmt->is_insert_stmt()) { diff --git a/src/sql/optimizer/ob_log_plan.cpp b/src/sql/optimizer/ob_log_plan.cpp index 143db9170f..81dee07256 100644 --- a/src/sql/optimizer/ob_log_plan.cpp +++ b/src/sql/optimizer/ob_log_plan.cpp @@ -3917,8 +3917,6 @@ int ObLogPlan::generate_subplan_for_query_ref(ObQueryRefRawExpr *query_ref, } else if (OB_ISNULL(logical_plan = opt_ctx.get_log_plan_factory().create(opt_ctx, *subquery))) { ret = OB_ALLOCATE_MEMORY_FAILED; LOG_WARN("failed to create plan", K(ret), K(opt_ctx.get_query_ctx()->get_sql_stmt())); - } else if (OB_FAIL(logical_plan->init_plan_info())) { - LOG_WARN("failed to init equal sets" ,K(ret)); } else if (OB_FAIL(static_cast(logical_plan)->generate_raw_plan())) { LOG_WARN("failed to optimize sub-select", K(ret)); } else { @@ -11197,10 +11195,14 @@ int ObLogPlan::generate_raw_plan() ret = OB_ERR_UNEXPECTED; LOG_WARN("get unexpected null", K(ret)); } else if (FALSE_IT(dblink_id = stmt->get_dblink_id())) { - } else if (OB_INVALID_ID == dblink_id && OB_FAIL(generate_normal_raw_plan())) { + } else if (OB_INVALID_ID != dblink_id) { + if (OB_FAIL(generate_dblink_raw_plan())) { + LOG_WARN("fail to generate dblink raw plan", K(ret)); + } + } else if (OB_FAIL(init_plan_info())) { + LOG_WARN("failed to init equal_sets"); + } else if (OB_FAIL(generate_normal_raw_plan())) { LOG_WARN("fail to generate normal raw plan", K(ret)); - } else if (OB_INVALID_ID != dblink_id && OB_FAIL(generate_dblink_raw_plan())) { - LOG_WARN("fail to generate dblink raw plan", K(ret)); } return ret; } diff --git a/src/sql/optimizer/ob_optimizer.cpp b/src/sql/optimizer/ob_optimizer.cpp index f62b82ff5f..d3c8a4ac01 100644 --- a/src/sql/optimizer/ob_optimizer.cpp +++ b/src/sql/optimizer/ob_optimizer.cpp @@ -54,8 +54,6 @@ int ObOptimizer::optimize(ObDMLStmt &stmt, ObLogPlan *&logical_plan) } else if (OB_ISNULL(plan = ctx_.get_log_plan_factory().create(ctx_, stmt))) { ret = OB_ALLOCATE_MEMORY_FAILED; LOG_WARN("failed to create plan", K(ret)); - } else if (OB_FAIL(plan->init_plan_info())) { - LOG_WARN("failed to init equal sets", K(ret)); } else if (OB_FAIL(plan->generate_plan())) { LOG_WARN("failed to perform optimization", K(ret)); } else if (OB_FAIL(plan->add_extra_dependency_table())) { @@ -107,8 +105,6 @@ int ObOptimizer::get_optimization_cost(ObDMLStmt &stmt, LOG_WARN("failed to init env info", K(ret)); } else if (OB_FAIL(generate_plan_for_temp_table(stmt))) { LOG_WARN("failed to generate plan for temp table", K(ret)); - } else if (OB_FAIL(plan->init_plan_info())) { - LOG_WARN("failed to init plan info", K(ret)); } else if (OB_FAIL(plan->generate_raw_plan())) { LOG_WARN("failed to perform optimization", K(ret)); } else { @@ -140,8 +136,6 @@ int ObOptimizer::generate_plan_for_temp_table(ObDMLStmt &stmt) ret = OB_ALLOCATE_MEMORY_FAILED; LOG_WARN("failed to create logical plan", K(temp_plan), K(ret)); } else if (OB_FALSE_IT(temp_plan->set_temp_table_info(temp_table_info))) { - } else if (OB_FAIL(temp_plan->init_plan_info())) { - LOG_WARN("failed to init equal sets", K(ret)); } else { OPT_TRACE_TITLE("begin generate plan for temp table ", temp_table_info->table_name_); } diff --git a/src/sql/optimizer/ob_select_log_plan.cpp b/src/sql/optimizer/ob_select_log_plan.cpp index 255e3e6e4f..2c0d67f3dd 100644 --- a/src/sql/optimizer/ob_select_log_plan.cpp +++ b/src/sql/optimizer/ob_select_log_plan.cpp @@ -4352,8 +4352,6 @@ int ObSelectLogPlan::generate_child_plan_for_set(const ObDMLStmt *sub_stmt, // do nothing } else if (OB_FAIL(sub_plan->add_pushdown_filters(pushdown_filters))) { LOG_WARN("failed to add pushdown filters", K(ret)); - } else if (OB_FAIL(sub_plan->init_plan_info())) { - LOG_WARN("failed to init equal sets", K(ret)); } else if (OB_FAIL(sub_plan->generate_raw_plan())) { LOG_WARN("Failed to generate plan for sub_stmt", K(ret)); } else if (OB_FAIL(init_selectivity_metas_for_set(sub_plan, child_offset))) {