From 1643dab91d2896dc16d3cb020c67178f2d752b31 Mon Sep 17 00:00:00 2001
From: Azipro <532789173@qq.com>
Date: Mon, 6 Jan 2025 04:15:18 +0000
Subject: [PATCH] occupation

---
 deps/oblib/src/lib/utility/ob_tracepoint_def.h | 2 ++
 src/sql/das/ob_das_task.cpp                    | 3 +++
 src/sql/das/ob_das_task.h                      | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/deps/oblib/src/lib/utility/ob_tracepoint_def.h b/deps/oblib/src/lib/utility/ob_tracepoint_def.h
index 6d808b96b..05069bb3e 100644
--- a/deps/oblib/src/lib/utility/ob_tracepoint_def.h
+++ b/deps/oblib/src/lib/utility/ob_tracepoint_def.h
@@ -304,6 +304,8 @@ GLOBAL_ERRSIM_POINT_DEF(313, EN_DAS_SIMULATE_AGG_TASK_MEM_LIMIT, "");
 GLOBAL_ERRSIM_POINT_DEF(314, EN_DAS_SIMULATE_AGG_TASK_RETRY_CODE, "");
 GLOBAL_ERRSIM_POINT_DEF(315, EN_DAS_GROUP_RESCAN_TEST_MODE, "");
 GLOBAL_ERRSIM_POINT_DEF(316, EN_DAS_SIMULATE_MAX_ROWSETS, "");
+GLOBAL_ERRSIM_POINT_DEF(317, EN_DAS_SIMULATE_DAS_TASK_EXEC_HANG_ON, "");
+GLOBAL_ERRSIM_POINT_DEF(318, EN_DAS_SIMULATE_DAS_TASK_ITER_HANG_ON, "");
 
 GLOBAL_ERRSIM_POINT_DEF(351, EN_REPLAY_STORAGE_SCHEMA_FAILURE, "");
 GLOBAL_ERRSIM_POINT_DEF(352, EN_SKIP_GET_STORAGE_SCHEMA, "");
diff --git a/src/sql/das/ob_das_task.cpp b/src/sql/das/ob_das_task.cpp
index 197114821..fde8036e5 100644
--- a/src/sql/das/ob_das_task.cpp
+++ b/src/sql/das/ob_das_task.cpp
@@ -109,6 +109,7 @@ OB_DEF_SERIALIZE(ObDASRemoteInfo)
       OB_UNIS_ENCODE(exec_ctx_->get_physical_plan_ctx()->get_subschema_ctx());
     }
   }
+  OB_UNIS_ENCODE(detectable_id_);
   return ret;
 }
 
@@ -251,6 +252,7 @@ OB_DEF_DESERIALIZE(ObDASRemoteInfo)
   if (need_subschema_ctx_) {
     OB_UNIS_DECODE(exec_ctx_->get_physical_plan_ctx()->get_subschema_ctx());
   }
+  OB_UNIS_DECODE(detectable_id_);
   return ret;
 }
 
@@ -315,6 +317,7 @@ OB_DEF_SERIALIZE_SIZE(ObDASRemoteInfo)
       OB_UNIS_ADD_LEN(exec_ctx_->get_physical_plan_ctx()->get_subschema_ctx());
     }
   }
+  OB_UNIS_ADD_LEN(detectable_id_);
   return len;
 }
 
diff --git a/src/sql/das/ob_das_task.h b/src/sql/das/ob_das_task.h
index 9d6b20f99..e556c348e 100644
--- a/src/sql/das/ob_das_task.h
+++ b/src/sql/das/ob_das_task.h
@@ -14,6 +14,7 @@
 #define OBDEV_SRC_SQL_DAS_OB_DAS_TASK_H_
 #include "share/ob_define.h"
 #include "share/ob_encryption_struct.h"
+#include "share/detect/ob_detectable_id.h"
 #include "storage/tx/ob_trans_define.h"
 #include "storage/tx/ob_clog_encrypt_info.h"
 #include "rpc/obrpc/ob_rpc_result_code.h"
@@ -101,6 +102,7 @@ public:
       session_id_(0),
       plan_id_(0),
       plan_hash_(0),
+      detectable_id_(),
       tsc_monitor_info_(nullptr)
   {
     sql_id_[0] = '\0';
@@ -136,6 +138,7 @@ public:
   uint64_t session_id_;
   uint64_t plan_id_;
   uint64_t plan_hash_;
+  ObDetectableId detectable_id_;
   ObTSCMonitorInfo *tsc_monitor_info_;
 };