Skip to content

Commit 349e763

Browse files
erthinkerthink
committed
mdbx: minor fix assertion inside cursor_put() to avoid Valgrind warning.
1 parent c6912a6 commit 349e763

File tree

10 files changed

+18
-22
lines changed

10 files changed

+18
-22
lines changed

‎ChangeLog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Fixes:
4545
In the 0.14.x version series, this mechanism has been completely updated.
4646
However, for version 0.13.11, this inelegant modification done in order to reduce the risk of regression.
4747

48-
- Minor fixed `iov_callback4dirtypages()` for Valgrind/ASAN.
48+
- Minor fixed `iov_callback4dirtypages()` and assertion inside `cursor_put()` to avoid Valgrind/ASAN warnings.
4949

5050
- Fixed cursor(s) finalization after ones explicitly closed in a nested transactions.
5151

‎VERSION.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "git_describe": "v0.13.10-62-g644ef70e", "git_timestamp": "2026-01-24T13:18:23+03:00", "git_tree": "07fda2b16a19fdb6659b39e6aaff79bdae7d45cf", "git_commit": "644ef70e43da18e33c89eec7a2724ced5f5a58a6", "semver": "0.13.10.62" }
1+
{ "git_describe": "v0.13.10-63-g79a7f4cb", "git_timestamp": "2026-01-24T16:54:40+03:00", "git_tree": "18d5f4af596c16df79251b2a38eb0ac9b460d6a5", "git_commit": "79a7f4cb394d34a109dfc1b00d462fddbec66123", "semver": "0.13.10.63" }

‎mdbx.c‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#define xMDBX_ALLOY 1 /* alloyed build */
66

7-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
7+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
88

99
#define LIBMDBX_INTERNALS
1010
#define MDBX_DEPRECATED
@@ -16888,7 +16888,7 @@ __hot int cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, unsig
1688816888
}
1688916889
} else {
1689016890
csr_t csr =
16891-
/* olddata may not be updated in case DUPFIX-page of dupfix-table */
16891+
/* old_data may not be updated in case DUPFIX-page of dupfix-table */
1689216892
cursor_seek(mc, (MDBX_val *)key, &old_data, MDBX_SET);
1689316893
rc = csr.err;
1689416894
exact = csr.exact;
@@ -16901,12 +16901,9 @@ __hot int cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data, unsig
1690116901
return MDBX_KEYEXIST;
1690216902
}
1690316903
if (unlikely(mc->flags & z_inner)) {
16904-
/* nested subtree of DUPSORT-database with the same key,
16905-
* nothing to update */
16906-
eASSERT(env, data->iov_len == 0 && (old_data.iov_len == 0 ||
16907-
/* olddata may not be updated in case
16908-
DUPFIX-page of dupfix-table */
16909-
(mc->tree->flags & MDBX_DUPFIXED)));
16904+
/* nested subtree of DUPSORT-database with the same key, nothing to update */
16905+
eASSERT(env, data->iov_len == 0 && (/* old_data may not be updated in case DUPFIX-page of dupfix-table */
16906+
(mc->tree->flags & MDBX_DUPFIXED) || old_data.iov_len == 0));
1691016907
return MDBX_SUCCESS;
1691116908
}
1691216909
if (unlikely(flags & MDBX_ALLDUPS) && inner_pointed(mc)) {
@@ -17458,8 +17455,7 @@ insert_node:;
1745817455
if (!is_related(mc, m2) || m2->pg[mc->top] != mp)
1745917456
continue;
1746017457
if (/* пропускаем незаполненные курсоры, иначе получится что у такого
17461-
курсора будет инициализирован вложенный,
17462-
что антилогично и бесполезно. */
17458+
курсора будет инициализирован вложенный, что антилогично и бесполезно. */
1746317459
is_filled(m2) && m2->ki[mc->top] == mc->ki[mc->top]) {
1746417460
cASSERT(m2, m2->subcur->cursor.clc == mx->cursor.clc);
1746517461
m2->subcur->nested_tree = mx->nested_tree;
@@ -37603,10 +37599,10 @@ __dll_export
3760337599
0,
3760437600
13,
3760537601
10,
37606-
62,
37602+
63,
3760737603
"", /* pre-release suffix of SemVer
37608-
0.13.10.62 */
37609-
{"2026-01-24T13:18:23+03:00", "07fda2b16a19fdb6659b39e6aaff79bdae7d45cf", "644ef70e43da18e33c89eec7a2724ced5f5a58a6", "v0.13.10-62-g644ef70e"},
37604+
0.13.10.63 */
37605+
{"2026-01-24T16:54:40+03:00", "18d5f4af596c16df79251b2a38eb0ac9b460d6a5", "79a7f4cb394d34a109dfc1b00d462fddbec66123", "v0.13.10-63-g79a7f4cb"},
3761037606
sourcery};
3761137607

3761237608
__dll_export

‎mdbx.c++‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
33
/* clang-format off */
44

5-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
5+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
66

77
#define LIBMDBX_INTERNALS
88
#define MDBX_DEPRECATED

‎mdbx_chk.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
21+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

‎mdbx_copy.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
21+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

‎mdbx_drop.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
21+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

‎mdbx_dump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
21+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

‎mdbx_load.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
21+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

‎mdbx_stat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 3ebf5275126ba3f56ca18b556d463984bb894c6b8e5605e53a54ad161f82742a_v0_13_10_62_g644ef70e
21+
#define MDBX_BUILD_SOURCERY 48605816f6d30a7c8ee5b498bedca4412a19e731e606460d2537ec7ad743d7f0_v0_13_10_63_g79a7f4cb
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

0 commit comments

Comments
 (0)