fix bug, merge helper not exist

obdev · footka · callmezhuoran · ob-robot · commit 277366945ad0 · 2026-01-07T06:35:41.000Z
Co-authored-by: footka &lt;672528926@qq.com&gt;
Co-authored-by: callmezhuoran &lt;callmezhuoran@foxmail.com&gt;
diff --git a/src/storage/ddl/ob_ddl_merge_task.cpp b/src/storage/ddl/ob_ddl_merge_task.cpp
@@ -150,7 +150,9 @@ int ObDDLTableMergeDag::init_tablet_ctx()
     /* only sn major merge need to load storage schema from user data
      * otherwise, load from cur tablet
     */
-    if (ddl_param_.is_commit_ && !is_cs_replica_for_full_direct_load &&
+    if (OB_FAIL(tablet_ctx_->merge_ctx_.init(ddl_param_.direct_load_type_))) {
+      LOG_WARN("failed to get merge helper", K(ret));
+    } else if (ddl_param_.is_commit_ && !is_cs_replica_for_full_direct_load &&
                (ddl_param_.direct_load_type_ == SN_IDEM_DIRECT_LOAD_DDL || ddl_param_.direct_load_type_ == SN_IDEM_DIRECT_LOAD_DATA)) {
       tablet_ctx_->tablet_param_.storage_schema_ = &ddl_param_.user_data_.storage_schema_;
     } else if (is_incremental_major_direct_load(ddl_param_.direct_load_type_)) {
@@ -159,8 +161,6 @@ int ObDDLTableMergeDag::init_tablet_ctx()
     } else {
       if (OB_FAIL(tablet_handle.get_obj()->load_storage_schema(arena_, tablet_ctx_->tablet_param_.storage_schema_))) {
         LOG_WARN("failed to load storage schema", K(ret));
-      } else if (OB_FAIL(tablet_ctx_->merge_ctx_.init(ddl_param_.direct_load_type_))) {
-        LOG_WARN("failed to get merge helper", K(ret));
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,9 @@ int ObDDLTableMergeDag::init_tablet_ctx()`
`150`	`150`	`/* only sn major merge need to load storage schema from user data`
`151`	`151`	`* otherwise, load from cur tablet`
`152`	`152`	`*/`
`153`		`- if (ddl_param_.is_commit_ && !is_cs_replica_for_full_direct_load &&`
	`153`	`+ if (OB_FAIL(tablet_ctx_->merge_ctx_.init(ddl_param_.direct_load_type_))) {`
	`154`	`+ LOG_WARN("failed to get merge helper", K(ret));`
	`155`	`+ } else if (ddl_param_.is_commit_ && !is_cs_replica_for_full_direct_load &&`
`154`	`156`	`(ddl_param_.direct_load_type_ == SN_IDEM_DIRECT_LOAD_DDL \|\| ddl_param_.direct_load_type_ == SN_IDEM_DIRECT_LOAD_DATA)) {`
`155`	`157`	`tablet_ctx_->tablet_param_.storage_schema_ = &ddl_param_.user_data_.storage_schema_;`
`156`	`158`	`} else if (is_incremental_major_direct_load(ddl_param_.direct_load_type_)) {`
`@@ -159,8 +161,6 @@ int ObDDLTableMergeDag::init_tablet_ctx()`
`159`	`161`	`} else {`
`160`	`162`	`if (OB_FAIL(tablet_handle.get_obj()->load_storage_schema(arena_, tablet_ctx_->tablet_param_.storage_schema_))) {`
`161`	`163`	`LOG_WARN("failed to load storage schema", K(ret));`
`162`		`- } else if (OB_FAIL(tablet_ctx_->merge_ctx_.init(ddl_param_.direct_load_type_))) {`
`163`		`- LOG_WARN("failed to get merge helper", K(ret));`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`}`