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

fix bug of checking transaction end

Browse Source
This commit is contained in:
Charles0429
2021-11-16 16:48:41 +08:00
committed by LINxiansheng
parent 942e2c6644
commit 384568a347
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ob_pg_partition.cpp
View File

@ -204,6 +204,7 @@ int ObPGPartition::get_refreshed_schema_info(int64_t& schema_version, int64_t& r
uint64_t& schema_version_change_log_id, int64_t& schema_version_change_log_ts) uint64_t& schema_version_change_log_id, int64_t& schema_version_change_log_ts)
{ {
// Ensure to get the schema version first, and then get ts // Ensure to get the schema version first, and then get ts
ObSpinLockGuard guard(lock_);
ATOMIC_STORE(&schema_version, build_index_schema_version_); ATOMIC_STORE(&schema_version, build_index_schema_version_);
refreshed_schema_ts = build_index_schema_version_refreshed_ts_; refreshed_schema_ts = build_index_schema_version_refreshed_ts_;
schema_version_change_log_id = schema_version_change_log_id_; schema_version_change_log_id = schema_version_change_log_id_;
@ -216,6 +217,7 @@ int ObPGPartition::update_build_index_schema_info(
const int64_t schema_version, const int64_t schema_refreshed_ts, const uint64_t log_id, const int64_t log_ts) const int64_t schema_version, const int64_t schema_refreshed_ts, const uint64_t log_id, const int64_t log_ts)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObSpinLockGuard guard(lock_);
if (schema_version < 0 || schema_refreshed_ts < 0 || log_id <= 0 || log_ts <= 0) { if (schema_version < 0 || schema_refreshed_ts < 0 || log_id <= 0 || log_ts <= 0) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
TRANS_LOG(WARN, "invalid argument", K(schema_version), K(schema_refreshed_ts), K(log_id), K(log_ts)); TRANS_LOG(WARN, "invalid argument", K(schema_version), K(schema_refreshed_ts), K(log_id), K(log_ts));

1
src/storage/ob_pg_partition.h
View File

@ -143,6 +143,7 @@ private:
int64_t gc_start_ts_; int64_t gc_start_ts_;
// build index schema version // build index schema version
common::ObSpinLock lock_;
int64_t build_index_schema_version_; int64_t build_index_schema_version_;
int64_t build_index_schema_version_refreshed_ts_; int64_t build_index_schema_version_refreshed_ts_;
uint64_t schema_version_change_log_id_; uint64_t schema_version_change_log_id_;