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

Disable tablet size static assert when compile with ENABLE_OBJ_LEAK_CHECK

Browse Source
This commit is contained in:
ND501 2023-10-17 11:40:22 +00:00 committed by ob-robot
parent 4ea98fa483
commit 2c5bdd7e2b
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/meta_mem/ob_tablet_pointer.cpp
View File

@ -47,8 +47,8 @@ ObTabletPointer::ObTabletPointer()
mds_table_handler_(),
old_version_chain_(nullptr)
{
#if defined(__x86_64__)
static_assert(sizeof(ObTabletPointer) == 272, "The size of ObTabletPointer will affect the meta memory manager, and the necessity of adding new fields needs to be considered.");
#if defined(__x86_64__) && !defined(ENABLE_OBJ_LEAK_CHECK)
static_assert(sizeof(ObTabletPointer) == 272, "The size of ObTabletPointer will affect the meta memory manager, and the necessity of adding new fields needs to be considered.");
#endif
}

7
src/storage/tablet/ob_tablet.cpp
View File

@ -129,7 +129,6 @@ ObTablet::ObTablet()
ddl_kvs_(nullptr),
ddl_kv_count_(0),
pointer_hdl_(),
next_full_tablet_guard_(),
tablet_addr_(),
allocator_(nullptr),
memtables_lock_(),
@ -142,8 +141,8 @@ ObTablet::ObTablet()
tablet_status_cache_(),
ddl_data_cache_()
{
#if defined(__x86_64__)
static_assert(sizeof(ObTablet) + sizeof(ObRowkeyReadInfo) == 1632, "The size of ObTablet will affect the meta memory manager, and the necessity of adding new fields needs to be considered.");
#if defined(__x86_64__) && !defined(ENABLE_OBJ_LEAK_CHECK)
static_assert(sizeof(ObTablet) + sizeof(ObRowkeyReadInfo) == 1576, "The size of ObTablet will affect the meta memory manager, and the necessity of adding new fields needs to be considered.");
#endif
MEMSET(memtables_, 0x0, sizeof(memtables_));
}
@ -165,7 +164,6 @@ void ObTablet::reset()
tablet_meta_.reset();
mds_data_.reset();
tablet_addr_.reset();
next_full_tablet_guard_.reset();
memtable_mgr_ = nullptr;
log_handler_ = nullptr;
pointer_hdl_.reset();
@ -5029,7 +5027,6 @@ int64_t ObTablet::to_string(char *buf, const int64_t buf_len) const
K_(storage_schema_addr),
K_(next_tablet_guard),
K_(pointer_hdl),
K_(next_full_tablet_guard),
KP_(next_tablet),
KP_(memtable_mgr),
KP_(log_handler),

3
src/storage/tablet/ob_tablet.h
View File

@ -215,8 +215,6 @@ public:
void set_tablet_addr(const ObMetaDiskAddr &tablet_addr);
void set_allocator(ObArenaAllocator *allocator) { allocator_ = allocator; }
void set_next_full_tablet(const ObTabletHandle &next_tablet_guard) { next_full_tablet_guard_ = next_tablet_guard;}
ObTabletHandle &get_next_full_tablet() { return next_full_tablet_guard_; }
void set_next_tablet(ObTablet* tablet) { next_tablet_ = tablet; }
ObTablet *get_next_tablet() { return next_tablet_; }
ObArenaAllocator *get_allocator() { return allocator_;}
@ -758,7 +756,6 @@ private:
ObITable **ddl_kvs_;
int64_t ddl_kv_count_;
ObTabletPointerHandle pointer_hdl_; // size: 24B, alignment: 8B
ObTabletHandle next_full_tablet_guard_; // size: 56B, alignment: 8B
ObMetaDiskAddr tablet_addr_; // size: 40B, alignment: 8B
// NOTICE: these two pointers: memtable_mgr_ and log_handler_,
// are considered as cache for tablet.