From ef59375e8afbc60cc653871d6683c735d975b42b Mon Sep 17 00:00:00 2001 From: obdev Date: Mon, 19 Aug 2024 18:53:31 +0000 Subject: [PATCH] BUGFIX: fix tablelock compat problem --- src/storage/tablelock/ob_table_lock_common.cpp | 2 +- src/storage/tablelock/ob_table_lock_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/tablelock/ob_table_lock_common.cpp b/src/storage/tablelock/ob_table_lock_common.cpp index f5bdd891ca..a3f529cf30 100644 --- a/src/storage/tablelock/ob_table_lock_common.cpp +++ b/src/storage/tablelock/ob_table_lock_common.cpp @@ -228,7 +228,7 @@ int ObTableLockOwnerID::deserialize(const char* buf, const int64_t data_len, int { int ret = OB_SUCCESS; const int64_t origin_pos = pos; - int16_t magic_num = 0; + int64_t magic_num = 0; if (OB_ISNULL(buf) || OB_UNLIKELY(data_len <= 0)) { ret = OB_INVALID_ARGUMENT; LOG_WARN("invalid args", KR(ret), KP(buf), K(data_len)); diff --git a/src/storage/tablelock/ob_table_lock_common.h b/src/storage/tablelock/ob_table_lock_common.h index 193d7fb588..ca20e404c9 100644 --- a/src/storage/tablelock/ob_table_lock_common.h +++ b/src/storage/tablelock/ob_table_lock_common.h @@ -450,7 +450,7 @@ bool is_lock_owner_type_valid(const ObLockOwnerType &type) class ObNewTableLockOwnerID { public: - static const int16_t MAGIC_NUM = -0xABC; + static const int64_t MAGIC_NUM = -0xABC; }; class ObTableLockOwnerID