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

Placeholder of PCODE.

Browse Source
This commit is contained in:
LeonChaoHi
2024-02-28 08:14:46 +00:00
committed by ob-robot
parent 36c74418bf
commit 18fd23a2a8
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/share/ob_rpc_struct.cpp
View File

@ -7144,7 +7144,8 @@ OB_SERIALIZE_MEMBER(
is_server_empty_,
zone_,
sql_port_,
build_version_);
build_version_,
startup_mode_);
int ObCheckServerForAddingServerResult::init(
const bool is_server_empty,
const ObZone &zone,
@ -7175,10 +7176,18 @@ int ObCheckServerForAddingServerResult::assign(const ObCheckServerForAddingServe
} else {
is_server_empty_ = other.is_server_empty_;
sql_port_ = other.sql_port_;
startup_mode_ = other.startup_mode_;
}
return ret;
}
OB_SERIALIZE_MEMBER(ObCheckDeploymentModeArg, single_zone_deployment_on_);
OB_SERIALIZE_MEMBER(ObCheckDeploymentModeArg, single_zone_deployment_on_, startup_mode_);
int ObCheckDeploymentModeArg::assign(const ObCheckDeploymentModeArg &other)
{
int ret = OB_SUCCESS;
single_zone_deployment_on_ = other.single_zone_deployment_on_;
startup_mode_ = other.startup_mode_;
return ret;
}
#ifdef OB_BUILD_TDE_SECURITY
OB_SERIALIZE_MEMBER(ObWaitMasterKeyInSyncArg,
tenant_max_key_version_,

18
src/share/ob_rpc_struct.h
View File

@ -8810,14 +8810,18 @@ struct ObCheckServerForAddingServerResult
{
OB_UNIS_VERSION(1);
public:
enum ObServerMode {
INVALID_MODE = 0
};
ObCheckServerForAddingServerResult()
: is_server_empty_(false),
zone_(),
sql_port_(0),
build_version_()
build_version_(),
startup_mode_(ObServerMode::INVALID_MODE)
{
}
TO_STRING_KV(K_(is_server_empty), K_(zone), K_(sql_port), K_(build_version));
TO_STRING_KV(K_(is_server_empty), K_(zone), K_(sql_port), K_(build_version), K_(startup_mode));
int init(
const bool is_server_empty,
const ObZone &zone,
@ -8845,6 +8849,7 @@ private:
ObZone zone_;
int64_t sql_port_;
share::ObServerInfoInTable::ObBuildVersion build_version_;
ObServerMode startup_mode_; // not used, only as placeholder
};
struct ObArchiveLogArg
@ -9103,9 +9108,14 @@ struct ObCheckDeploymentModeArg
{
OB_UNIS_VERSION(1);
public:
ObCheckDeploymentModeArg() : single_zone_deployment_on_(false) {}
TO_STRING_KV(K_(single_zone_deployment_on));
enum ObServerMode {
INVALID_MODE = 0
};
ObCheckDeploymentModeArg() : single_zone_deployment_on_(false), startup_mode_(ObServerMode::INVALID_MODE) {}
TO_STRING_KV(K_(single_zone_deployment_on), K_(startup_mode));
int assign(const ObCheckDeploymentModeArg &other);
bool single_zone_deployment_on_;
ObServerMode startup_mode_; // not used, only as placeholder
};
struct ObPreProcessServerArg