hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support group_id transfer of ddl task with serlize_message

Browse Source
This commit is contained in:
renju96
2023-04-03 19:15:07 +00:00
committed by ob-robot
parent e29c97171c
commit db6535d4d2
54 changed files with 307 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/share/ob_rpc_struct.h
View File

@ -222,7 +222,8 @@ public:
sync_from_primary_(false),
based_schema_object_infos_(),
parallelism_(0),
task_id_(0)
task_id_(0),
consumer_group_id_(0)
{ }
virtual ~ObDDLArg() = default;
bool is_need_check_based_schema_objects() const
@ -248,9 +249,10 @@ public:
based_schema_object_infos_.reset();
parallelism_ = 0;
task_id_ = 0;
consumer_group_id_ = 0;
}
TO_STRING_KV(K_(ddl_stmt_str), K_(exec_tenant_id), K_(ddl_id_str), K_(sync_from_primary), K_(based_schema_object_infos),
K_(parallelism), K_(task_id));
K_(parallelism), K_(task_id), K_(consumer_group_id));
common::ObString ddl_stmt_str_;
uint64_t exec_tenant_id_;
@ -259,6 +261,7 @@ public:
common::ObSArray<share::schema::ObBasedSchemaObjectInfo> based_schema_object_infos_;
int64_t parallelism_;
int64_t task_id_;
int64_t consumer_group_id_;
};
struct ObAlterResourceUnitArg : public ObDDLArg
@ -1743,6 +1746,7 @@ public:
TO_STRING_KV(K_(exec_tenant_id),
K_(tenant_id),
K_(table_id),
K_(consumer_group_id),
K_(dest_tenant_id),
K_(session_id),
K_(parallelism),
@ -1755,6 +1759,7 @@ public:
ObDDLArg(),
tenant_id_(common::OB_INVALID_ID),
table_id_(common::OB_INVALID_ID),
consumer_group_id_(0),
dest_tenant_id_(common::OB_INVALID_ID),
session_id_(common::OB_INVALID_ID),
ddl_type_(share::DDL_INVALID),
@ -1772,6 +1777,7 @@ public:
{
tenant_id_ = common::OB_INVALID_ID;
table_id_ = common::OB_INVALID_ID;
consumer_group_id_ = 0;
dest_tenant_id_ = common::OB_INVALID_ID;
session_id_ = common::OB_INVALID_ID;
ddl_type_ = share::DDL_INVALID;
@ -1782,6 +1788,7 @@ public:
public:
uint64_t tenant_id_;
int64_t table_id_;
int64_t consumer_group_id_;
uint64_t dest_tenant_id_;
uint64_t session_id_;
uint64_t parallelism_;
@ -2327,6 +2334,7 @@ public:
nls_timestamp_tz_format_ = other.nls_timestamp_tz_format_;
sql_mode_ = other.sql_mode_;
inner_sql_exec_addr_ = other.inner_sql_exec_addr_;
consumer_group_id_ = other.consumer_group_id_;
}
return ret;
}
@ -7814,16 +7822,18 @@ public:
ObDDLBuildSingleReplicaRequestArg() : tenant_id_(OB_INVALID_ID), ls_id_(), source_tablet_id_(), dest_tablet_id_(),
source_table_id_(OB_INVALID_ID), dest_schema_id_(OB_INVALID_ID),
schema_version_(0), snapshot_version_(0), ddl_type_(0), task_id_(0),
parallelism_(0), execution_id_(-1), tablet_task_id_(0), data_format_version_(0) {}
parallelism_(0), execution_id_(-1), tablet_task_id_(0), data_format_version_(0),
consumer_group_id_(0) {}
bool is_valid() const {
return OB_INVALID_ID != tenant_id_ && ls_id_.is_valid() && source_tablet_id_.is_valid() && dest_tablet_id_.is_valid()
&& OB_INVALID_ID != source_table_id_ && OB_INVALID_ID != dest_schema_id_ && schema_version_ > 0 && snapshot_version_ > 0
&& task_id_ > 0 && parallelism_ > 0 && tablet_task_id_ > 0 && data_format_version_ > 0;
&& task_id_ > 0 && parallelism_ > 0 && tablet_task_id_ > 0 && data_format_version_ > 0 && consumer_group_id_ >= 0;
}
int assign(const ObDDLBuildSingleReplicaRequestArg &other);
TO_STRING_KV(K_(tenant_id), K_(ls_id), K_(source_tablet_id), K_(dest_tablet_id),
K_(source_table_id), K_(dest_schema_id), K_(schema_version), K_(snapshot_version),
K_(task_id), K_(parallelism), K_(execution_id), K_(tablet_task_id), K_(data_format_version));
K_(task_id), K_(parallelism), K_(execution_id), K_(tablet_task_id), K_(data_format_version),
K_(consumer_group_id));
public:
uint64_t tenant_id_;
share::ObLSID ls_id_;
@ -7839,6 +7849,7 @@ public:
int64_t execution_id_;
int64_t tablet_task_id_;
int64_t data_format_version_;
int64_t consumer_group_id_;
};
struct ObDDLBuildSingleReplicaRequestResult final