simply pdml code, remove compat logic on leader

This commit is contained in:
chinaxing
2024-06-17 09:49:23 +00:00
committed by ob-robot
parent 89e696f309
commit 156e89bb28
16 changed files with 102 additions and 292 deletions

View File

@ -156,7 +156,6 @@ public:
TEST_F(ObTestRedoFill, serial_single_list_fill_all_BLOCK_FROZEN)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// single list
callback_mgr_.callback_lists_ = NULL;
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(1));
@ -182,7 +181,6 @@ TEST_F(ObTestRedoFill, serial_single_list_fill_all_BLOCK_FROZEN)
TEST_F(ObTestRedoFill, serial_multi_list_fill_all_ALL_FILLED)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -278,7 +276,6 @@ TEST_F(ObTestRedoFill, serial_multi_list_fill_all_ALL_FILLED)
TEST_F(ObTestRedoFill, serial_multi_list_fill_all_BLOCK_FROZEN)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -327,7 +324,6 @@ TEST_F(ObTestRedoFill, serial_multi_list_fill_all_BLOCK_FROZEN)
TEST_F(ObTestRedoFill, serial_single_list_fill_all_BUF_NOT_ENOUGH)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// single list
callback_mgr_.callback_lists_ = NULL;
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(1));
@ -354,7 +350,6 @@ TEST_F(ObTestRedoFill, serial_single_list_fill_all_BUF_NOT_ENOUGH)
TEST_F(ObTestRedoFill, serial_single_list_fill_all_list_BIG_ROW)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// single list
callback_mgr_.callback_lists_ = NULL;
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(1));
@ -381,7 +376,6 @@ TEST_F(ObTestRedoFill, serial_single_list_fill_all_list_BIG_ROW)
TEST_F(ObTestRedoFill, serial_multi_list_fill_all_list_BIG_ROW)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -410,7 +404,6 @@ TEST_F(ObTestRedoFill, serial_multi_list_fill_all_list_BIG_ROW)
TEST_F(ObTestRedoFill, serial_multi_list_fill_all_OTHER_ERROR_WHEN_FILL_OTHERS)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -458,7 +451,6 @@ TEST_F(ObTestRedoFill, serial_multi_list_fill_all_OTHER_ERROR_WHEN_FILL_OTHERS)
TEST_F(ObTestRedoFill, serial_logging_fill_from_all_list_ALL_OTHERS_BLOCK_FROZEN_EMPTY)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -500,7 +492,6 @@ TEST_F(ObTestRedoFill, serial_logging_fill_from_all_list_ALL_OTHERS_BLOCK_FROZEN
TEST_F(ObTestRedoFill, serial_logging_fill_from_all_list_FIRST_ITER_END_OTHERS_BLOCK_FROZEN_EMPTY)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -545,7 +536,6 @@ TEST_F(ObTestRedoFill, serial_logging_fill_from_all_list_FIRST_ITER_END_OTHERS_B
TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_FROZEN)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -574,7 +564,6 @@ TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_FROZEN)
TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_FROZEN_EMPTY)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -603,7 +592,6 @@ TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_FROZEN_EMPTY)
TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_FROZEN_FILL_FROM_OTHERS)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -639,7 +627,6 @@ TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_FROZEN_FILL_FROM_OTHER
TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_BY_OTHERS)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -669,7 +656,6 @@ TEST_F(ObTestRedoFill, parallel_multi_list_fill_all_BLOCK_BY_OTHERS)
TEST_F(ObTestRedoFill, parallel_logging_fill_from_all_list_ALL_FILLED_OTHERS_REMAIN)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -698,7 +684,6 @@ TEST_F(ObTestRedoFill, parallel_logging_fill_from_all_list_ALL_FILLED_OTHERS_REM
TEST_F(ObTestRedoFill, parallel_logging_fill_from_one_list_OTHERS_IS_EMPTY)
{
set_parallel_logging(true);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));
@ -729,7 +714,6 @@ TEST_F(ObTestRedoFill, parallel_logging_fill_from_one_list_OTHERS_IS_EMPTY)
TEST_F(ObTestRedoFill, serial_logging_fill_from_one_list_OTHERS_IS_EMPTY)
{
set_parallel_logging(false);
callback_mgr_.need_merge_ = false;
// 4 list
extend_callback_lists_(3);
EXPECT_CALL(mdo_, get_logging_list_count()).Times(AtLeast(1)).WillRepeatedly(Return(4));