mdbx: fix counting of nested trees for multi-values/dupsort hives (v0.13.11-2-gea86a7d3).

erthink · erthink · commit 6b3141f3eacf · 2026-02-10T15:48:47.000+03:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,20 @@ Donations are welcome to ETH `0xD104d8f8B2dC312aaD74899F83EBf3EEBDC1EA3A`,
 BTC `bc1qzvl9uegf2ea6cwlytnanrscyv8snwsvrc0xfsu`, SOL `FTCTgbHajoLVZGr8aEFWMzx3NDMyS5wXJgfeMTmJznRi`.
 Всё будет хорошо!
 
+## v0.13.12 at a release engineering stage
+
+The supporting release of a stable branch with bug fixes.
+
+Appreciations:
+
+ - [Erigon](https://erigon.tech/) for sponsorship.
+
+Fixes:
+
+ - Fixed the counting of nested trees in the `mdbx_chk` tool for a multi-values/dupsort hives (backport).
+
+--------------------------------------------------------------------------------
+
 ## v0.13.11 "A7A5" (just as Stable) at 2026-01-30
 
 The supporting release of a stable branch with bug fixes.
diff --git a/VERSION.json b/VERSION.json
@@ -1 +1 @@
-{ "git_describe": "v0.13.11-0-gb862eb08", "git_timestamp": "2026-01-30T16:04:44+03:00", "git_tree": "34a88ae65e76bbf3b9bcb0c2106dec18d2c067da", "git_commit": "b862eb08b77eccd4b8e8367a3276ffdea0d73de5", "semver": "0.13.11" }
+{ "git_describe": "v0.13.11-2-gea86a7d3", "git_timestamp": "2026-02-10T15:44:23+03:00", "git_tree": "6c6246e4db75b4380b96067073d2ce2449a500d6", "git_commit": "ea86a7d37821a8187c8cd39b61e1de030cfa39c8", "semver": "0.13.11.2" }
diff --git a/mdbx.c b/mdbx.c
@@ -4,7 +4,7 @@
 
 #define xMDBX_ALLOY 1  /* alloyed build */
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
@@ -13834,11 +13834,11 @@ typedef struct MDBX_chk_internal {
   bool got_break;
   bool write_locked;
   uint8_t scope_depth;
+  pgno_t last_nested_root;
 
   MDBX_chk_table_t table_gc, table_main;
   int16_t *pagemap;
   MDBX_chk_table_t *last_lookup;
-  const void *last_nested;
   MDBX_chk_scope_t scope_stack[12];
   MDBX_chk_table_t *table[MDBX_MAX_DBI + CORE_DBS];
 
@@ -14526,8 +14526,7 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
                        chk_v2a(chk, &tbl->name), tbl->flags, deep);
       nested = nullptr;
     }
-  } else
-    chk->last_nested = nullptr;
+  }
 
   const char *pagetype_caption;
   bool branch = false;
@@ -14580,9 +14579,9 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
     } else {
       pagetype_caption = (pagetype == page_leaf) ? "nested-leaf" : "nested-leaf-dupfix";
       tbl->pages.nested_leaf += 1;
-      if (chk->last_nested != nested) {
+      if (chk->last_nested_root != nested->root) {
         histogram_acc(height, &tbl->histogram.nested_tree);
-        chk->last_nested = nested;
+        chk->last_nested_root = nested->root;
       }
       if (height != nested->height)
         chk_object_issue(scope, "page", pgno, "wrong nested-tree height", "actual %i != %i dupsort-node %s", height,
@@ -37599,10 +37598,10 @@ __dll_export
         0,
         13,
         11,
-        0,
+        2,
         "", /* pre-release suffix of SemVer
-                                        0.13.11 */
-        {"2026-01-30T16:04:44+03:00", "34a88ae65e76bbf3b9bcb0c2106dec18d2c067da", "b862eb08b77eccd4b8e8367a3276ffdea0d73de5", "v0.13.11-0-gb862eb08"},
+                                        0.13.11.2 */
+        {"2026-02-10T15:44:23+03:00", "6c6246e4db75b4380b96067073d2ce2449a500d6", "ea86a7d37821a8187c8cd39b61e1de030cfa39c8", "v0.13.11-2-gea86a7d3"},
         sourcery};
 
 __dll_export
diff --git a/mdbx.c++ b/mdbx.c++
@@ -2,7 +2,7 @@
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 /* clang-format off */
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
diff --git a/mdbx_chk.c b/mdbx_chk.c
@@ -18,7 +18,7 @@
 /// \copyright SPDX-License-Identifier: Apache-2.0
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
diff --git a/mdbx_copy.c b/mdbx_copy.c
@@ -18,7 +18,7 @@
 /// \copyright SPDX-License-Identifier: Apache-2.0
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
diff --git a/mdbx_drop.c b/mdbx_drop.c
@@ -18,7 +18,7 @@
 /// \copyright SPDX-License-Identifier: Apache-2.0
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
diff --git a/mdbx_dump.c b/mdbx_dump.c
@@ -18,7 +18,7 @@
 /// \copyright SPDX-License-Identifier: Apache-2.0
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
diff --git a/mdbx_load.c b/mdbx_load.c
@@ -18,7 +18,7 @@
 /// \copyright SPDX-License-Identifier: Apache-2.0
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED
diff --git a/mdbx_stat.c b/mdbx_stat.c
@@ -18,7 +18,7 @@
 /// \copyright SPDX-License-Identifier: Apache-2.0
 /// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
 
-#define MDBX_BUILD_SOURCERY 90c8567c0f319539000cf161230c67f127fd9cbcb5d35ad5b3b076b78b5dc48d_v0_13_11_0_gb862eb08
+#define MDBX_BUILD_SOURCERY bdee29627d22869c26aa5f0bd1cbf72ec0231c912eec531514f2f12f3a5f899d_v0_13_11_2_gea86a7d3
 
 #define LIBMDBX_INTERNALS
 #define MDBX_DEPRECATED

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "git_describe": "v0.13.11-0-gb862eb08", "git_timestamp": "2026-01-30T16:04:44+03:00", "git_tree": "34a88ae65e76bbf3b9bcb0c2106dec18d2c067da", "git_commit": "b862eb08b77eccd4b8e8367a3276ffdea0d73de5", "semver": "0.13.11" }`
	`1`	`+{ "git_describe": "v0.13.11-2-gea86a7d3", "git_timestamp": "2026-02-10T15:44:23+03:00", "git_tree": "6c6246e4db75b4380b96067073d2ce2449a500d6", "git_commit": "ea86a7d37821a8187c8cd39b61e1de030cfa39c8", "semver": "0.13.11.2" }`