reformat source code
according to code styles, 'AccessModifierOffset' should be -2.
This commit is contained in:
@ -36,23 +36,17 @@ namespace share {
|
||||
class IHeartBeatProcess;
|
||||
|
||||
class ObUnifiedAddrAgent : public ObRootAddrAgent {
|
||||
public:
|
||||
public:
|
||||
ObUnifiedAddrAgent();
|
||||
int init(common::ObMySQLProxy &sql_proxy, common::ObServerConfig &config);
|
||||
virtual int store(const ObIAddrList &addr_list, const ObIAddrList &readonly_addr_list,
|
||||
const bool force, const common::ObClusterType cluster_type,
|
||||
const int64_t timestamp) override;
|
||||
virtual int fetch(ObIAddrList &addr_list, ObIAddrList &readonly_addr_list,
|
||||
common::ObClusterType &cluster_typ) override;
|
||||
virtual int fetch_remote_rslist(const int64_t cluster_id,
|
||||
ObIAddrList &addr_list,
|
||||
ObIAddrList &readonly_addr_list,
|
||||
common::ObClusterType &cluster_type) override;
|
||||
int fetch_rslist_by_agent_idx(const int64_t index,
|
||||
const int64_t cluster_id,
|
||||
ObIAddrList &addr_list,
|
||||
ObIAddrList &readonly_addr_list,
|
||||
common::ObClusterType &cluster_type);
|
||||
int init(common::ObMySQLProxy& sql_proxy, common::ObServerConfig& config);
|
||||
virtual int store(const ObIAddrList& addr_list, const ObIAddrList& readonly_addr_list, const bool force,
|
||||
const common::ObClusterType cluster_type, const int64_t timestamp) override;
|
||||
virtual int fetch(
|
||||
ObIAddrList& addr_list, ObIAddrList& readonly_addr_list, common::ObClusterType& cluster_typ) override;
|
||||
virtual int fetch_remote_rslist(const int64_t cluster_id, ObIAddrList& addr_list, ObIAddrList& readonly_addr_list,
|
||||
common::ObClusterType& cluster_type) override;
|
||||
int fetch_rslist_by_agent_idx(const int64_t index, const int64_t cluster_id, ObIAddrList& addr_list,
|
||||
ObIAddrList& readonly_addr_list, common::ObClusterType& cluster_type);
|
||||
int64_t get_agent_num() const
|
||||
{
|
||||
return AGENT_NUM;
|
||||
@ -61,7 +55,7 @@ class ObUnifiedAddrAgent : public ObRootAddrAgent {
|
||||
int reload();
|
||||
bool is_valid() override;
|
||||
|
||||
private:
|
||||
private:
|
||||
const static int64_t AGENT_NUM = 3;
|
||||
bool is_inited_;
|
||||
// ObWebServiceRootAddr and ObInnerConfigRootAddr
|
||||
@ -82,7 +76,7 @@ class ObUnifiedAddrAgent : public ObRootAddrAgent {
|
||||
* 2 detect master rs if needed
|
||||
*/
|
||||
class ObRsMgr {
|
||||
public:
|
||||
public:
|
||||
friend class ObLeaseStateMgr;
|
||||
ObRsMgr();
|
||||
virtual ~ObRsMgr();
|
||||
@ -102,14 +96,14 @@ class ObRsMgr {
|
||||
int do_detect_master_rs_v3(const common::ObIArray<common::ObAddr>& server_list, ObPartitionInfo& partition_info);
|
||||
int fetch_rs_list(ObIAddrList& addr_list, ObIAddrList& readonly_addr_list);
|
||||
|
||||
private:
|
||||
private:
|
||||
int renew_master_rootserver_v2();
|
||||
int do_detect_master_rs_v2(common::ObIArray<common::ObAddr>& rs_list);
|
||||
int renew_master_rootserver_v3();
|
||||
int do_detect_master_rs_v3(
|
||||
const common::ObAddr& dst_server, const int64_t cluster_id, obrpc::ObGetRootserverRoleResult& result);
|
||||
|
||||
private:
|
||||
private:
|
||||
static const int64_t DETECT_MASTER_TIMEOUT = 1 * 1000 * 1000; // 1s
|
||||
typedef common::ObSEArray<common::ObAddr, common::MAX_ZONE_NUM> RsList;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user