ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-04-02 15:22:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: поддержка MDBX_MULTIPLE с нулевым размером данных.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2025-03-16 20:23:20 +03:00
parent 7ae11e0fdb
commit 8008afc6e1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cursor.c
View File

@ -728,8 +728,17 @@ __hot int cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, unsig
if (mc->clc->k.cmp(key, &current_key) != 0) if (mc->clc->k.cmp(key, &current_key) != 0)
return MDBX_EKEYMISMATCH; return MDBX_EKEYMISMATCH;
if (unlikely((flags & MDBX_MULTIPLE))) if (unlikely((flags & MDBX_MULTIPLE))) {
goto drop_current; if (unlikely(!mc->subcur))
return MDBX_EINVAL;
err = cursor_del(mc, flags & MDBX_ALLDUPS);
if (unlikely(err != MDBX_SUCCESS))
return err;
if (unlikely(data[1].iov_len == 0))
return MDBX_SUCCESS;
flags -= MDBX_CURRENT;
goto skip_check_samedata;
}
if (mc->subcur) { if (mc->subcur) {
node_t *node = page_node(mc->pg[mc->top], mc->ki[mc->top]); node_t *node = page_node(mc->pg[mc->top], mc->ki[mc->top]);
@ -739,7 +748,6 @@ __hot int cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, unsig
* отличается, то вместо обновления требуется удаление и * отличается, то вместо обновления требуется удаление и
* последующая вставка. */ * последующая вставка. */
if (mc->subcur->nested_tree.items > 1 || current_data.iov_len != data->iov_len) { if (mc->subcur->nested_tree.items > 1 || current_data.iov_len != data->iov_len) {
drop_current:
err = cursor_del(mc, flags & MDBX_ALLDUPS); err = cursor_del(mc, flags & MDBX_ALLDUPS);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
@ -830,7 +838,7 @@ __hot int cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, unsig
return csr.err; return csr.err;
} }
} }
} else if ((flags & MDBX_RESERVE) == 0) { } else if (!(flags & (MDBX_RESERVE | MDBX_MULTIPLE))) {
if (unlikely(eq_fast(data, &old_data))) { if (unlikely(eq_fast(data, &old_data))) {
cASSERT(mc, mc->clc->v.cmp(data, &old_data) == 0); cASSERT(mc, mc->clc->v.cmp(data, &old_data) == 0);
/* the same data, nothing to update */ /* the same data, nothing to update */
@ -847,6 +855,8 @@ __hot int cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, unsig
size_t *batch_dupfix_done = nullptr, batch_dupfix_given = 0; size_t *batch_dupfix_done = nullptr, batch_dupfix_given = 0;
if (unlikely(flags & MDBX_MULTIPLE)) { if (unlikely(flags & MDBX_MULTIPLE)) {
batch_dupfix_given = data[1].iov_len; batch_dupfix_given = data[1].iov_len;
if (unlikely(data[1].iov_len == 0))
return /* nothing todo */ MDBX_SUCCESS;
batch_dupfix_done = &data[1].iov_len; batch_dupfix_done = &data[1].iov_len;
*batch_dupfix_done = 0; *batch_dupfix_done = 0;
} }