summaryrefslogtreecommitdiff
path: root/libs/libmdbx/src/mdbx.h
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-09-26 13:59:25 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-09-26 13:59:25 +0300
commit7eabf1f5a4d7691af4cbf7ac470b4aca75f78443 (patch)
tree6b89cb287fb8b5fa82e8334bebc41b1309a27694 /libs/libmdbx/src/mdbx.h
parent1291ee8b887f46ee8db1b87492931213b82c6439 (diff)
libmdbx: merge to 0.2
Diffstat (limited to 'libs/libmdbx/src/mdbx.h')
-rw-r--r--libs/libmdbx/src/mdbx.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/libs/libmdbx/src/mdbx.h b/libs/libmdbx/src/mdbx.h
index 8720f34ae0..283f595df6 100644
--- a/libs/libmdbx/src/mdbx.h
+++ b/libs/libmdbx/src/mdbx.h
@@ -369,17 +369,17 @@ typedef enum MDBX_cursor_op {
MDBX_GET_BOTH, /* MDBX_DUPSORT-only: Position at key/data pair. */
MDBX_GET_BOTH_RANGE, /* MDBX_DUPSORT-only: position at key, nearest data. */
MDBX_GET_CURRENT, /* Return key/data at current cursor position */
- MDBX_GET_MULTIPLE, /* MDBX_DUPFIXED-only: Return key and up to a page of
- * duplicate data items from current cursor position.
- * Move cursor to prepare for MDBX_NEXT_MULTIPLE.*/
+ MDBX_GET_MULTIPLE, /* MDBX_DUPFIXED-only: Return up to a page of duplicate
+ * data items from current cursor position.
+ * Move cursor to prepare for MDBX_NEXT_MULTIPLE. */
MDBX_LAST, /* Position at last key/data item */
MDBX_LAST_DUP, /* MDBX_DUPSORT-only: Position at last data item
* of current key. */
MDBX_NEXT, /* Position at next data item */
MDBX_NEXT_DUP, /* MDBX_DUPSORT-only: Position at next data item
* of current key. */
- MDBX_NEXT_MULTIPLE, /* MDBX_DUPFIXED-only: Return key and up to a page of
- * duplicate data items from next cursor position.
+ MDBX_NEXT_MULTIPLE, /* MDBX_DUPFIXED-only: Return up to a page of duplicate
+ * data items from next cursor position.
* Move cursor to prepare for MDBX_NEXT_MULTIPLE. */
MDBX_NEXT_NODUP, /* Position at first data item of next key */
MDBX_PREV, /* Position at previous data item */
@@ -391,7 +391,7 @@ typedef enum MDBX_cursor_op {
MDBX_SET_RANGE, /* Position at first key greater than or equal to
* specified key. */
MDBX_PREV_MULTIPLE /* MDBX_DUPFIXED-only: Position at previous page and
- * return key and up to a page of duplicate data items. */
+ * return up to a page of duplicate data items. */
} MDBX_cursor_op;
/* Return Codes
@@ -989,7 +989,7 @@ LIBMDBX_API int mdbx_env_set_assert(MDBX_env *env, MDBX_assert_func *func);
* Returns A non-zero error value on failure and 0 on success, some
* possible errors are:
* - MDBX_PANIC - a fatal error occurred earlier and the environment
- * must be shut down.
+ * must be shut down.
* - MDBX_MAP_RESIZED - another process wrote data beyond this MDBX_env's
* mapsize and this environment's map must be resized
* as well. See mdbx_env_set_mapsize().
@@ -1486,6 +1486,9 @@ LIBMDBX_API int mdbx_cursor_put(MDBX_cursor *cursor, MDBX_val *key,
/* Delete current key/data pair
*
* This function deletes the key/data pair to which the cursor refers.
+ * This does not invalidate the cursor, so operations such as MDBX_NEXT
+ * can still be used on it. Both MDBX_NEXT and MDBX_GET_CURRENT will return
+ * the same record after this operation.
*
* [in] cursor A cursor handle returned by mdbx_cursor_open()
* [in] flags Options for this operation. This parameter must be set to 0