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

[BUG] set rec log ts to the on-goint log ts

Browse Source
This commit is contained in:
Handora
2022-11-14 12:05:40 +00:00
committed by wangzelin.wzl
parent a74951f7fb
commit 9abca6cd59
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/expr/ob_expr_to_outfile_row.cpp
View File

@ -211,9 +211,9 @@ int ObExprToOutfileRow::extract_fisrt_wchar_from_varhcar(const ObObj &obj, int32
if (obj.is_varying_len_char_type()) {
ObString str = obj.get_varchar();
if (str.length() > 0) {
ret = ObCharset::mb_wc(obj.get_collation_type(), str.ptr(), str.length(), length, wchar);
}
}
ret = ObCharset::mb_wc(obj.get_collation_type(), str.ptr(), str.length(), length, wchar);
}
}
return ret;
}

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

@ -4846,11 +4846,16 @@ int ObPartTransCtx::refresh_rec_log_ts_()
prev_rec_log_ts_ = rec_log_ts_;
if (is_follower_()) {
// Case 1: As follower, the replay is in order, so we can simply reset it
// because all state changes in logs before max_durable_log_ts all
// successfully contained in this checkpoint and no new state changes
// after max_durable_log_ts is contained in the checkpoint.
rec_log_ts_ = OB_INVALID_TIMESTAMP;
// Case 1: As follower, the replay is indead in order, while we cannot
// simply reset it because the replay is not atomic, and it may be in the
// middle stage that the replay is currently on-going. So the necessary
// state before the log ts that is replaying may not be contained, so we
// need replay from the on-going log ts.
if (exec_info_.max_applied_log_ts_ != exec_info_.max_applying_log_ts_) {
rec_log_ts_ = exec_info_.max_applying_log_ts_;
} else {
rec_log_ts_ = OB_INVALID_TIMESTAMP;
}
} else {
// Case 2: As leader, the application is discrete and not in order, so we
// rely on the first lo(we call it FCL later)g hasnot been applied as