diff --git a/src/storage/transaction/ob_trans_define.cpp b/src/storage/transaction/ob_trans_define.cpp index 46d355e0366e98957e078f57a20bfbf530fe7965..9dd3e8a5ffdb88e5c508ea1e25b5e058e3b0f9a4 100644 --- a/src/storage/transaction/ob_trans_define.cpp +++ b/src/storage/transaction/ob_trans_define.cpp @@ -57,7 +57,7 @@ OB_SERIALIZE_MEMBER(ObTransSSTableDurableCtxInfo, trans_table_info_, partition_, app_trace_id_str_, partition_log_info_arr_, prev_trans_arr_, can_elr_, max_durable_log_ts_, global_trans_version_, commit_log_checksum_, state_, prepare_version_, max_durable_sql_no_, trans_type_, elr_prepared_state_, is_dup_table_trans_, redo_log_no_, mutator_log_no_, stmt_info_, min_log_ts_, sp_user_request_, need_checksum_, - prepare_log_id_, prepare_log_timestamp_, clear_log_base_ts_); + prepare_log_id_, prepare_log_timestamp_, clear_log_base_ts_, min_log_id_); OB_SERIALIZE_MEMBER(ObXATransID, gtrid_str_, bqual_str_, format_id_); int64_t ObTransID::s_inc_num = 1; diff --git a/src/storage/transaction/ob_trans_define.h b/src/storage/transaction/ob_trans_define.h index c45eb84a8084ee2545dddebff4a175f0e85373d2..87feafe7746a53d0fa66e5fc826c7421cf64e796 100644 --- a/src/storage/transaction/ob_trans_define.h +++ b/src/storage/transaction/ob_trans_define.h @@ -3489,6 +3489,7 @@ public: mutator_log_no_ = 0; stmt_info_.reset(); min_log_ts_ = 0; + min_log_id_ = 0; sp_user_request_ = 0; need_checksum_ = false; prepare_log_id_ = 0; @@ -3504,7 +3505,7 @@ public: K_(app_trace_id_str), K_(partition_log_info_arr), K_(prev_trans_arr), K_(can_elr), K_(max_durable_log_ts), K_(global_trans_version), K_(commit_log_checksum), K_(state), K_(prepare_version), K_(max_durable_sql_no), K_(trans_type), K_(elr_prepared_state), K_(is_dup_table_trans), K_(redo_log_no), K_(mutator_log_no), - K_(stmt_info), K_(min_log_ts), K_(sp_user_request), K_(need_checksum), K_(prepare_log_id), + K_(stmt_info), K_(min_log_ts), K_(min_log_id), K_(sp_user_request), K_(need_checksum), K_(prepare_log_id), K_(prepare_log_timestamp)); ObTransTableStatusInfo trans_table_info_; common::ObPartitionKey partition_; @@ -3534,6 +3535,7 @@ public: int64_t mutator_log_no_; ObTransStmtInfo stmt_info_; int64_t min_log_ts_; + int64_t min_log_id_; int sp_user_request_; bool need_checksum_; int64_t prepare_log_id_; diff --git a/src/storage/transaction/ob_trans_part_ctx.cpp b/src/storage/transaction/ob_trans_part_ctx.cpp index 88c5213ec40d3e0acfd91cfad5491d56984c5c91..4abc936675c4331af18b1ffcbd55da43026231af 100644 --- a/src/storage/transaction/ob_trans_part_ctx.cpp +++ b/src/storage/transaction/ob_trans_part_ctx.cpp @@ -10515,6 +10515,7 @@ int ObPartTransCtx::recover_from_trans_sstable_durable_ctx_info(ObTransSSTableDu mutator_log_no_ = ctx_info.mutator_log_no_; stmt_info_ = ctx_info.stmt_info_; min_log_ts_ = ctx_info.min_log_ts_; + min_log_id_ = ctx_info.min_log_id_; sp_user_request_ = ctx_info.sp_user_request_; need_checksum_ = ctx_info.need_checksum_; prepare_log_id_ = ctx_info.prepare_log_id_; @@ -10595,6 +10596,7 @@ int ObPartTransCtx::get_trans_sstable_durable_ctx_info(const int64_t log_ts, ObT info.mutator_log_no_ = mutator_log_no_; info.stmt_info_ = stmt_info_; info.min_log_ts_ = min_log_ts_; + info.min_log_id_ = min_log_id_; info.sp_user_request_ = sp_user_request_; info.need_checksum_ = need_checksum_; info.prepare_log_id_ = prepare_log_id_;