From b6e830cb4f62ba90d0440889d85dbd124b817e44 Mon Sep 17 00:00:00 2001
From: leftgeek <1094669802@qq.com>
Date: Tue, 18 Jun 2024 01:09:18 +0000
Subject: [PATCH] Add placeholder for ddl_task_id_ in direct load

---
 src/sql/das/ob_das_dml_ctx_define.cpp | 4 +++-
 src/sql/das/ob_das_dml_ctx_define.h   | 7 +++++--
 src/storage/access/ob_dml_param.cpp   | 4 +++-
 src/storage/access/ob_dml_param.h     | 4 +++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/sql/das/ob_das_dml_ctx_define.cpp b/src/sql/das/ob_das_dml_ctx_define.cpp
index 90a8e6d4f..eb7b818de 100644
--- a/src/sql/das/ob_das_dml_ctx_define.cpp
+++ b/src/sql/das/ob_das_dml_ctx_define.cpp
@@ -81,7 +81,9 @@ OB_DEF_SERIALIZE_SIZE(ObDASDMLBaseRtDef)
 // add by dkz
 OB_SERIALIZE_MEMBER((ObDASInsRtDef, ObDASDMLBaseRtDef),
                     need_fetch_conflict_,
-                    direct_insert_task_id_);
+                    direct_insert_task_id_,
+                    use_put_,
+                    ddl_task_id_);
 
 
 OB_SERIALIZE_MEMBER((ObDASLockRtDef, ObDASDMLBaseRtDef),
diff --git a/src/sql/das/ob_das_dml_ctx_define.h b/src/sql/das/ob_das_dml_ctx_define.h
index f942fdb0a..e57604555 100644
--- a/src/sql/das/ob_das_dml_ctx_define.h
+++ b/src/sql/das/ob_das_dml_ctx_define.h
@@ -170,14 +170,16 @@ public:
       need_fetch_conflict_(false),
       is_duplicated_(false),
       direct_insert_task_id_(0),
-      use_put_(false)
+      use_put_(false),
+      ddl_task_id_(0)
   { }
 
   INHERIT_TO_STRING_KV("ObDASBaseRtDef", ObDASDMLBaseRtDef,
                        K_(need_fetch_conflict),
                        K_(is_duplicated),
                        K_(direct_insert_task_id),
-                       K_(use_put));
+                       K_(use_put),
+                       K_(ddl_task_id));
 
   // used to check whether need to fetch_duplicate_key, will set in table_replace_op
   bool need_fetch_conflict_;
@@ -188,6 +190,7 @@ public:
   int64_t direct_insert_task_id_;
   // use put, only use in obkv for overlay writting.
   bool use_put_;
+  int64_t ddl_task_id_;
 };
 typedef DASDMLRtDefArray DASInsRtDefArray;
 
diff --git a/src/storage/access/ob_dml_param.cpp b/src/storage/access/ob_dml_param.cpp
index 1640b8183..aae00e863 100644
--- a/src/storage/access/ob_dml_param.cpp
+++ b/src/storage/access/ob_dml_param.cpp
@@ -251,7 +251,9 @@ DEF_TO_STRING(ObDMLBaseParam)
        K_(spec_seq_no),
        K_(snapshot),
        K_(branch_id),
-       K_(check_schema_version));
+       K_(direct_insert_task_id),
+       K_(check_schema_version),
+       K_(ddl_task_id));
   J_OBJ_END();
   return pos;
 }
diff --git a/src/storage/access/ob_dml_param.h b/src/storage/access/ob_dml_param.h
index d14318a17..24c51980b 100644
--- a/src/storage/access/ob_dml_param.h
+++ b/src/storage/access/ob_dml_param.h
@@ -186,7 +186,8 @@ struct ObDMLBaseParam
         branch_id_(0),
         direct_insert_task_id_(0),
         write_flag_(),
-        check_schema_version_(true)
+        check_schema_version_(true),
+        ddl_task_id_(0)
   {
   }
 
@@ -220,6 +221,7 @@ struct ObDMLBaseParam
   // write flag for inner write processing
   concurrent_control::ObWriteFlag write_flag_;
   bool check_schema_version_;
+  int64_t ddl_task_id_;
   bool is_valid() const { return (timeout_ > 0 && schema_version_ >= 0) && nullptr != store_ctx_guard_; }
   bool is_direct_insert() const { return (direct_insert_task_id_ > 0); }
   DECLARE_TO_STRING;