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

[CP] fix KVCache core

Browse Source
This commit is contained in:
z404289981
2024-04-03 02:57:14 +00:00
committed by ob-robot
parent 48ef5e0a5c
commit 68a539cb15
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/share/cache/ob_kvcache_map.cpp vendored
View File

@ -211,11 +211,6 @@ int ObKVCacheMap::put(
if (NULL == iter) { if (NULL == iter) {
// put new node // put new node
(void) ATOMIC_AAF(&inst.status_.kv_cnt_, 1); (void) ATOMIC_AAF(&inst.status_.kv_cnt_, 1);
} else {
// overwrite
(void) ATOMIC_SAF(&iter->mb_handle_->kv_cnt_, 1);
(void) ATOMIC_SAF(&iter->mb_handle_->get_cnt_, iter->get_cnt_);
} }
(void) ATOMIC_AAF(&mb_handle->kv_cnt_, 1); (void) ATOMIC_AAF(&mb_handle->kv_cnt_, 1);
(void) ATOMIC_AAF(&mb_handle->get_cnt_, 1); (void) ATOMIC_AAF(&mb_handle->get_cnt_, 1);
@ -296,37 +291,31 @@ int ObKVCacheMap::get(
iter = iter->next_; iter = iter->next_;
} }
int tmp_ret = OB_SUCCESS;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (NULL == iter) { } else if (NULL == iter) {
ret = OB_ENTRY_NOT_EXIST; ret = OB_ENTRY_NOT_EXIST;
} else if (OB_UNLIKELY(mb_handle_kv_cnt < 0)) {
tmp_ret = OB_ERR_UNEXPECTED;
COMMON_LOG(ERROR, "unexpected kv cnt", K(tmp_ret), K(mb_handle_kv_cnt), KPC(iter->mb_handle_));
} else { } else {
if (LRU == mb_policy && need_modify_cache(iter_get_cnt, mb_get_cnt, mb_handle_kv_cnt)) { if (LRU == mb_policy && need_modify_cache(iter_get_cnt, mb_get_cnt, mb_handle_kv_cnt)) {
int tmp_ret = OB_SUCCESS;
ObBucketWLockGuard guard(bucket_lock_, bucket_pos); ObBucketWLockGuard guard(bucket_lock_, bucket_pos);
if (OB_TMP_FAIL(guard.get_ret())) { if (OB_TMP_FAIL(guard.get_ret())) {
COMMON_LOG(WARN, "Fail to write lock bucket, ", K(tmp_ret), K(bucket_pos)); COMMON_LOG(WARN, "Fail to write lock bucket, ", K(tmp_ret), K(bucket_pos));
} else { } else {
Node *curr = get_bucket_node(bucket_pos);
bucket_ptr = curr;
prev = NULL; prev = NULL;
iter = bucket_ptr; while (nullptr != curr) {
bool is_equal = false; if (curr == iter) {
while (NULL != iter && OB_LIKELY(OB_SUCCESS == tmp_ret)) { if (OB_TMP_FAIL(internal_data_move(hazard_guard, prev, iter, bucket_ptr))) {
if (hash_code == iter->hash_code_) { COMMON_LOG(WARN, "Fail to move node to LFU block, ", K(tmp_ret));
if (store_->add_handle_ref(iter->mb_handle_, iter->seq_num_)) {
if (OB_TMP_FAIL(key.equal(*iter->key_, is_equal))) {
COMMON_LOG(WARN, "Failed to check kvcache key equal", K(tmp_ret));
} else if (is_equal) {
ObKVMemBlockHandle *old_handle = iter->mb_handle_;
if (OB_TMP_FAIL(internal_data_move(hazard_guard, prev, iter, bucket_ptr))) {
COMMON_LOG(WARN, "Fail to move node to LFU block, ", K(tmp_ret));
}
store_->de_handle_ref(old_handle);
break;
}
store_->de_handle_ref(iter->mb_handle_);
} }
break;
} }
prev = iter; prev = curr;
iter = iter->next_; curr = curr->next_;
} }
} }
} }