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

mdbx: добавление MDBX_SEEK_AND_GET_MULTIPLE в API операций курсора.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2025-03-09 01:40:31 +03:00
parent b546dc69d2
commit 2ffa5cf371
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mdbx.h
View File

@ -1718,7 +1718,7 @@ typedef enum MDBX_cursor_op {
/** \ref MDBX_DUPFIXED -only: Return up to a page of duplicate data items /** \ref MDBX_DUPFIXED -only: Return up to a page of duplicate data items
* from current cursor position. Move cursor to prepare * from current cursor position. Move cursor to prepare
* for \ref MDBX_NEXT_MULTIPLE. */ * for \ref MDBX_NEXT_MULTIPLE. \see MDBX_SEEK_AND_GET_MULTIPLE */
MDBX_GET_MULTIPLE, MDBX_GET_MULTIPLE,
/** Position at last key/data item */ /** Position at last key/data item */
@ -1734,8 +1734,8 @@ typedef enum MDBX_cursor_op {
MDBX_NEXT_DUP, MDBX_NEXT_DUP,
/** \ref MDBX_DUPFIXED -only: Return up to a page of duplicate data items /** \ref MDBX_DUPFIXED -only: Return up to a page of duplicate data items
* from next cursor position. Move cursor to prepare * from next cursor position. Move cursor to prepare for `MDBX_NEXT_MULTIPLE`.
* for `MDBX_NEXT_MULTIPLE`. */ * \see MDBX_SEEK_AND_GET_MULTIPLE \see MDBX_GET_MULTIPLE */
MDBX_NEXT_MULTIPLE, MDBX_NEXT_MULTIPLE,
/** Position at first data item of next key */ /** Position at first data item of next key */
@ -1760,7 +1760,8 @@ typedef enum MDBX_cursor_op {
MDBX_SET_RANGE, MDBX_SET_RANGE,
/** \ref MDBX_DUPFIXED -only: Position at previous page and return up to /** \ref MDBX_DUPFIXED -only: Position at previous page and return up to
* a page of duplicate data items. */ * a page of duplicate data items.
* \see MDBX_SEEK_AND_GET_MULTIPLE \see MDBX_GET_MULTIPLE */
MDBX_PREV_MULTIPLE, MDBX_PREV_MULTIPLE,
/** Positions cursor at first key-value pair greater than or equal to /** Positions cursor at first key-value pair greater than or equal to
@ -1812,7 +1813,12 @@ typedef enum MDBX_cursor_op {
MDBX_TO_PAIR_LESSER_OR_EQUAL /** \copydoc MDBX_TO_PAIR_LESSER_THAN */, MDBX_TO_PAIR_LESSER_OR_EQUAL /** \copydoc MDBX_TO_PAIR_LESSER_THAN */,
MDBX_TO_PAIR_EQUAL /** \copydoc MDBX_TO_PAIR_LESSER_THAN */, MDBX_TO_PAIR_EQUAL /** \copydoc MDBX_TO_PAIR_LESSER_THAN */,
MDBX_TO_PAIR_GREATER_OR_EQUAL /** \copydoc MDBX_TO_PAIR_LESSER_THAN */, MDBX_TO_PAIR_GREATER_OR_EQUAL /** \copydoc MDBX_TO_PAIR_LESSER_THAN */,
MDBX_TO_PAIR_GREATER_THAN /** \copydoc MDBX_TO_PAIR_LESSER_THAN */ MDBX_TO_PAIR_GREATER_THAN /** \copydoc MDBX_TO_PAIR_LESSER_THAN */,
/** \ref MDBX_DUPFIXED -only: Seek to given key and return up to a page of
* duplicate data items from current cursor position. Move cursor to prepare
* for \ref MDBX_NEXT_MULTIPLE. \see MDBX_GET_MULTIPLE */
MDBX_SEEK_AND_GET_MULTIPLE
} MDBX_cursor_op; } MDBX_cursor_op;
/** \brief Errors and return codes /** \brief Errors and return codes

38
src/cursor.c
View File

@ -2049,27 +2049,24 @@ __hot int cursor_ops(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, const MDBX_
cASSERT(mc, is_poor(mc) && !is_filled(mc)); cASSERT(mc, is_poor(mc) && !is_filled(mc));
return rc; return rc;
case MDBX_SEEK_AND_GET_MULTIPLE:
if (unlikely(!key))
return MDBX_EINVAL;
rc = cursor_seek(mc, key, data, MDBX_SET).err;
if (unlikely(rc != MDBX_SUCCESS))
return rc;
__fallthrough /* fall through */;
case MDBX_GET_MULTIPLE: case MDBX_GET_MULTIPLE:
if (unlikely(!data)) if (unlikely(!data))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely((mc->tree->flags & MDBX_DUPFIXED) == 0)) if (unlikely((mc->tree->flags & MDBX_DUPFIXED) == 0))
return MDBX_INCOMPATIBLE; return MDBX_INCOMPATIBLE;
if (unlikely(!is_pointed(mc))) { if (unlikely(!is_filled(mc)))
if (unlikely(!key)) return MDBX_ENODATA;
return MDBX_EINVAL; if (key) {
if (unlikely((mc->flags & z_fresh) == 0)) const page_t *mp = mc->pg[mc->top];
return MDBX_ENODATA; const node_t *node = page_node(mp, mc->ki[mc->top]);
rc = cursor_seek(mc, key, data, MDBX_SET).err; *key = get_key(node);
if (unlikely(rc != MDBX_SUCCESS))
return rc;
} else {
if (unlikely(!is_filled(mc)))
return MDBX_ENODATA;
if (key) {
const page_t *mp = mc->pg[mc->top];
const node_t *node = page_node(mp, mc->ki[mc->top]);
*key = get_key(node);
}
} }
cASSERT(mc, is_filled(mc)); cASSERT(mc, is_filled(mc));
if (unlikely(!inner_filled(mc))) { if (unlikely(!inner_filled(mc))) {
@ -2104,15 +2101,6 @@ __hot int cursor_ops(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data, const MDBX_
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(mc->subcur == nullptr)) if (unlikely(mc->subcur == nullptr))
return MDBX_INCOMPATIBLE; return MDBX_INCOMPATIBLE;
if (unlikely(!is_pointed(mc))) {
if (unlikely((mc->flags & z_fresh) == 0))
return MDBX_ENODATA;
rc = outer_last(mc, key, data);
if (unlikely(rc != MDBX_SUCCESS))
return rc;
mc->subcur->cursor.ki[mc->subcur->cursor.top] = 0;
goto fetch_multiple;
}
if (unlikely(!is_filled(mc) || !inner_filled(mc))) if (unlikely(!is_filled(mc) || !inner_filled(mc)))
return MDBX_ENODATA; return MDBX_ENODATA;
rc = cursor_sibling_left(&mc->subcur->cursor); rc = cursor_sibling_left(&mc->subcur->cursor);