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

BUGFIX: fix test_lock_table_callback core

Browse Source
This commit is contained in:
obdev 2024-06-26 10:16:58 +00:00 committed by ob-robot
parent eb005d6b57
commit 718c845327
2 changed files with 11 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mittest/mtlenv/tablelock/test_lock_table_callback.cpp
View File

@ -107,6 +107,11 @@ private:
ASSERT_EQ(OB_SUCCESS, ret);
cb->set(mt_key, lock_op_node);
}
void free_callback(ObOBJLockCallback *&cb)
{
mt_ctx_.free_table_lock_callback(cb);
cb = nullptr;
}
private:
ObLSID ls_id_;
@ -159,6 +164,7 @@ TEST_F(TestLockTableCallback, callback)
ASSERT_EQ(lock_exist, true);
ret = cb->trans_commit();
ASSERT_EQ(OB_SUCCESS, ret);
free_callback(cb);
ret = mt_ctx_.check_lock_exist(DEFAULT_IN_TRANS_LOCK_OP.lock_id_,
DEFAULT_IN_TRANS_LOCK_OP.owner_id_,
DEFAULT_IN_TRANS_LOCK_OP.lock_mode_,
@ -178,6 +184,7 @@ TEST_F(TestLockTableCallback, callback)
ASSERT_EQ(lock_exist, true);
ret = cb->trans_abort();
ASSERT_EQ(OB_SUCCESS, ret);
free_callback(cb);
ret = mt_ctx_.check_lock_exist(DEFAULT_IN_TRANS_LOCK_OP.lock_id_,
DEFAULT_IN_TRANS_LOCK_OP.owner_id_,
DEFAULT_IN_TRANS_LOCK_OP.lock_mode_,
@ -197,6 +204,7 @@ TEST_F(TestLockTableCallback, callback)
ASSERT_EQ(lock_exist, true);
ret = cb->rollback_callback();
ASSERT_EQ(OB_SUCCESS, ret);
free_callback(cb);
ret = mt_ctx_.check_lock_exist(DEFAULT_IN_TRANS_LOCK_OP.lock_id_,
DEFAULT_IN_TRANS_LOCK_OP.owner_id_,
DEFAULT_IN_TRANS_LOCK_OP.lock_mode_,
@ -229,6 +237,9 @@ TEST_F(TestLockTableCallback, basic)
ret = cb->get_redo(redo_node);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(redo_node.lock_id_, DEFAULT_IN_TRANS_LOCK_OP.lock_id_);
ret = cb->rollback_callback();
ASSERT_EQ(OB_SUCCESS, ret);
free_callback(cb);
}
} // tablelock

140
src/storage/memtable/ob_arena_object_pool.h
View File

@ -1,140 +0,0 @@
/**
* Copyright (c) 2021 OceanBase
* OceanBase CE is licensed under Mulan PubL v2.
* You can use this software according to the terms and conditions of the Mulan PubL v2.
* You may obtain a copy of Mulan PubL v2 at:
* http://license.coscl.org.cn/MulanPubL-2.0
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PubL v2 for more details.
*/
#ifndef OCEANBASE_TRANSACTION_OB_ARENA_OBJ_POOL_
#define OCEANBASE_TRANSACTION_OB_ARENA_OBJ_POOL_
#include <stdint.h>
#include "lib/allocator/ob_allocator.h"
#include "lib/lock/ob_spin_rwlock.h"
#include "lib/utility/ob_print_utils.h"
namespace oceanbase
{
namespace memtable
{
// #define OB_ENABLE_MEMTABLE_CTX_OBJ_CACHE_DEBUG
template <typename T, int64_t OBJ_NUM>
class ObArenaObjPool
{
public:
ObArenaObjPool(common::ObIAllocator &allocator)
: allocator_(allocator),
alloc_count_(0),
free_count_(0) {}
ObArenaObjPool() = delete;
void *alloc();
void free(void *obj);
void reset();
TO_STRING_KV(K_(alloc_count), K_(free_count));
private:
common::ObIAllocator &allocator_;
int64_t alloc_count_;
int64_t free_count_;
// only used one time.
char obj_pool_[sizeof(T) * OBJ_NUM];
#ifdef OB_ENABLE_MEMTABLE_CTX_OBJ_CACHE_DEBUG
public:
void *alloc(bool &hit_cache);
#endif
};
template <typename T, int64_t OBJ_NUM>
void *ObArenaObjPool<T, OBJ_NUM>::alloc()
{
void *ptr = nullptr;
int64_t allocated_count = ATOMIC_FAA(&alloc_count_, 1);
if (allocated_count < OBJ_NUM) {
int64_t pos = sizeof(T) * allocated_count;
ptr = &obj_pool_[pos];
} else {
const int64_t size = sizeof(T);
ptr = allocator_.alloc(size);
}
if (OB_ISNULL(ptr)) {
ATOMIC_DEC(&alloc_count_);
STORAGE_LOG_RET(ERROR, common::OB_ALLOCATE_MEMORY_FAILED, "obj alloc error, no memory", K(*this), K(lbt()));
} else {
STORAGE_LOG(DEBUG, "obj alloc succ", K(*this), KP(ptr), K(lbt()));
}
return ptr;
}
template <typename T, int64_t OBJ_NUM>
void ObArenaObjPool<T, OBJ_NUM>::free(void *obj)
{
bool need_free = true;
if (OB_ISNULL(obj)) {
STORAGE_LOG_RET(ERROR, common::OB_ERR_UNEXPECTED, "obj is null, unexpected error", KP(obj), K(*this), K(lbt()));
} else {
STORAGE_LOG(DEBUG, "object free succ", KP(obj), K(*this), K(lbt()));
ATOMIC_INC(&free_count_);
for (int i = 0; need_free && i < OBJ_NUM; i++) {
int64_t pos = sizeof(T) * i;
if (obj == &obj_pool_[pos]) {
// no need free.
need_free = false;
}
}
if (need_free) {
allocator_.free(obj);
}
}
}
template <typename T, int64_t OBJ_NUM>
void ObArenaObjPool<T, OBJ_NUM>::reset()
{
if (OB_UNLIKELY(alloc_count_ != free_count_)) {
TABLELOCK_LOG_RET(ERROR, common::OB_ERR_UNEXPECTED, "object alloc and free count not match", K(*this));
}
alloc_count_ = 0;
free_count_ = 0;
}
#ifdef OB_ENABLE_MEMTABLE_CTX_OBJ_CACHE_DEBUG
template <typename T, int64_t OBJ_NUM>
void *ObArenaObjPool<T, OBJ_NUM>::alloc(bool &hit_cache)
{
void *ptr = nullptr;
int64_t allocated_count = ATOMIC_FAA(&alloc_count_, 1);
if (allocated_count < OBJ_NUM) {
int64_t pos = sizeof(T) * allocated_count;
ptr = &obj_pool_[pos];
hit_cache = true;
} else {
const int64_t size = sizeof(T);
ptr = allocator_.alloc(size);
hit_cache = false;
}
if (OB_ISNULL(ptr)) {
ATOMIC_DEC(&alloc_count_);
STORAGE_LOG_RET(ERROR, common::OB_ALLOCATE_MEMORY_FAILED, "obj alloc error, no memory", K(*this), K(lbt()));
} else {
STORAGE_LOG(DEBUG, "obj alloc succ", K(*this), KP(ptr), K(lbt()));
}
return ptr;
}
#endif
} // namespace memtable
} // namespace oceanbase
#endif