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

[FEAT MERGE]vos merge into master

Browse Source 
Co-authored-by: ZenoWang <wzybuaasoft@163.com>
Co-authored-by: zhjc1124 <zhjc1124@gmail.com>
Co-authored-by: JiahuaChen <garfieldjia@qq.com>
This commit is contained in:
nroskill
2023-02-24 14:26:20 +00:00
committed by ob-robot
parent 11dc664903
commit a4c97d03f7
284 changed files with 9655 additions and 4755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/alloc/object_set.cpp vendored
View File

@ -377,6 +377,7 @@ void ObjectSet::free_object(AObject *obj)
}
#endif
const int64_t ctx_id = blk_mgr_->ctx_id_;
ObDisableDiagnoseGuard diagnose_disable_guard;
if (ctx_id == common::ObCtxIds::LIBEASY) {
if (locker_->trylock()) {
do_free_object(obj);
@ -417,6 +418,7 @@ void ObjectSet::do_free_object(AObject *obj)
used_bytes_ -= hold;
obj->in_use_ = false;
obj->on_malloc_sample_ = false;
if (!obj->is_large_) {
free_normal_object(obj);
} else {