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

[BUG] fix 4138 because unclear session timestamp

Browse Source
This commit is contained in:
Handora
2023-06-06 07:42:32 +00:00
committed by ob-robot
parent f16a8319fc
commit 82b923c9db
4 changed files with 94 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sql/ob_sql_trans_control.cpp
View File

@ -560,6 +560,16 @@ int ObSqlTransControl::start_stmt(ObExecContext &exec_ctx)
LOG_WARN("call sql stmt end hook fail", K(tmp_ret));
}
}
if (OB_SUCC(ret)
&& !ObSQLUtils::is_nested_sql(&exec_ctx)
&& das_ctx.get_snapshot().core_.version_.is_valid()) {
// maintain the read snapshot version on session for multi-version garbage
// colloecor. It is maintained for all cases except remote exection with ac
// = 1. So we need carefully design the version for the corner case.
session->set_reserved_snapshot_version(das_ctx.get_snapshot().core_.version_);
}
bool print_log = false;
#ifndef NDEBUG
print_log = true;
@ -911,6 +921,10 @@ int ObSqlTransControl::end_stmt(ObExecContext &exec_ctx, const bool rollback)
ret = COVER_SUCC(tmp_ret);
}
if (OB_SUCC(ret) && !ObSQLUtils::is_nested_sql(&exec_ctx)) {
session->reset_reserved_snapshot_version();
}
bool print_log = false;
#ifndef NDEBUG
print_log = true;

10
src/sql/session/ob_basic_session_info.cpp
View File

@ -70,7 +70,7 @@ ObBasicSessionInfo::ObBasicSessionInfo()
sys_var_base_version_(OB_INVALID_VERSION),
tx_desc_(NULL),
tx_result_(),
unused_read_snapshot_version_(),
reserved_read_snapshot_version_(),
xid_(),
associated_xa_(false),
cached_tenant_config_version_(0),
@ -404,7 +404,7 @@ void ObBasicSessionInfo::reset(bool skip_sys_var)
sys_var_base_version_ = CACHED_SYS_VAR_VERSION;
}
curr_trans_last_stmt_end_time_ = 0;
unused_read_snapshot_version_.reset();
reserved_read_snapshot_version_.reset();
check_sys_variable_ = true;
is_foreign_key_cascade_ = false;
is_foreign_key_check_exist_ = false;
@ -4258,7 +4258,7 @@ OB_DEF_SERIALIZE(ObBasicSessionInfo)
nested_count_,
thread_data_.user_name_,
next_tx_isolation_,
unused_read_snapshot_version_,
reserved_read_snapshot_version_,
check_sys_variable_,
unused_weak_read_snapshot_source,
database_id_,
@ -4453,7 +4453,7 @@ OB_DEF_DESERIALIZE(ObBasicSessionInfo)
nested_count_,
thread_data_.user_name_,
next_tx_isolation_,
unused_read_snapshot_version_,
reserved_read_snapshot_version_,
check_sys_variable_,
unused_weak_read_snapshot_source,
database_id_,
@ -4770,7 +4770,7 @@ OB_DEF_SERIALIZE_SIZE(ObBasicSessionInfo)
nested_count_,
thread_data_.user_name_,
next_tx_isolation_,
unused_read_snapshot_version_,
reserved_read_snapshot_version_,
check_sys_variable_,
unused_weak_read_snapshot_source,
database_id_,

10
src/sql/session/ob_basic_session_info.h
View File

@ -1237,6 +1237,9 @@ public:
void set_is_in_user_scope(bool value) { sql_scope_flags_.set_is_in_user_scope(value); }
bool is_in_user_scope() const { return sql_scope_flags_.is_in_user_scope(); }
SqlScopeFlags &get_sql_scope_flags() { return sql_scope_flags_; }
share::SCN get_reserved_snapshot_version() const { return reserved_read_snapshot_version_; }
void set_reserved_snapshot_version(const share::SCN snapshot_version) { reserved_read_snapshot_version_ = snapshot_version; }
void reset_reserved_snapshot_version() { reserved_read_snapshot_version_.reset(); }
bool get_check_sys_variable() { return check_sys_variable_; }
void set_check_sys_variable(bool check_sys_variable) { check_sys_variable_ = check_sys_variable; }
@ -1990,7 +1993,12 @@ private:
protected:
transaction::ObTxDesc *tx_desc_;
transaction::ObTxExecResult tx_result_; // TODO: move to QueryCtx/ExecCtx
share::SCN unused_read_snapshot_version_;//serialize compatibility preserved
// reserved read snapshot version for current or previous stmt in the txn. And
// it is used for multi-version garbage colloector to collect ative snapshot.
// While it may be empty for the txn with ac = 1 and remote execution whose
// snapshot version is generated from remote server(called by start_stmt). So
// use it only query is active and version is valid.
share::SCN reserved_read_snapshot_version_;
transaction::ObXATransID xid_;
bool associated_xa_; // session joined distr-xa-trans by xa-start
int64_t cached_tenant_config_version_;