vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 69 Wiki Activity

Simplify code by removing an unneeded "optimisation"

antietcd
Vitaliy Filippov 2023-11-05 20:00:13 +03:00
parent 79ae0aadcd
commit 5cf9b343c0
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kv_db.cpp
View File

@ -1293,28 +1293,15 @@ void kv_op_t::update()
void kv_op_t::update_find() void kv_op_t::update_find()
{ {
auto blk_it = db->block_cache.find(cur_block);
if (blk_it != db->block_cache.end())
{
auto blk = &blk_it->second;
if (blk->updating)
{
// Optimisation: do not recheck the block if it's already being modified
db->continue_update.emplace(blk->offset, [=]() { update_find(); });
return;
}
}
get_block(db, cur_block, cur_level, recheck_policy, [=, checked_block = cur_block](int res, bool updated) get_block(db, cur_block, cur_level, recheck_policy, [=, checked_block = cur_block](int res, bool updated)
{ {
res = handle_block(res, updated, true); res = handle_block(res, updated, true);
if (res == -EAGAIN) if (res == -EAGAIN)
{ {
db->run_continue_update(checked_block);
update_find(); update_find();
} }
else if (res == -ENOTBLK) else if (res == -ENOTBLK)
{ {
db->run_continue_update(checked_block);
if (opcode == KV_SET) if (opcode == KV_SET)
{ {
// Check CAS callback // Check CAS callback
@ -1330,12 +1317,10 @@ void kv_op_t::update_find()
} }
else if (res == -ECHILD) else if (res == -ECHILD)
{ {
db->run_continue_update(checked_block);
resume_split(); resume_split();
} }
else if (res < 0) else if (res < 0)
{ {
db->run_continue_update(checked_block);
finish(res); finish(res);
} }
else else