From d1d2c34d4760ac7603fd5219fb85b44276f94540 Mon Sep 17 00:00:00 2001 From: Handora Date: Tue, 20 Feb 2024 08:46:24 +0000 Subject: [PATCH] fix compile --- mittest/multi_replica/test_multi_transfer_tx.cpp | 4 ---- mittest/simple_server/test_transfer_with_commit_action.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/mittest/multi_replica/test_multi_transfer_tx.cpp b/mittest/multi_replica/test_multi_transfer_tx.cpp index a5582f6e20..433136c8ce 100644 --- a/mittest/multi_replica/test_multi_transfer_tx.cpp +++ b/mittest/multi_replica/test_multi_transfer_tx.cpp @@ -81,10 +81,6 @@ int ObPartTransCtx::replay_rollback_to(const ObTxRollbackToLog &log, } else if (OB_FAIL((update_replaying_log_no_(timestamp, part_log_no)))) { TRANS_LOG(WARN, "update replaying log no failed", K(ret), K(timestamp), K(part_log_no)); } - } else if (exec_info_.need_checksum_ && !has_replay_serial_final_()) { - ret = OB_EAGAIN; - TRANS_LOG(INFO, "branch savepoint should wait replay serial final because of calc checksum", - K(ret), K(timestamp), KP(this), K(trans_id_), K(ls_id_), K(exec_info_)); } else if (!ctx_tx_data_.get_start_log_ts().is_valid() && OB_FAIL(ctx_tx_data_.set_start_log_ts(timestamp))) { // update start_log_ts for branch savepoint, because it may replayed before first log in txn queue TRANS_LOG(WARN, "set tx data start log ts fail", K(ret), K(timestamp), KPC(this)); diff --git a/mittest/simple_server/test_transfer_with_commit_action.cpp b/mittest/simple_server/test_transfer_with_commit_action.cpp index dfb0dd1a6a..d9e601c729 100644 --- a/mittest/simple_server/test_transfer_with_commit_action.cpp +++ b/mittest/simple_server/test_transfer_with_commit_action.cpp @@ -18,7 +18,7 @@ #include "env/ob_simple_cluster_test_base.h" #include "rootserver/ob_tenant_balance_service.h" #include "share/balance/ob_balance_job_table_operator.h" -#include "mittest/simple_server/env/ob_simple_server_helper.h" +#include "mittest/env/ob_simple_server_helper.h" #include "storage/tx_storage/ob_ls_service.h" #include "storage/tx/ob_tx_loop_worker.h" #include "storage/tx/ob_trans_part_ctx.h"