reformat source code

according to code styles, 'AccessModifierOffset' should be -2.
This commit is contained in:
gm
2021-06-16 15:48:42 +08:00
committed by MizuhaHimuraki
parent 8c4a2f26a6
commit 4a92b6d7df
3314 changed files with 23131 additions and 23401 deletions

View File

@ -20,7 +20,7 @@
namespace oceanbase {
namespace rootserver {
class FakePartitionTableUtil : public ObPartitionTableUtil {
public:
public:
FakePartitionTableUtil(ObZoneManager& cm) : cm_(cm)
{}
@ -52,7 +52,7 @@ class FakePartitionTableUtil : public ObPartitionTableUtil {
return common::OB_SUCCESS;
}
private:
private:
ObZoneManager& cm_;
};

View File

@ -15,7 +15,7 @@ namespace oceanbase {
namespace share {
using namespace common;
class FakeRsListChangeCb : public ObIRsListChangeCb {
public:
public:
virtual int submit_update_rslist_task(const bool force_update)
{
UNUSED(force_update);
@ -32,7 +32,7 @@ class FakeRsListChangeCb : public ObIRsListChangeCb {
}
};
class FakeMergeErrorCb : public ObIMergeErrorCb {
public:
public:
FakeMergeErrorCb()
{}
~FakeMergeErrorCb()

View File

@ -19,7 +19,7 @@
namespace oceanbase {
namespace rootserver {
class FakeServerMgr : public ObServerManager {
public:
public:
FakeServerMgr() : server_id_(0)
{}
~FakeServerMgr()
@ -37,7 +37,7 @@ class FakeServerMgr : public ObServerManager {
return server_statuses.assign(server_statuses_);
}
private:
private:
int64_t server_id_;
ObZoneManager* zone_mgr_;
};
@ -91,7 +91,7 @@ int FakeServerMgr::add_server(const common::ObAddr& server, const ObZone& zone)
}
class FakeServerManager : public ObServerManager {
public:
public:
void set_is_inited(bool is_inited)
{
UNUSED(is_inited);
@ -370,7 +370,7 @@ class FakeServerManager : public ObServerManager {
inited_ = inited;
}
public:
public:
common::ObArray<share::ObServerStatus> all_;
};

View File

@ -19,7 +19,7 @@ namespace oceanbase {
namespace rootserver {
class FakeZoneManager : public ObZoneManager {
public:
public:
FakeZoneManager() : config_version_(1)
{}
~FakeZoneManager()

View File

@ -23,7 +23,7 @@ class ObFrozenStatus;
namespace rootserver {
class MockFreezeInfoManager : public ObFreezeInfoManager {
public:
public:
virtual int get_freeze_info(int64_t input_frozen_version, storage::ObFrozenStatus& frozen_status)
{
UNUSED(input_frozen_version);
@ -36,7 +36,7 @@ class MockFreezeInfoManager : public ObFreezeInfoManager {
MOCK_METHOD2(
set_freeze_info, int(storage::ObFrozenStatus& src_frozen_status, storage::ObFrozenStatus& tgt_frozen_status));
private:
private:
static const int64_t ORIGIN_FROZEN_VERSION = 1;
static const common::ObFreezeStatus ORIGIN_FREEZE_STATUS = common::COMMIT_SUCCEED;
static const int64_t ORIGIN_FROZEN_TIMESTAMP = 1;

View File

@ -21,7 +21,7 @@ namespace oceanbase {
namespace rootserver {
class MockLeaderCoordinator : public ObLeaderCoordinator {
public:
public:
MOCK_METHOD0(coordinate, int());
MOCK_METHOD0(smooth_coordinate, int());
MOCK_METHOD0(start_smooth_coordinate, int());

View File

@ -14,7 +14,7 @@ namespace oceanbase {
namespace rootserver {
class MockObBaseBootstrap : public ObBaseBootstrap {
public:
public:
MOCK_METHOD1(check_bootstrap_rs_list, int(const obrpc::ObServerInfoList& rs_list));
MOCK_METHOD1(create_partition, int(const uint64_t table_id));
};
@ -26,7 +26,7 @@ namespace oceanbase {
namespace rootserver {
class MockObPreBootstrap : public ObPreBootstrap {
public:
public:
MOCK_METHOD1(prepare_bootstrap, int(common::ObAddr& master_rs));
MOCK_METHOD1(check_is_all_server_empty, int(bool& is_empty));
MOCK_METHOD1(wait_elect_master_partition, int(common::ObAddr& master_rs));
@ -39,7 +39,7 @@ namespace oceanbase {
namespace rootserver {
class MockObBootstrap : public ObBootstrap {
public:
public:
MOCK_METHOD0(execute_bootstrap, int());
MOCK_METHOD1(check_is_already_bootstrap, int(bool& is_bootstrap));
MOCK_METHOD0(create_core_tables, int());

View File

@ -21,7 +21,7 @@
namespace oceanbase {
namespace rootserver {
class ObFakeCB : public ObIStatusChangeCallback {
public:
public:
ObFakeCB()
{}
int wakeup_balancer()
@ -50,7 +50,7 @@ class ObFakeCB : public ObIStatusChangeCallback {
};
class ObFakeServerChangeCB : public ObIServerChangeCallback {
public:
public:
ObFakeServerChangeCB()
{}
virtual ~ObFakeServerChangeCB()
@ -62,7 +62,7 @@ class ObFakeServerChangeCB : public ObIServerChangeCallback {
};
class ObNeverStopForTestOnly : public share::ObCheckStopProvider {
public:
public:
ObNeverStopForTestOnly()
{}
virtual ~ObNeverStopForTestOnly()

View File

@ -20,7 +20,7 @@
namespace oceanbase {
namespace rootserver {
class ObServerStatusBuilder {
public:
public:
ObServerStatusBuilder() : config_(NULL), server_statuses_(), server_id_(OB_INIT_SERVER_ID)
{}
int init(ObServerConfig& config)
@ -41,7 +41,7 @@ class ObServerStatusBuilder {
}
int build(ObServerManager& server_mgr);
private:
private:
ObServerConfig* config_;
share::ObServerResourceInfo resource_;
ObServerManager::ObServerStatusArray server_statuses_;

View File

@ -69,7 +69,7 @@ static int64_t& PID = FakePartPropertyGetter::PID();
namespace rootserver {
class MockLocalityManager : public ObILocalityManager {
public:
public:
struct ServerInfo {
ServerInfo() : server_(), is_local_(false)
{}
@ -103,7 +103,7 @@ class MockLocalityManager : public ObILocalityManager {
};
class TestBootstrap : public ::testing::Test {
public:
public:
TestBootstrap();
virtual ~TestBootstrap()
{}
@ -112,7 +112,7 @@ class TestBootstrap : public ::testing::Test {
int init_partition_table();
void call_execute_bootstrap();
protected:
protected:
DBInitializer db_initer_;
ObMultiVersionSchemaService schema_service_;
MockObSrvRpcProxy rpc_proxy_;

View File

@ -28,7 +28,7 @@ using ::testing::Return;
namespace rootserver {
// multiclustermanage
class TestMultiClusterManager_load_Test : public testing::Test {
public:
public:
TestMultiClusterManager_load_Test() : cluster_mgr_()
{}
virtual ~TestMultiClusterManager_load_Test()
@ -39,7 +39,7 @@ class TestMultiClusterManager_load_Test : public testing::Test {
virtual void TestBody()
{}
private:
private:
ObMultiClusterManager cluster_mgr_;
};

View File

@ -129,7 +129,7 @@ namespace rootserver {
//}
class TestRecoveryHelper : public ::testing::Test {
public:
public:
TestRecoveryHelper()
{}
virtual ~TestRecoveryHelper()
@ -141,7 +141,7 @@ class TestRecoveryHelper : public ::testing::Test {
int build_partition(int64_t table_id, ObPartitionInfo& partition, int64_t replica_cnt, int64_t pos = 6);
int add_server();
public:
public:
// DBInitializer db_initer_;
// FakePartPropertyGetter prop_getter_;
// FakePartitionTableOperator pt_;