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

Add some more resiliency to serialize()

kv-update
Vitaliy Filippov 2023-10-25 13:25:10 +03:00
parent bf9a279ff9
commit de41e46335
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kv_db.cpp
View File

@ -344,13 +344,12 @@ bool kv_block_t::serialize(uint8_t *buf, int size)
*(uint64_t*)(buf+pos) = (change_type & KV_CH_SPLIT) ? change_rh_block : right_half_block;
pos += 8;
}
auto old_it = (change_type & KV_CH_DEL) ? data.find(change_key)
: ((change_type & KV_CH_ADD) ? data.lower_bound(change_key) : data.end());
auto old_it = (change_type & KV_CH_UPD) ? data.lower_bound(change_key) : data.end();
auto end_it = (change_type & KV_CH_SPLIT) ? data.lower_bound(change_rh) : data.end();
blk->items = 0;
for (auto kv_it = data.begin(); kv_it != end_it; kv_it++)
{
if (!(change_type & KV_CH_DEL) || kv_it != old_it)
if (!(change_type & KV_CH_DEL) || kv_it != old_it || old_it->first != change_key)
{
if (!write_string(buf, size, &pos, kv_it->first) ||
!write_string(buf, size, &pos, kv_it->second))