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

use new log_entry_no when retry submitting redo_commit_info log

Browse Source
This commit is contained in:
obdev 2022-12-23 04:37:54 +00:00 committed by ob-robot
parent c004fed6a4
commit 87b1a70b38
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/share/ob_i_tablet_scan.h
View File

@ -224,9 +224,15 @@ ObVTableScanParam() :
void destroy() void destroy()
{ {
column_ids_.destroy(); if (OB_UNLIKELY(column_ids_.get_capacity() > OB_PREALLOCATED_COL_ID_NUM)) {
key_ranges_.destroy(); column_ids_.destroy();
range_array_pos_.destroy(); }
if (OB_UNLIKELY(key_ranges_.get_capacity() > OB_DEFAULT_RANGE_COUNT)) {
key_ranges_.destroy();
}
if (OB_UNLIKELY(range_array_pos_.get_capacity() > OB_DEFAULT_RANGE_COUNT)) {
range_array_pos_.destroy();
}
destroy_schema_guard(); destroy_schema_guard();
} }
ObObjectID tenant_id_; ObObjectID tenant_id_;

3
src/storage/tx/ob_trans_part_ctx.cpp
View File

@ -2748,7 +2748,8 @@ int ObPartTransCtx::submit_commit_log_()
} else if (use_local_block_buf) { } else if (use_local_block_buf) {
// realloc log buf and retry submit log // realloc log buf and retry submit log
log_block.reset(); log_block.reset();
if (OB_FAIL(log_block.init(replay_hint, log_block_header, false /*use_local_block_buf*/))) { ObTxLogBlockHeader tmp_log_block_header(cluster_id_, exec_info_.next_log_entry_no_, trans_id_);
if (OB_FAIL(log_block.init(replay_hint, tmp_log_block_header, false /*use_local_block_buf*/))) {
TRANS_LOG(WARN, "init log block failed", KR(ret), K(*this)); TRANS_LOG(WARN, "init log block failed", KR(ret), K(*this));
} else if (OB_FAIL(submit_redo_commit_info_log_(log_block, has_redo, helper))) { } else if (OB_FAIL(submit_redo_commit_info_log_(log_block, has_redo, helper))) {
TRANS_LOG(WARN, "submit redo commit state log failed", KR(ret), K(*this)); TRANS_LOG(WARN, "submit redo commit state log failed", KR(ret), K(*this));