hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[master] fix sql_audit mysqltest result

Browse Source
This commit is contained in:
chinaxing
2023-02-07 00:01:04 +08:00
committed by ob-robot
parent d2a68ebf1b
commit 58f3ce32a6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/storage/tx/it/test_tx_free_route.cpp
View File

@ -1003,7 +1003,7 @@ TEST_F(ObTestTxFreeRoute, sample)
A_F(txn_free_route_ctx.parts_changed_), A_F(txn_free_route_ctx.parts_changed_),
A_F(txn_free_route_ctx.extra_changed_), A_F(txn_free_route_ctx.extra_changed_),
A_F(txn_free_route_ctx.flag_.is_tx_terminated_)); A_F(txn_free_route_ctx.flag_.is_tx_terminated_));
EX_DUMMY_WRITE(101,100); EX_DUMMY_WRITE(201,100);
// step2 // step2
RESET_HOOKS_2(); RESET_HOOKS_2();
EXPECT_PROXY(POST_ROUTE, A_EQ(backend->server_, &server1)); EXPECT_PROXY(POST_ROUTE, A_EQ(backend->server_, &server1));
@ -1015,7 +1015,7 @@ TEST_F(ObTestTxFreeRoute, sample)
A_F(txn_free_route_ctx.parts_changed_), A_F(txn_free_route_ctx.parts_changed_),
A_T(txn_free_route_ctx.extra_changed_), A_T(txn_free_route_ctx.extra_changed_),
A_F(txn_free_route_ctx.flag_.is_tx_terminated_)); A_F(txn_free_route_ctx.flag_.is_tx_terminated_));
EX_SAVEPOINT(102, 102); EX_SAVEPOINT(202, 102);
// step3 // step3
RESET_HOOKS_2(); RESET_HOOKS_2();
EXPECT_PROXY(POST_ROUTE, A_EQ(backend->server_, &server2)); EXPECT_PROXY(POST_ROUTE, A_EQ(backend->server_, &server2));
@ -1027,7 +1027,7 @@ TEST_F(ObTestTxFreeRoute, sample)
A_T(txn_free_route_ctx.in_txn_before_handle_request_), A_T(txn_free_route_ctx.in_txn_before_handle_request_),
A_EQ(OB_ENTRY_NOT_EXIST, server.check_tx_exist((ObTransID*)req.hook_ctx_)), A_EQ(OB_ENTRY_NOT_EXIST, server.check_tx_exist((ObTransID*)req.hook_ctx_)),
A_EQ(OB_SUCCESS, server.check_tx_sanity())); A_EQ(OB_SUCCESS, server.check_tx_sanity()));
EX_WRITE(101, 1001); EX_WRITE(201, 1001);
RESET_HOOKS_2(); RESET_HOOKS_2();
EX_COMMIT_TX(); EX_COMMIT_TX();
} }

1
unittest/storage/tx/mock_utils/basic_fake_define.h
View File

@ -461,6 +461,7 @@ public:
const palf::LSN lsn = palf::LSN(++lsn_); const palf::LSN lsn = palf::LSN(++lsn_);
cb->set_log_ts(scn); cb->set_log_ts(scn);
cb->set_lsn(lsn); cb->set_lsn(lsn);
cb->set_submit_ts(ObTimeUtility::current_time());
ts_ = ts; ts_ = ts;
ApplyCbTask *apply_task = new ApplyCbTask(); ApplyCbTask *apply_task = new ApplyCbTask();
apply_task->replay_hint_ = replay_hint; apply_task->replay_hint_ = replay_hint;