[FEAT MERGE] 4.x Dup Table
Co-authored-by: Minionyh <minions.yh@gmail.com> Co-authored-by: BinChenn <binchenn.bc@gmail.com> Co-authored-by: ChangerR <dingjinchengyx@163.com>
This commit is contained in:
@ -6623,6 +6623,34 @@ OB_SERIALIZE_MEMBER((ObDropDirectoryArg, ObDDLArg), tenant_id_, directory_name_)
|
||||
|
||||
|
||||
|
||||
int ObCreateDupLSArg::assign(const ObCreateDupLSArg &arg)
|
||||
{
|
||||
int ret = OB_SUCCESS;
|
||||
tenant_id_ = arg.tenant_id_;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ObCreateDupLSArg::init(const uint64_t tenant_id)
|
||||
{
|
||||
int ret = OB_SUCCESS;
|
||||
if (OB_UNLIKELY(OB_INVALID_TENANT_ID == tenant_id)) {
|
||||
ret = OB_INVALID_ARGUMENT;
|
||||
LOG_WARN("invalid argument", KR(ret), K(tenant_id));
|
||||
} else {
|
||||
tenant_id_ = tenant_id;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
DEF_TO_STRING(ObCreateDupLSArg)
|
||||
{
|
||||
int64_t pos = 0;
|
||||
J_KV(K_(tenant_id));
|
||||
return pos;
|
||||
}
|
||||
|
||||
OB_SERIALIZE_MEMBER(ObCreateDupLSArg, tenant_id_);
|
||||
|
||||
bool ObCreateLSArg::is_valid() const
|
||||
{
|
||||
return OB_INVALID_TENANT_ID != tenant_id_
|
||||
@ -6728,6 +6756,7 @@ void ObSetMemberListArgV2::reset()
|
||||
member_list_.reset();
|
||||
paxos_replica_num_ = 0;
|
||||
arbitration_service_.reset();
|
||||
learner_list_.reset();
|
||||
}
|
||||
|
||||
int ObSetMemberListArgV2::assign(const ObSetMemberListArgV2 &arg)
|
||||
@ -6738,6 +6767,8 @@ int ObSetMemberListArgV2::assign(const ObSetMemberListArgV2 &arg)
|
||||
LOG_WARN("arg is invalid", KR(ret), K(arg));
|
||||
} else if (OB_FAIL(member_list_.deep_copy(arg.member_list_))) {
|
||||
LOG_WARN("failed to assign member list", KR(ret), K(arg));
|
||||
} else if (OB_FAIL(learner_list_.deep_copy(arg.learner_list_))) {
|
||||
LOG_WARN("failed to assign learner list", KR(ret), K(arg));
|
||||
} else if (OB_FAIL(arbitration_service_.assign(arg.arbitration_service_))) {
|
||||
LOG_WARN("failed to assign arbitration_service", KR(ret), K(arg));
|
||||
} else {
|
||||
@ -6750,7 +6781,8 @@ int ObSetMemberListArgV2::assign(const ObSetMemberListArgV2 &arg)
|
||||
|
||||
int ObSetMemberListArgV2::init(const int64_t tenant_id,
|
||||
const share::ObLSID &id, const int64_t paxos_replica_num,
|
||||
const ObMemberList &member_list, const ObMember &arbitration_service)
|
||||
const ObMemberList &member_list, const ObMember &arbitration_service,
|
||||
const common::GlobalLearnerList &learner_list)
|
||||
{
|
||||
int ret = OB_SUCCESS;
|
||||
if (OB_UNLIKELY(OB_INVALID_TENANT_ID == tenant_id
|
||||
@ -6761,6 +6793,8 @@ int ObSetMemberListArgV2::init(const int64_t tenant_id,
|
||||
LOG_WARN("invalid argument", KR(ret), K(tenant_id), K(id), K(member_list), K(paxos_replica_num));
|
||||
} else if (OB_FAIL(member_list_.deep_copy(member_list))) {
|
||||
LOG_WARN("failed to assign member list", KR(ret), K(member_list));
|
||||
} else if (OB_FAIL(learner_list_.deep_copy(learner_list))) {
|
||||
LOG_WARN("fail ed to assign learner list", KR(ret), K(learner_list));
|
||||
} else if (OB_FAIL(arbitration_service_.assign(arbitration_service))) {
|
||||
LOG_WARN("failed to assign arbitration service", KR(ret), K(arbitration_service));
|
||||
} else {
|
||||
@ -6774,11 +6808,11 @@ int ObSetMemberListArgV2::init(const int64_t tenant_id,
|
||||
DEF_TO_STRING(ObSetMemberListArgV2)
|
||||
{
|
||||
int64_t pos = 0;
|
||||
J_KV(K_(tenant_id), K_(id), K_(paxos_replica_num), K_(member_list), K_(arbitration_service));
|
||||
J_KV(K_(tenant_id), K_(id), K_(paxos_replica_num), K_(member_list), K_(arbitration_service), K_(learner_list));
|
||||
return pos;
|
||||
}
|
||||
|
||||
OB_SERIALIZE_MEMBER(ObSetMemberListArgV2, tenant_id_, id_, member_list_, paxos_replica_num_, arbitration_service_);
|
||||
OB_SERIALIZE_MEMBER(ObSetMemberListArgV2, tenant_id_, id_, member_list_, paxos_replica_num_, arbitration_service_, learner_list_);
|
||||
|
||||
bool ObGetLSAccessModeInfoArg::is_valid() const
|
||||
{
|
||||
@ -7178,7 +7212,22 @@ DEF_TO_STRING(ObBatchCreateTabletArg)
|
||||
OB_SERIALIZE_MEMBER(ObBatchCreateTabletArg, id_, major_frozen_scn_,
|
||||
tablets_, table_schemas_, need_check_tablet_cnt_);
|
||||
|
||||
OB_SERIALIZE_MEMBER(ObCreateLSResult, ret_, addr_);
|
||||
OB_SERIALIZE_MEMBER(ObCreateDupLSResult, ret_);
|
||||
bool ObCreateDupLSResult::is_valid() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
int ObCreateDupLSResult::assign(const ObCreateDupLSResult &other)
|
||||
{
|
||||
int ret = OB_SUCCESS;
|
||||
if (this == &other) {
|
||||
} else {
|
||||
ret_ = other.ret_;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
OB_SERIALIZE_MEMBER(ObCreateLSResult, ret_, addr_, replica_type_);
|
||||
bool ObCreateLSResult::is_valid() const
|
||||
{
|
||||
return true;
|
||||
@ -7190,6 +7239,7 @@ int ObCreateLSResult::assign(const ObCreateLSResult &other)
|
||||
} else {
|
||||
ret_ = other.ret_;
|
||||
addr_ = other.addr_;
|
||||
replica_type_ = other.replica_type_;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user