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

add rpc field on master

Browse Source
This commit is contained in:
zhangzhenyuyu
2024-03-04 03:50:37 +00:00
committed by ob-robot
parent f96f3c37ca
commit b866dafca8
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/share/ob_rpc_struct.cpp
View File

@ -3723,7 +3723,8 @@ OB_SERIALIZE_MEMBER(ObLSMigrateReplicaArg,
dst_, dst_,
data_source_, data_source_,
paxos_replica_number_, paxos_replica_number_,
skip_change_member_list_); skip_change_member_list_,
force_use_data_source_);
int ObLSMigrateReplicaArg::assign( int ObLSMigrateReplicaArg::assign(
const ObLSMigrateReplicaArg &that) const ObLSMigrateReplicaArg &that)
@ -3737,6 +3738,7 @@ int ObLSMigrateReplicaArg::assign(
data_source_ = that.data_source_; data_source_ = that.data_source_;
paxos_replica_number_ = that.paxos_replica_number_; paxos_replica_number_ = that.paxos_replica_number_;
skip_change_member_list_ = that.skip_change_member_list_; skip_change_member_list_ = that.skip_change_member_list_;
force_use_data_source_ = that.force_use_data_source_;
return ret; return ret;
} }
@ -3770,7 +3772,8 @@ OB_SERIALIZE_MEMBER(ObLSAddReplicaArg,
data_source_, data_source_,
orig_paxos_replica_number_, orig_paxos_replica_number_,
new_paxos_replica_number_, new_paxos_replica_number_,
skip_change_member_list_); skip_change_member_list_,
force_use_data_source_);
int ObLSAddReplicaArg::assign( int ObLSAddReplicaArg::assign(
const ObLSAddReplicaArg &that) const ObLSAddReplicaArg &that)
@ -3784,6 +3787,7 @@ int ObLSAddReplicaArg::assign(
orig_paxos_replica_number_ = that.orig_paxos_replica_number_; orig_paxos_replica_number_ = that.orig_paxos_replica_number_;
new_paxos_replica_number_ = that.new_paxos_replica_number_; new_paxos_replica_number_ = that.new_paxos_replica_number_;
skip_change_member_list_ = that.skip_change_member_list_; skip_change_member_list_ = that.skip_change_member_list_;
force_use_data_source_ = that.force_use_data_source_;
return ret; return ret;
} }

14
src/share/ob_rpc_struct.h
View File

@ -4118,7 +4118,8 @@ public:
dst_(), dst_(),
data_source_(), data_source_(),
paxos_replica_number_(0), paxos_replica_number_(0),
skip_change_member_list_() {} skip_change_member_list_(),
force_use_data_source_(false) {}
public: public:
int assign(const ObLSMigrateReplicaArg &that); int assign(const ObLSMigrateReplicaArg &that);
@ -4139,7 +4140,8 @@ public:
K_(dst), K_(dst),
K_(data_source), K_(data_source),
K_(paxos_replica_number), K_(paxos_replica_number),
K_(skip_change_member_list)); K_(skip_change_member_list),
K_(force_use_data_source));
bool is_valid() const { bool is_valid() const {
return !task_id_.is_invalid() return !task_id_.is_invalid()
@ -4159,6 +4161,7 @@ public:
common::ObReplicaMember data_source_; common::ObReplicaMember data_source_;
int64_t paxos_replica_number_; int64_t paxos_replica_number_;
bool skip_change_member_list_; bool skip_change_member_list_;
bool force_use_data_source_;
}; };
struct ObLSAddReplicaArg struct ObLSAddReplicaArg
@ -4174,7 +4177,8 @@ public:
data_source_(), data_source_(),
orig_paxos_replica_number_(0), orig_paxos_replica_number_(0),
new_paxos_replica_number_(0), new_paxos_replica_number_(0),
skip_change_member_list_(false) {} skip_change_member_list_(false),
force_use_data_source_(false) {}
public: public:
int assign(const ObLSAddReplicaArg &that); int assign(const ObLSAddReplicaArg &that);
@ -4195,7 +4199,8 @@ public:
K_(data_source), K_(data_source),
K_(orig_paxos_replica_number), K_(orig_paxos_replica_number),
K_(new_paxos_replica_number), K_(new_paxos_replica_number),
K_(skip_change_member_list)); K_(skip_change_member_list),
K_(force_use_data_source));
bool is_valid() const { bool is_valid() const {
return !task_id_.is_invalid() return !task_id_.is_invalid()
@ -4215,6 +4220,7 @@ public:
int64_t orig_paxos_replica_number_; int64_t orig_paxos_replica_number_;
int64_t new_paxos_replica_number_; int64_t new_paxos_replica_number_;
bool skip_change_member_list_; bool skip_change_member_list_;
bool force_use_data_source_;
}; };
struct ObLSChangeReplicaArg struct ObLSChangeReplicaArg