From 9b4a13788ee0ed24749d278fbdfcab802efeff75 Mon Sep 17 00:00:00 2001 From: Azipro <532789173@qq.com> Date: Fri, 13 Dec 2024 09:44:43 +0000 Subject: [PATCH] Cancel occupation --- src/sql/das/ob_das_task.cpp | 3 +-- src/sql/das/ob_das_task.h | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/sql/das/ob_das_task.cpp b/src/sql/das/ob_das_task.cpp index fc9f86a37..197114821 100644 --- a/src/sql/das/ob_das_task.cpp +++ b/src/sql/das/ob_das_task.cpp @@ -409,8 +409,7 @@ OB_SERIALIZE_MEMBER(ObIDASTaskOp, attach_ctdef_, attach_rtdef_, das_gts_opt_info_, - plan_line_id_, - detectable_id_); + plan_line_id_); OB_DEF_SERIALIZE(ObDASGTSOptInfo) { diff --git a/src/sql/das/ob_das_task.h b/src/sql/das/ob_das_task.h index 0e77e5e7c..9d6b20f99 100644 --- a/src/sql/das/ob_das_task.h +++ b/src/sql/das/ob_das_task.h @@ -14,7 +14,6 @@ #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" @@ -174,8 +173,7 @@ public: attach_rtdef_(nullptr), das_gts_opt_info_(op_alloc), plan_line_id_(0), - das_task_start_timestamp_(0), - detectable_id_() + das_task_start_timestamp_(0) { das_task_node_.get_data() = this; } @@ -247,8 +245,7 @@ public: K_(task_status), K_(related_tablet_ids), K_(das_task_node), - K_(plan_line_id), - K_(detectable_id)); + K_(plan_line_id)); public: void set_tenant_id(uint64_t tenant_id) { tenant_id_ = tenant_id; } uint64_t get_tenant_id() const { return tenant_id_; } @@ -355,7 +352,6 @@ protected: int64_t plan_line_id_; //plan operator id public: int64_t das_task_start_timestamp_; - ObDetectableId detectable_id_; }; typedef common::ObObjStore DasTaskList;