[FEAT MERGE] merge transfer

Co-authored-by: wxhwang <wxhwang@126.com>
Co-authored-by: godyangfight <godyangfight@gmail.com>
Co-authored-by: Tyshawn <tuyunshan@gmail.com>
This commit is contained in:
xuhuleon
2023-06-21 11:42:26 +00:00
committed by ob-robot
parent d06678002e
commit 9dae112952
1280 changed files with 149724 additions and 48813 deletions

View File

@ -545,7 +545,7 @@ TEST_F(TestLogSlidingWindow, test_after_flush_log)
default_mlist.add_server(self_);
GlobalLearnerList learners;
LogConfigMeta config_meta;
LogConfigInfo init_config_info;
LogConfigInfoV2 init_config_info;
LogConfigVersion init_config_version;
init_config_version.generate(curr_proposal_id, 0);
EXPECT_EQ(OB_SUCCESS, init_config_info.generate(default_mlist, 1, learners, init_config_version));
@ -719,7 +719,7 @@ TEST_F(TestLogSlidingWindow, test_ack_log)
default_mlist.add_server(self_);
GlobalLearnerList learners;
LogConfigMeta config_meta;
LogConfigInfo init_config_info;
LogConfigInfoV2 init_config_info;
LogConfigVersion init_config_version;
init_config_version.generate(curr_proposal_id, 0);
EXPECT_EQ(OB_SUCCESS, init_config_info.generate(default_mlist, 1, learners, init_config_version));
@ -740,8 +740,8 @@ TEST_F(TestLogSlidingWindow, test_ack_log)
default_mlist.add_server(server);
LSN invalid_lsn;
EXPECT_EQ(OB_INVALID_ARGUMENT, log_sw_.ack_log(server, invalid_lsn));
LogConfigInfo new_config_info = init_config_info;
new_config_info.log_sync_memberlist_ = default_mlist;
LogConfigInfoV2 new_config_info = init_config_info;
new_config_info.config_.log_sync_memberlist_ = default_mlist;
mock_mm_.log_ms_meta_.curr_ = new_config_info;
mock_state_mgr_.role_ = LEADER;