mdbx: release v0.10.3

Acknowledgements:
-----------------
 - [Francisco Vallarino](https://github.com/fjvallarino) for [Haskell bindings for libmdbx](https://hackage.haskell.org/package/libmdbx).
 - [Alex Sharov](https://github.com/AskAlexSharov) for reporting and testing.
 - [Andrea Lanfranchi](https://github.com/AndreaLanfranchi) for contributing.

Extensions and improvements:
----------------------------
 - Added `cursor::erase()` overloads for `key` and for `key-value`.
 - Resolve minor Coverity Scan issues (no fixes but some hint/comment were added).
 - Resolve minor UndefinedBehaviorSanitizer issues (no fixes but some workaround were added).

Fixes:
------
 - Always setup `madvise` while opening DB (fixes https://github.com/erthink/libmdbx/issues/231).
 - Fixed checking legacy `P_DIRTY` flag (`0x10`) for nested/sub-pages.

Minors:
-------
 - Fixed getting revision number from middle of history during amalgamation (GNU Makefile).
 - Fixed search GCC tools for LTO (CMake scripts).
 - Fixed/reorder dirs list for search CLANG tools for LTO (CMake scripts).
 - Fixed/workarounds for CLANG < 9.x
 - Fixed CMake warning about compatibility with 3.8.2

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://sobe.ru/na/libmdbx', 'https://paypal.me/erthink', 'https://etherscan.io/address/0xe8a741a2a0a4850c5bdbb415aaaaf8fb46f06fb7']
+custom: ['https://sobe.ru/na/libmdbx', 'https://paypal.me/erthink', 'https://etherscan.io/address/0x19291d8658f762f3baceae1700c0b9466572ceab']

.github/actions/spelling/excludes.txt

@@ -8,3 +8,4 @@
 ^\.gitignore$
 ^\.travis\.yml$
 ^packages/buildroot/
+^CMakeSettings\.json$

.github/actions/spelling/expect.txt

@@ -520,6 +520,7 @@ Firefox
 firstvalue
 fixedpoint
 FIXME
+fjvallarino
 flagbit
 flg
 flipcoin
@@ -617,9 +618,11 @@ grep
 gtags
 gz
 gzip
+hackage
 HAGL
 hallvard
 hardcoded
+haskell
 HASSEMAPHORE
 hdiutil
 hdr
@@ -1112,6 +1115,7 @@ nordahead
 NOREPLACE
 NORESERVE
 noreturn
+NOSANITIZE
 nospill
 nosubdir
 nosync
@@ -1791,6 +1795,7 @@ underfilled
 UNDOC
 unicode
 UNIFORUM
+uninit
 uninstall
 UNINSTALLING
 uniq
@@ -1835,6 +1840,7 @@ Vaefnrs
 valbool
 valgrind
 validator
+Vallarino
 valnum
 valsize
 valstr

.gitignore

@@ -15,6 +15,7 @@
 .idea
 .le.ini
 .vs/
+.vscode/
 cmake-build-*
 @*
 core

CMakeLists.txt

@@ -34,10 +34,14 @@
 ##  The Future will (be) Positive. Всё будет хорошо.
 ##
 
-cmake_minimum_required(VERSION 3.8.2)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  cmake_minimum_required(VERSION 3.8.2)
+else()
+  cmake_minimum_required(VERSION 3.12)
+endif()
 
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.8.2)
+cmake_policy(VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
 if(NOT CMAKE_VERSION VERSION_LESS 3.15)
   cmake_policy(SET CMP0091 NEW)
 endif()
@@ -228,8 +232,13 @@ else()
   endif()
 
   if(CMAKE_INTERPROCEDURAL_OPTIMIZATION_AVAILABLE
-      OR GCC_LTO_AVAILABLE OR MSVC_LTO_AVAILABLE OR CLANG_LTO_AVAILABLE)
+      OR GCC_LTO_AVAILABLE OR MSVC_LTO_AVAILABLE OR
+      (CLANG_LTO_AVAILABLE AND
+        ((DEFINED MDBX_ENABLE_TESTS AND NOT MDBX_ENABLE_TESTS)
+        OR NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)))
     option(INTERPROCEDURAL_OPTIMIZATION "Enable interprocedural/LTO optimization" ${INTERPROCEDURAL_OPTIMIZATION_DEFAULT})
+  else()
+    set(INTERPROCEDURAL_OPTIMIZATION OFF)
   endif()
 
   if(INTERPROCEDURAL_OPTIMIZATION)
@@ -328,9 +337,11 @@ list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_std_20 HAS_CXX20)
 if(NOT DEFINED MDBX_CXX_STANDARD)
   if(DEFINED CMAKE_CXX_STANDARD)
     set(MDBX_CXX_STANDARD ${CMAKE_CXX_STANDARD})
-  elseif(NOT HAS_CXX20 LESS 0)
+  elseif(NOT HAS_CXX20 LESS 0
+      AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9))
     set(MDBX_CXX_STANDARD 20)
-  elseif(NOT HAS_CXX17 LESS 0)
+  elseif(NOT HAS_CXX17 LESS 0
+      AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5))
     set(MDBX_CXX_STANDARD 17)
   elseif(NOT HAS_CXX14 LESS 0)
     set(MDBX_CXX_STANDARD 14)
@@ -483,7 +494,7 @@ if(CMAKE_CXX_COMPILER_LOADED AND MDBX_CXX_STANDARD GREATER_EQUAL 11 AND MDBX_CXX
   endif()
   if(NOT MDBX_WITHOUT_MSVC_CRT
       AND NOT (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-      AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4)
+      AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.9)
       AND NOT (MSVC AND MSVC_VERSION LESS 1900))
     option(MDBX_BUILD_CXX "Build C++ portion" ON)
   else()
@@ -560,7 +571,8 @@ macro(target_setup_options TARGET)
       target_compile_options(${TARGET} INTERFACE "/Zc:__cplusplus")
     endif()
   endif()
-  if(CC_HAS_FASTMATH)
+  if(CC_HAS_FASTMATH
+      AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10))
     target_compile_options(${TARGET} PRIVATE "-ffast-math")
   endif()
   if(CC_HAS_VISIBILITY)
@@ -583,7 +595,7 @@ macro(libmdbx_setup_libs TARGET MODE)
   elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     target_link_libraries(${TARGET} ${MODE} log)
   endif()
-  if(LIBCXX_FILESYSTEM AND MDBX_BUILD_CXX)
+  if(MDBX_CXX_STANDARD GREATER_EQUAL 17 AND LIBCXX_FILESYSTEM AND MDBX_BUILD_CXX)
     target_link_libraries(${TARGET} ${MODE} ${LIBCXX_FILESYSTEM})
   endif()
 endmacro()

CMakeSettings.json

@@ -0,0 +1,26 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\libmdbx\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\libmdbx\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\libmdbx\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\libmdbx\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    }
+  ]
+}

ChangeLog.md

@@ -1,7 +1,7 @@
 ChangeLog
 ---------
 
-## v0.10.3 (in development)
+## v0.11.x (in development)
 
 ### TODO
 
@@ -16,10 +16,38 @@ ChangeLog
  - [Support for RAW devices](https://github.com/erthink/libmdbx/issues/124).
  - [Support MessagePack for Keys & Values](https://github.com/erthink/libmdbx/issues/115).
  - [Engage new terminology](https://github.com/erthink/libmdbx/issues/137).
- - Finalize C++ API (few typos and trivia bugs are still likely for now).
+ - Finalize C++ API (few typos and bugs are still maybe for now).
  - Packages for [Astra Linux](https://astralinux.ru/), [ALT Linux](https://www.altlinux.org/), [ROSA Linux](https://www.rosalinux.ru/), etc.
 
 
+## v0.10.3 at 2021-08-27
+
+Acknowledgements:
+
+ - [Francisco Vallarino](https://github.com/fjvallarino) for [Haskell bindings for libmdbx](https://hackage.haskell.org/package/libmdbx).
+ - [Alex Sharov](https://github.com/AskAlexSharov) for reporting and testing.
+ - [Andrea Lanfranchi](https://github.com/AndreaLanfranchi) for contributing.
+
+Extensions and improvements:
+
+ - Added `cursor::erase()` overloads for `key` and for `key-value`.
+ - Resolve minor Coverity Scan issues (no fixes but some hint/comment were added).
+ - Resolve minor UndefinedBehaviorSanitizer issues (no fixes but some workaround were added).
+
+Fixes:
+
+ - Always setup `madvise` while opening DB (fixes https://github.com/erthink/libmdbx/issues/231).
+ - Fixed checking legacy `P_DIRTY` flag (`0x10`) for nested/sub-pages.
+
+Minors:
+
+ - Fixed getting revision number from middle of history during amalgamation (GNU Makefile).
+ - Fixed search GCC tools for LTO (CMake scripts).
+ - Fixed/reorder dirs list for search CLANG tools for LTO (CMake scripts).
+ - Fixed/workarounds for CLANG < 9.x
+ - Fixed CMake warning about compatibility with 3.8.2
+
+
 ## v0.10.2 at 2021-07-26
 
 Acknowledgements:

GNUmakefile

@@ -292,7 +292,7 @@ MAN_SRCDIR := src/man1/
 ALLOY_DEPS := $(shell git ls-files src/)
 git_DIR := $(shell if [ -d .git ]; then echo .git; elif [ -s .git -a -f .git ]; then grep '^gitdir: ' .git | cut -d ':' -f 2; else echo git_directory_is_absent; fi)
 MDBX_GIT_VERSION = $(shell set -o pipefail; git describe --tags 2>&- | sed -n 's|^v*\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\)\(.*\)|\1|p' || echo 'Please fetch tags and/or use non-obsolete git version')
-MDBX_GIT_REVISION = $(shell set -o pipefail; git rev-list --count HEAD ^`git tag --sort=-version:refname 2>&- | sed -n '/^\(v[0-9]\+\.[0-9]\+\.[0-9]\+\)*/p;q' || echo 'git_tag_with_sort_was_failed'` 2>&- || echo 'Please use non-obsolete git version')
+MDBX_GIT_REVISION = $(shell set -o pipefail; git rev-list `git describe --tags --abbrev=0`..HEAD --count 2>&- || echo 'Please fetch tags and/or use non-obsolete git version')
 MDBX_GIT_TIMESTAMP = $(shell git show --no-patch --format=%cI HEAD 2>&- || echo 'Please install latest get version')
 MDBX_GIT_DESCRIBE = $(shell git describe --tags --long --dirty=-dirty 2>&- || echo 'Please fetch tags and/or install non-obsolete git version')
 MDBX_VERSION_SUFFIX = $(shell set -o pipefail; echo -n '$(MDBX_GIT_DESCRIBE)' | tr -c -s '[a-zA-Z0-9]' _)
@@ -586,7 +586,7 @@ endif
 ################################################################################
 # Cross-compilation simple test
 
-CROSS_LIST = sparc64-linux-gnu-gcc alpha-linux-gnu-gcc mips-linux-gnu-gcc \
+CROSS_LIST = mips-linux-gnu-gcc \
 	powerpc64-linux-gnu-gcc powerpc-linux-gnu-gcc \
 	arm-linux-gnueabihf-gcc aarch64-linux-gnu-gcc \
 	sh4-linux-gnu-gcc mips64-linux-gnuabi64-gcc \
@@ -597,7 +597,7 @@ CROSS_LIST = sparc64-linux-gnu-gcc alpha-linux-gnu-gcc mips-linux-gnu-gcc \
 # s390x-linux-gnu-gcc         - works (previously: qemu hang/abort)
 # sparc64-linux-gnu-gcc       - coredump (qemu mmap-troubles, previously: qemu fails fcntl for F_SETLK/F_GETLK)
 # alpha-linux-gnu-gcc         - coredump (qemu mmap-troubles)
-CROSS_LIST_NOQEMU =
+CROSS_LIST_NOQEMU = sparc64-linux-gnu-gcc alpha-linux-gnu-gcc
 
 cross-gcc:
 	@echo '  Re-building by cross-compiler for: $(CROSS_LIST_NOQEMU) $(CROSS_LIST)'
@@ -620,7 +620,7 @@ cross-qemu:
 		echo "===================== $$CC + qemu"; \
 		$(MAKE) IOARENA=false CXXSTD= clean && \
 			CC=$$CC CXX=$$(echo $$CC | sed 's/-gcc/-g++/') EXE_LDFLAGS=-static MDBX_BUILD_OPTIONS="-DMDBX_SAFE4QEMU $(MDBX_BUILD_OPTIONS)" \
-			$(MAKE) IOARENA=false test-singleprocess || exit $$?; \
+			$(MAKE) IOARENA=false smoke-singleprocess test-singleprocess || exit $$?; \
 	done
 
 #< dist-cutoff-end

README.md

@@ -385,6 +385,12 @@ target platform. Obviously you need building tools itself, i.e. `git`,
 and `make options` are also available for listing existing targets
 and build options respectively.
 
+The only significant specificity is that git' tags are required
+to build from complete (not amalgamated) source codes.
+Executing **`git fetch --tags --force --prune`** is enough to get ones,
+or `git fetch --unshallow --tags --prune --force` after the Github's
+[`actions/checkout@v2`](https://github.com/actions/checkout) either set **`fetch-depth: 0`** for it.
+
 So just using CMake or GNU Make in your habitual manner and feel free to
 fill an issue or make pull request in the case something will be
 unexpected or broken down.
@@ -558,6 +564,7 @@ Bindings
 
 | Runtime |  Repo  | Author |
 | ------- | ------ | ------ |
+| Haskell | [libmdbx-hs](https://hackage.haskell.org/package/libmdbx) | [Francisco Vallarino](https://github.com/fjvallarino) |
 | Python (draft) | [python-bindings](https://github.com/erthink/libmdbx/commits/python-bindings) branch | [Noel Kuntze](https://github.com/Thermi)
 | NodeJS  | [lmdbx-store](https://github.com/kriszyp/lmdbx-store) | [Kris Zyp](https://github.com/kriszyp/)
 | NodeJS  | [node-mdbx](https://www.npmjs.com/package/node-mdbx/) | [Сергей Федотов](mailto:sergey.fedotov@corp.mail.ru) |

appveyor.yml

@@ -1,4 +1,4 @@
-version: 0.10.2.{build}
+version: 0.10.3.{build}
 
 environment:
   matrix:
@@ -52,8 +52,8 @@ matrix:
       configuration: Release
 
 # Enable RDP for troubleshooting
-init:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#init:
+#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 before_build:
 - git clean -x -f -d

cmake/compiler.cmake

@@ -13,9 +13,14 @@
 ##  limitations under the License.
 ##
 
-cmake_minimum_required(VERSION 3.8.2)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  cmake_minimum_required(VERSION 3.8.2)
+else()
+  cmake_minimum_required(VERSION 3.12)
+endif()
+
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.8.2)
+cmake_policy(VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
 
 if(CMAKE_VERSION MATCHES ".*MSVC.*" AND CMAKE_VERSION VERSION_LESS 3.16)
   message(FATAL_ERROR "CMake from MSVC kit is unfit! "
@@ -286,21 +291,21 @@ if(CMAKE_COMPILER_IS_GNU${CMAKE_PRIMARY_LANG})
 
     set(gcc_suffix "")
     if(gcc_collect_valid AND gcc_collect)
-      string(REGEX MATCH "^(.*cc)(-.+)$" gcc_suffix_valid ${gcc_collect})
+      string(REGEX MATCH "^(.*(cc|\\+\\+))(-.+)$" gcc_suffix_valid ${gcc_collect})
       if(gcc_suffix_valid)
-        string(REGEX MATCH "^(.*cc)(-.+)$" "\\2" gcc_suffix ${gcc_collect})
+        string(REGEX REPLACE "^(.*(cc|\\+\\+))(-.+)$" "\\3" gcc_suffix ${gcc_collect})
       endif()
     endif()
 
     get_filename_component(gcc_dir ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} DIRECTORY)
     if(NOT CMAKE_GCC_AR)
-      find_program(CMAKE_GCC_AR NAMES gcc${gcc_suffix}-ar gcc-ar${gcc_suffix} PATHS ${gcc_dir} NO_DEFAULT_PATH)
+      find_program(CMAKE_GCC_AR NAMES "gcc${gcc_suffix}-ar" "gcc-ar${gcc_suffix}" PATHS "${gcc_dir}" NO_DEFAULT_PATH)
     endif()
     if(NOT CMAKE_GCC_NM)
-      find_program(CMAKE_GCC_NM NAMES gcc${gcc_suffix}-nm gcc-nm${gcc_suffix} PATHS ${gcc_dir} NO_DEFAULT_PATH)
+      find_program(CMAKE_GCC_NM NAMES "gcc${gcc_suffix}-nm" "gcc-nm${gcc_suffix}" PATHS "${gcc_dir}" NO_DEFAULT_PATH)
     endif()
     if(NOT CMAKE_GCC_RANLIB)
-      find_program(CMAKE_GCC_RANLIB NAMES gcc${gcc_suffix}-ranlib gcc-ranlib${gcc_suffix} PATHS ${gcc_dir} NO_DEFAULT_PATH)
+      find_program(CMAKE_GCC_RANLIB NAMES "gcc${gcc_suffix}-ranlib" "gcc-ranlib${gcc_suffix}" PATHS "${gcc_dir}" NO_DEFAULT_PATH)
     endif()
 
     unset(gcc_dir)
@@ -342,30 +347,40 @@ if(CMAKE_COMPILER_IS_CLANG)
       OUTPUT_VARIABLE clang_search_dirs RESULT_VARIABLE clang_probe_result ERROR_QUIET)
 
     unset(clang_bindirs)
+    unset(clang_bindirs_x)
     unset(clang_libdirs)
+    unset(clang_libdirs_x)
     if(clang_probe_result EQUAL 0)
-        string(REGEX MATCH "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" regexp_valid ${clang_search_dirs})
-        if(regexp_valid)
-          string(REGEX REPLACE "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs})
-          string(REPLACE ":" ";" list "${list}")
-          #set(clang_bindirs "")
-          foreach(dir IN LISTS list)
-            get_filename_component(dir "${dir}" REALPATH)
+      string(REGEX MATCH "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" regexp_valid ${clang_search_dirs})
+      if(regexp_valid)
+        string(REGEX REPLACE "(^|\n.*)(.*programs: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs})
+        string(REPLACE ":" ";" list "${list}")
+        foreach(dir IN LISTS list)
+          get_filename_component(dir "${dir}" REALPATH)
+          if(dir MATCHES ".*llvm.*" OR dir MATCHES ".*clang.*")
             list(APPEND clang_bindirs "${dir}")
-          endforeach()
-          list(REMOVE_DUPLICATES clang_bindirs)
-        endif()
-        string(REGEX MATCH "(^|\n.*)(.*libraries: =)([^\n]+)((\n.*)|$)" regexp_valid ${clang_search_dirs})
-        if(regexp_valid)
-          string(REGEX REPLACE "(^|\n.*)(.*libraries: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs})
-          string(REPLACE ":" ";" list "${list}")
-          #set(clang_libdirs "")
-          foreach(dir IN LISTS list)
-            get_filename_component(dir "${dir}" REALPATH)
+          else()
+            list(APPEND clang_bindirs_x "${dir}")
+          endif()
+        endforeach()
+        list(APPEND clang_bindirs "${clang_bindirs_x}")
+        list(REMOVE_DUPLICATES clang_bindirs)
+      endif()
+      string(REGEX MATCH "(^|\n.*)(.*libraries: =)([^\n]+)((\n.*)|$)" regexp_valid ${clang_search_dirs})
+      if(regexp_valid)
+        string(REGEX REPLACE "(^|\n.*)(.*libraries: =)([^\n]+)((\n.*)|$)" "\\3" list ${clang_search_dirs})
+        string(REPLACE ":" ";" list "${list}")
+        foreach(dir IN LISTS list)
+          get_filename_component(dir "${dir}" REALPATH)
+          if(dir MATCHES ".*llvm.*" OR dir MATCHES ".*clang.*")
             list(APPEND clang_libdirs "${dir}")
-          endforeach()
-          list(REMOVE_DUPLICATES clang_libdirs)
-        endif()
+          else()
+            list(APPEND clang_libdirs_x "${dir}")
+          endif()
+        endforeach()
+        list(APPEND clang_libdirs "${clang_libdirs_x}")
+        list(REMOVE_DUPLICATES clang_libdirs)
+      endif()
     else()
       get_filename_component(clang_bindirs ${CMAKE_${CMAKE_PRIMARY_LANG}_COMPILER} DIRECTORY)
       if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

cmake/profile.cmake

@@ -13,9 +13,14 @@
 ##  limitations under the License.
 ##
 
-cmake_minimum_required(VERSION 3.8.2)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  cmake_minimum_required(VERSION 3.8.2)
+else()
+  cmake_minimum_required(VERSION 3.12)
+endif()
+
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.8.2)
+cmake_policy(VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
 
 include(CheckLibraryExists)
 check_library_exists(gcov __gcov_flush "" HAVE_GCOV)

cmake/utils.cmake

@@ -13,9 +13,14 @@
 ##  limitations under the License.
 ##
 
-cmake_minimum_required(VERSION 3.8.2)
+if(CMAKE_VERSION VERSION_LESS 3.12)
+  cmake_minimum_required(VERSION 3.8.2)
+else()
+  cmake_minimum_required(VERSION 3.12)
+endif()
+
 cmake_policy(PUSH)
-cmake_policy(VERSION 3.8.2)
+cmake_policy(VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
 
 macro(add_compile_flags languages)
   foreach(_lang ${languages})

mdbx.h

@@ -461,7 +461,8 @@ typedef mode_t mdbx_mode_t;
 #endif /* MDBX_PRINTF_ARGS */
 
 #if defined(DOXYGEN) ||                                                        \
-    (defined(__cplusplus) && __has_cpp_attribute(maybe_unused) &&              \
+    (defined(__cplusplus) && __cplusplus >= 201603 &&                          \
+     __has_cpp_attribute(maybe_unused) &&                                      \
      __has_cpp_attribute(maybe_unused) >= 201603) ||                           \
     (!defined(__cplusplus) && defined(__STDC_VERSION__) &&                     \
      __STDC_VERSION__ > 202005L)
@@ -472,6 +473,12 @@ typedef mode_t mdbx_mode_t;
 #define MDBX_MAYBE_UNUSED
 #endif /* MDBX_MAYBE_UNUSED */
 
+#if __has_attribute(no_sanitize)
+#define MDBX_NOSANITIZE_ENUM __attribute((__no_sanitize__("enum")))
+#else
+#define MDBX_NOSANITIZE_ENUM
+#endif /* MDBX_NOSANITIZE_ENUM */
+
 /* Oh, below are some songs and dances since:
  *  - C++ requires explicit definition of the necessary operators.
  *  - the proper implementation of DEFINE_ENUM_FLAG_OPERATORS for C++ required
@@ -497,28 +504,40 @@ typedef mode_t mdbx_mode_t;
 /// used to define flags (based on Microsoft's DEFINE_ENUM_FLAG_OPERATORS).
 #define DEFINE_ENUM_FLAG_OPERATORS(ENUM)                                       \
   extern "C++" {                                                               \
-  MDBX_CXX01_CONSTEXPR ENUM operator|(ENUM a, ENUM b) {                        \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX01_CONSTEXPR ENUM operator|(ENUM a, ENUM b) {   \
     return ENUM(unsigned(a) | unsigned(b));                                    \
   }                                                                            \
-  MDBX_CXX14_CONSTEXPR ENUM &operator|=(ENUM &a, ENUM b) { return a = a | b; } \
-  MDBX_CXX01_CONSTEXPR ENUM operator&(ENUM a, ENUM b) {                        \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX14_CONSTEXPR ENUM &operator|=(ENUM &a,          \
+                                                             ENUM b) {         \
+    return a = a | b;                                                          \
+  }                                                                            \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX01_CONSTEXPR ENUM operator&(ENUM a, ENUM b) {   \
     return ENUM(unsigned(a) & unsigned(b));                                    \
   }                                                                            \
-  MDBX_CXX01_CONSTEXPR ENUM operator&(ENUM a, unsigned b) {                    \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX01_CONSTEXPR ENUM operator&(ENUM a,             \
+                                                           unsigned b) {       \
     return ENUM(unsigned(a) & b);                                              \
   }                                                                            \
-  MDBX_CXX01_CONSTEXPR ENUM operator&(unsigned a, ENUM b) {                    \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX01_CONSTEXPR ENUM operator&(unsigned a,         \
+                                                           ENUM b) {           \
     return ENUM(a & unsigned(b));                                              \
   }                                                                            \
-  MDBX_CXX14_CONSTEXPR ENUM &operator&=(ENUM &a, ENUM b) { return a = a & b; } \
-  MDBX_CXX14_CONSTEXPR ENUM &operator&=(ENUM &a, unsigned b) {                 \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX14_CONSTEXPR ENUM &operator&=(ENUM &a,          \
+                                                             ENUM b) {         \
+    return a = a & b;                                                          \
+  }                                                                            \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX14_CONSTEXPR ENUM &operator&=(ENUM &a,          \
+                                                             unsigned b) {     \
     return a = a & b;                                                          \
   }                                                                            \
   MDBX_CXX01_CONSTEXPR unsigned operator~(ENUM a) { return ~unsigned(a); }     \
-  MDBX_CXX01_CONSTEXPR ENUM operator^(ENUM a, ENUM b) {                        \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX01_CONSTEXPR ENUM operator^(ENUM a, ENUM b) {   \
     return ENUM(unsigned(a) ^ unsigned(b));                                    \
   }                                                                            \
-  MDBX_CXX14_CONSTEXPR ENUM &operator^=(ENUM &a, ENUM b) { return a = a ^ b; } \
+  MDBX_NOSANITIZE_ENUM MDBX_CXX14_CONSTEXPR ENUM &operator^=(ENUM &a,          \
+                                                             ENUM b) {         \
+    return a = a ^ b;                                                          \
+  }                                                                            \
   }
 #else /* __cplusplus */
 /* nope for C since it always allows these operators for enums */
@@ -790,6 +809,10 @@ enum MDBX_log_level_t {
       and all other log-messages */
   MDBX_LOG_EXTRA = 7,
 
+#ifdef ENABLE_UBSAN
+  MDBX_LOG_MAX = 7 /* avoid UBSAN false-positive trap by a tests */,
+#endif /* ENABLE_UBSAN */
+
   /** for \ref mdbx_setup_debug() only: Don't change current settings */
   MDBX_LOG_DONTCHANGE = -1
 };
@@ -803,6 +826,8 @@ typedef enum MDBX_log_level_t MDBX_log_level_t;
  * effect, but `MDBX_DBG_ASSERT`, `MDBX_DBG_AUDIT` and `MDBX_DBG_JITTER` only if
  * libmdbx builded with \ref MDBX_DEBUG. */
 enum MDBX_debug_flags_t {
+  MDBX_DBG_NONE = 0,
+
   /** Enable assertion checks.
    * Requires build with \ref MDBX_DEBUG > 0 */
   MDBX_DBG_ASSERT = 1,
@@ -825,6 +850,11 @@ enum MDBX_debug_flags_t {
   /** Allow read and write transactions overlapping for the same thread */
   MDBX_DBG_LEGACY_OVERLAP = 32,
 
+#ifdef ENABLE_UBSAN
+  MDBX_DBG_MAX = ((unsigned)MDBX_LOG_MAX) << 16 |
+                 63 /* avoid UBSAN false-positive trap by a tests */,
+#endif /* ENABLE_UBSAN */
+
   /** for mdbx_setup_debug() only: Don't change current settings */
   MDBX_DBG_DONTCHANGE = -1
 };

mdbx.h++

@@ -3626,6 +3626,7 @@ public:
   inline value_result try_update_reserve(map_handle map, const slice &key,
                                          size_t value_length);
 
+  /// \brief Removes all values for given key.
   inline bool erase(map_handle map, const slice &key);
 
   /// \brief Removes the particular multi-value entry of the key.
@@ -3864,7 +3865,18 @@ public:
   inline slice update_reserve(const slice &key, size_t value_length);
   inline value_result try_update_reserve(const slice &key, size_t value_length);
 
+  /// \brief Removes single key-value pair or all multi-values at the current
+  /// cursor position.
   inline bool erase(bool whole_multivalue = false);
+
+  /// \brief Seeks and removes first value or whole multi-value of the given
+  /// key.
+  /// \return `True` if the key is found and a value(s) is removed.
+  inline bool erase(const slice &key, bool whole_multivalue = true);
+
+  /// \brief Seeks and removes the particular multi-value entry of the key.
+  /// \return `True` if the given key-value pair is found and removed.
+  inline bool erase(const slice &key, const slice &value);
 };
 
 /// \brief Managed cursor.
@@ -5740,6 +5752,16 @@ inline bool cursor::erase(bool whole_multivalue) {
   }
 }
 
+inline bool cursor::erase(const slice &key, bool whole_multivalue) {
+  bool found = seek(key);
+  return found ? erase(whole_multivalue) : found;
+}
+
+inline bool cursor::erase(const slice &key, const slice &value) {
+  move_result data = find_multivalue(key, value, false);
+  return data.done ? erase() : data.done;
+}
+
 } // namespace mdbx
 
 //------------------------------------------------------------------------------

packages/buildroot/0001-package-libmdbx-new-package-library-database.patch

@@ -1,10 +1,9 @@
-From 7834ae8fc834f5f7b98d45703079cd94e5402ed6 Mon Sep 17 00:00:00 2001
+From 0c0df833879b3f815959c8bd9b6cc27cb9d71b9e Mon Sep 17 00:00:00 2001
 From: Leonid Yuriev <leo@yuriev.ru>
-Date: Fri, 27 Nov 2020 16:31:12 +0300
-Cc: Heiko Thiery <heiko.thiery@gmail.com>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Leonid Yuriev <leo@yuriev.ru
-Subject: [PATCH v5 1/1] package/libmdbx: new package (library/database).
+Date: Tue, 3 Aug 2021 00:55:27 +0300
+Subject: [PATCH] package/libmdbx: new package (library/database).
 
-This patch adds libmdbx v0.9.2:
+This patch adds libmdbx v0.10.2:
  - libmdbx is one of the fastest compact embeddable key-value ACID database.
  - libmdbx has a specific set of properties and capabilities,
    focused on creating unique lightweight solutions.
@@ -13,44 +12,14 @@ This patch adds libmdbx v0.9.2:
  - https://github.com/erthink/libmdbx
 
 Signed-off-by: Leonid Yuriev <leo@yuriev.ru>
-
----
-Changes v1 -> v2:
-  - libmdbx version v0.8.2 -> v0.9.1 (released 2020-09-30)
-
-Changes v2 -> v3:
-  - removed outcommented stuff (suggested by Heiko Thiery).
-  - cleaned up and simplified the makefile (suggested by Heiko Thiery).
-  - added patch for C++ header installation.
-  - added patch with fix minor copy&paste typo.
-  - added patch with pthread workaround for buggy toolchain/cmake/buildroot.
-  - added patch for `pthread_yield()`.
-  - passed `utils/check-package package/libmdbx/*` (suggested by Heiko Thiery)
-  - passed `utils/test-pkg -a -p libmdbx`,
-    except w/o threads & w/o MMU (suggested by Heiko Thiery).
-
-Changes v3 -> v4:
-  - fix passing BR2_PACKAGE_LIBMDBX_TOOLS option to cmake.
-  - fix using `depend on` instead of `select`,
-    and add `comment` for C++ toolchain (suggested by Heiko Thiery).
-  - fix minor help typo.
-
-Changes v4 -> v5:
-  - libmdbx version v0.9.1 -> v0.9.2 (released 2020-11-27)
-  - dropped all patch since not needed.
-  - cosmetic changes (suggested by Thomas Petazzoni <thomas.petazzoni@bootlin.com>).
-  - added dependence of BR2_TOOLCHAIN_HAS_SYNC_4 (suggested by Thomas Petazzoni <thomas.petazzoni@bootlin.com>).
-  - added dependence of !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 (suggested by Thomas Petazzoni <thomas.petazzoni@bootlin.com>).
-  - take in account the BR2_SHARED_STATIC_LIBS (suggested by Thomas Petazzoni <thomas.petazzoni@bootlin.com>).
-
-Signed-off-by: Leonid Yuriev <leo@yuriev.ru>
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
 ---
  DEVELOPERS                   |  3 +++
  package/Config.in            |  1 +
  package/libmdbx/Config.in    | 45 ++++++++++++++++++++++++++++++++++++
  package/libmdbx/libmdbx.hash |  5 ++++
- package/libmdbx/libmdbx.mk   | 33 ++++++++++++++++++++++++++
- 5 files changed, 87 insertions(+)
+ package/libmdbx/libmdbx.mk   | 42 +++++++++++++++++++++++++++++++++
+ 5 files changed, 96 insertions(+)
  create mode 100644 package/libmdbx/Config.in
  create mode 100644 package/libmdbx/libmdbx.hash
  create mode 100644 package/libmdbx/libmdbx.mk
@@ -134,28 +103,28 @@ index 0000000000..d13f73938f
 +		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
 diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash
 new file mode 100644
-index 0000000000..0d3501f1d9
+index 0000000000..c8a28ada34
 --- /dev/null
 +++ b/package/libmdbx/libmdbx.hash
 @@ -0,0 +1,5 @@
 +# Hashes from: https://github.com/erthink/libmdbx/releases/
-+sha256  c35cc53d66d74ebfc86e39441ba26276541ac7892bf91dba1e70c83665a02767  libmdbx-amalgamated-0.9.2.tar.gz
++sha256  745555704df76626a6612ad0c6bc6b1a66bfab98b9245b07dfb82640aa46d6fa  libmdbx-amalgamated-0.10.2.tar.gz
 +
 +# Locally calculated
 +sha256  310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569  LICENSE
 diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk
 new file mode 100644
-index 0000000000..f3720130ec
+index 0000000000..60c5148625
 --- /dev/null
 +++ b/package/libmdbx/libmdbx.mk
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,42 @@
 +################################################################################
 +#
 +# libmdbx
 +#
 +################################################################################
 +
-+LIBMDBX_VERSION = 0.9.2
++LIBMDBX_VERSION = 0.10.2
 +LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz
 +LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION)
 +LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO
@@ -165,7 +134,12 @@ index 0000000000..f3720130ec
 +LIBMDBX_STRIP_COMPONENTS = 0
 +LIBMDBX_INSTALL_STAGING = YES
 +
-+LIBMDBX_CONF_OPTS = -DMDBX_INSTALL_MANPAGES=OFF -DBUILD_FOR_NATIVE_CPU=OFF \
++# Set CMAKE_BUILD_TYPE to Release to remove -Werror and avoid a build failure
++# with glibc < 2.12
++LIBMDBX_CONF_OPTS = \
++	-DCMAKE_BUILD_TYPE=Release \
++	-DMDBX_INSTALL_MANPAGES=OFF \
++	-DBUILD_FOR_NATIVE_CPU=OFF \
 +	-DMDBX_BUILD_CXX=$(if $(BR2_PACKAGE_LIBMDBX_CXX),ON,OFF) \
 +	-DMDBX_BUILD_TOOLS=$(if $(BR2_PACKAGE_LIBMDBX_TOOLS),ON,OFF)
 +
@@ -176,12 +150,16 @@ index 0000000000..f3720130ec
 +endif
 +
 +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
-+LIBMDBX_CONF_OPTS += -DMDBX_BUILD_SHARED_LIBRARY=ON -DMDBX_LINK_TOOLS_NONSTATIC=ON
++LIBMDBX_CONF_OPTS += \
++	-DMDBX_BUILD_SHARED_LIBRARY=ON \
++	-DMDBX_LINK_TOOLS_NONSTATIC=ON
 +else
-+LIBMDBX_CONF_OPTS += -DMDBX_BUILD_SHARED_LIBRARY=OFF -DMDBX_LINK_TOOLS_NONSTATIC=OFF
++LIBMDBX_CONF_OPTS += \
++	-DMDBX_BUILD_SHARED_LIBRARY=OFF \
++	-DMDBX_LINK_TOOLS_NONSTATIC=OFF
 +endif
 +
 +$(eval $(cmake-package))
 -- 
-2.29.2
+2.32.0
 

packages/buildroot/v5-0000-cover-letter-package-libmdbx.patch

@@ -1,219 +0,0 @@
-From 0bf9d06e8b090e2d9783d03074f3752ed708f6cf Mon Sep 17 00:00:00 2001
-From: Leonid Yuriev <leo@yuriev.ru>
-Date: Fri, 27 Nov 2020 16:31:12 +0300
-Cc: Heiko Thiery <heiko.thiery@gmail.com>
-Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Subject: [PATCH v5 0/1] cover letter for package/libmdbx: new package (library/database)
-
-This patch adds libmdbx v0.9.2 and below is a brief overview of libmdbx.
-Please merge.
-
-Regards,
-Leonid.
-
---
-
-libmdbx is an extremely fast, compact, powerful, embedded, transactional
-key-value database, with permissive license. libmdbx has a specific set
-of properties and capabilities, focused on creating unique lightweight
-solutions.
-
-Historically, libmdbx (MDBX) is a deeply revised and extended descendant
-of the legendary LMDB (Lightning Memory-Mapped Database). libmdbx
-inherits all benefits from LMDB, but resolves some issues and adds a set
-of improvements.
-
-According to developers, for now libmdbx surpasses the LMDB in terms of
-reliability, features and performance.
-
-
-The most important differences MDBX from LMDB:
-==============================================
-
-1. More attention is paid to the quality of the code, to an
-"unbreakability" of the API, to testing and automatic checks (i.e.
-sanitizers, etc). So there:
- - more control during operation;
- - more checking parameters, internal audit of database structures;
- - no warnings from compiler;
- - no issues from ASAN, UBSAN, Valgrind, Coverity;
- - etc.
-
-2. Keys could be more than 2 times longer than LMDB.
-
-3. Up to 20% faster than LMDB in CRUD benchmarks.
-
-4. Automatic on-the-fly database size adjustment,
-both increment and reduction.
-
-5. Automatic continuous zero-overhead database compactification.
-
-6. The same database format for 32- and 64-bit builds.
-
-7. LIFO policy for Garbage Collection recycling (this can significantly
-increase write performance due write-back disk cache up to several times
-in a best case scenario).
-
-8. Range query estimation.
-
-9. Utility for checking the integrity of the database structure with
-some recovery capabilities.
-
-For more info please refer:
- - https://github.com/erthink/libmdbx for source code and README.
- - https://erthink.github.io/libmdbx for API description.
-
---
-
-MDBX is a Btree-based database management library modeled loosely on the
-BerkeleyDB API, but much simplified. The entire database (aka
-"environment") is exposed in a memory map, and all data fetches return
-data directly from the mapped memory, so no malloc's or memcpy's occur
-during data fetches. As such, the library is extremely simple because it
-requires no page caching layer of its own, and it is extremely high
-performance and memory-efficient. It is also fully transactional with
-full ACID semantics, and when the memory map is read-only, the database
-integrity cannot be corrupted by stray pointer writes from application
-code.
-
-The library is fully thread-aware and supports concurrent read/write
-access from multiple processes and threads. Data pages use a
-copy-on-write strategy so no active data pages are ever overwritten,
-which also provides resistance to corruption and eliminates the need of
-any special recovery procedures after a system crash. Writes are fully
-serialized; only one write transaction may be active at a time, which
-guarantees that writers can never deadlock. The database structure is
-multi-versioned so readers run with no locks; writers cannot block
-readers, and readers don't block writers.
-
-Unlike other well-known database mechanisms which use either write-ahead
-transaction logs or append-only data writes, MDBX requires no
-maintenance during operation. Both write-ahead loggers and append-only
-databases require periodic checkpointing and/or compaction of their log
-or database files otherwise they grow without bound. MDBX tracks
-retired/freed pages within the database and re-uses them for new write
-operations, so the database size does not grow without bound in normal
-use.
-
-The memory map can be used as a read-only or read-write map. It is
-read-only by default as this provides total immunity to corruption.
-Using read-write mode offers much higher write performance, but adds the
-possibility for stray application writes thru pointers to silently
-corrupt the database.
-
-
-Features
-========
-
-- Key-value data model, keys are always sorted.
-
-- Fully ACID-compliant, through to MVCC and CoW.
-
-- Multiple key-value sub-databases within a single datafile.
-
-- Range lookups, including range query estimation.
-
-- Efficient support for short fixed length keys, including native
-  32/64-bit integers.
-
-- Ultra-efficient support for multimaps. Multi-values sorted, searchable
-  and iterable. Keys stored without duplication.
-
-- Data is memory-mapped and accessible directly/zero-copy. Traversal of
-  database records is extremely-fast.
-
-- Transactions for readers and writers, ones do not block others.
-
-- Writes are strongly serialized. No transaction conflicts nor
-  deadlocks.
-
-- Readers are non-blocking, notwithstanding snapshot isolation.
-
-- Nested write transactions.
-
-- Reads scale linearly across CPUs.
-
-- Continuous zero-overhead database compactification.
-
-- Automatic on-the-fly database size adjustment.
-
-- Customizable database page size.
-
-- Olog(N) cost of lookup, insert, update, and delete operations by
-  virtue of B+ tree characteristics.
-
-- Online hot backup.
-
-- Append operation for efficient bulk insertion of pre-sorted data.
-
-- No WAL nor any transaction journal. No crash recovery needed. No
-  maintenance is required.
-
-- No internal cache and/or memory management, all done by basic OS
-  services.
-
-
-Limitations
-===========
-
-- Page size: a power of 2, maximum 65536 bytes, default 4096 bytes.
-
-- Key size: minimum 0, maximum ≈¼ pagesize (1300 bytes for default 4K
-  pagesize, 21780 bytes for 64K pagesize).
-
-- Value size: minimum 0, maximum 2146435072 (0x7FF00000) bytes for maps,
-  ≈¼ pagesize for multimaps (1348 bytes default 4K pagesize, 21828 bytes
-  for 64K pagesize).
-
-- Write transaction size: up to 4194301 (0x3FFFFD) pages (16 GiB for
-  default 4K pagesize, 256 GiB for 64K pagesize).
-
-- Database size: up to 2147483648 pages (8 TiB for default 4K pagesize,
-  128 TiB for 64K pagesize).
-
-- Maximum sub-databases: 32765.
-
-
-Gotchas
-=======
-
-- There cannot be more than one writer at a time, i.e. no more than one
-  write transaction at a time.
-
-- libmdbx is based on B+ tree, so access to database pages is mostly
-  random. Thus SSDs provide a significant performance boost over
-  spinning disks for large databases.
-
-- libmdbx uses shadow paging instead of WAL. Thus syncing data to disk
-  might be a bottleneck for write intensive workload.
-
-- libmdbx uses copy-on-write for snapshot isolation during updates, but
-  read transactions prevents recycling an old retired/freed pages, since
-  it read ones. Thus altering of data during a parallel long-lived read
-  operation will increase the process work set, may exhaust entire free
-  database space, the database can grow quickly, and result in
-  performance degradation. Try to avoid long running read transactions.
-
-- libmdbx is extraordinarily fast and provides minimal overhead for data
-  access, so you should reconsider using brute force techniques and
-  double check your code. On the one hand, in the case of libmdbx, a
-  simple linear search may be more profitable than complex indexes. On
-  the other hand, if you make something suboptimally, you can notice
-  detrimentally only on sufficiently large data.
-
---
-Leonid Yuriev (1):
-  package/libmdbx: new package (library/database).
-
- DEVELOPERS                   |  3 +++
- package/Config.in            |  1 +
- package/libmdbx/Config.in    | 45 ++++++++++++++++++++++++++++++++++++
- package/libmdbx/libmdbx.hash |  5 ++++
- package/libmdbx/libmdbx.mk   | 33 ++++++++++++++++++++++++++
- 5 files changed, 87 insertions(+)
- create mode 100644 package/libmdbx/Config.in
- create mode 100644 package/libmdbx/libmdbx.hash
- create mode 100644 package/libmdbx/libmdbx.mk
-
--- 
-2.29.2

src/core.c

@@ -11837,59 +11837,58 @@ __cold static int mdbx_setup_dxb(MDBX_env *env, const int lck_rc,
       }
     }
 
-    //------------------------------------------------- setup madvise/readahead
     atomic_store32(&env->me_lck->mti_discarded_tail,
                    bytes2pgno(env, used_aligned2os_bytes), mo_Relaxed);
+  } /* lck exclusive, lck_rc == MDBX_RESULT_TRUE */
+
+  //---------------------------------------------------- setup madvise/readahead
 #if MDBX_ENABLE_MADVISE
-    if (used_aligned2os_bytes < env->me_dxb_mmap.current) {
+  if (used_aligned2os_bytes < env->me_dxb_mmap.current) {
 #if defined(MADV_REMOVE)
-      if ((env->me_flags & MDBX_WRITEMAP) != 0 &&
-          /* not recovery mode */ env->me_stuck_meta < 0) {
-        mdbx_notice("open-MADV_%s %u..%u", "REMOVE (deallocate file space)",
-                    env->me_lck->mti_discarded_tail.weak,
-                    bytes2pgno(env, env->me_dxb_mmap.current));
-        err = madvise(env->me_map + used_aligned2os_bytes,
-                      env->me_dxb_mmap.current - used_aligned2os_bytes,
-                      MADV_REMOVE)
-                  ? ignore_enosys(errno)
-                  : MDBX_SUCCESS;
-        if (unlikely(MDBX_IS_ERROR(err)))
-          return err;
-      }
-#endif /* MADV_REMOVE */
-#if defined(MADV_DONTNEED)
-      mdbx_notice("open-MADV_%s %u..%u", "DONTNEED",
+    if (lck_rc && (env->me_flags & MDBX_WRITEMAP) != 0 &&
+        /* not recovery mode */ env->me_stuck_meta < 0) {
+      mdbx_notice("open-MADV_%s %u..%u", "REMOVE (deallocate file space)",
                   env->me_lck->mti_discarded_tail.weak,
                   bytes2pgno(env, env->me_dxb_mmap.current));
-      err = madvise(env->me_map + used_aligned2os_bytes,
-                    env->me_dxb_mmap.current - used_aligned2os_bytes,
-                    MADV_DONTNEED)
-                ? ignore_enosys(errno)
-                : MDBX_SUCCESS;
+      err =
+          madvise(env->me_map + used_aligned2os_bytes,
+                  env->me_dxb_mmap.current - used_aligned2os_bytes, MADV_REMOVE)
+              ? ignore_enosys(errno)
+              : MDBX_SUCCESS;
       if (unlikely(MDBX_IS_ERROR(err)))
         return err;
-#elif defined(POSIX_MADV_DONTNEED)
-      err = ignore_enosys(
-          posix_madvise(env->me_map + used_aligned2os_bytes,
-                        env->me_dxb_mmap.current - used_aligned2os_bytes,
-                        POSIX_MADV_DONTNEED));
-      if (unlikely(MDBX_IS_ERROR(err)))
-        return err;
-#elif defined(POSIX_FADV_DONTNEED)
-      err = ignore_enosys(
-          posix_fadvise(env->me_lazy_fd, used_aligned2os_bytes,
-                        env->me_dxb_mmap.current - used_aligned2os_bytes,
-                        POSIX_FADV_DONTNEED));
-      if (unlikely(MDBX_IS_ERROR(err)))
-        return err;
-#endif /* MADV_DONTNEED */
     }
-
-    err = mdbx_set_readahead(env, bytes2pgno(env, used_bytes), readahead, true);
-    if (unlikely(err != MDBX_SUCCESS))
+#endif /* MADV_REMOVE */
+#if defined(MADV_DONTNEED)
+    mdbx_notice("open-MADV_%s %u..%u", "DONTNEED",
+                env->me_lck->mti_discarded_tail.weak,
+                bytes2pgno(env, env->me_dxb_mmap.current));
+    err =
+        madvise(env->me_map + used_aligned2os_bytes,
+                env->me_dxb_mmap.current - used_aligned2os_bytes, MADV_DONTNEED)
+            ? ignore_enosys(errno)
+            : MDBX_SUCCESS;
+    if (unlikely(MDBX_IS_ERROR(err)))
       return err;
+#elif defined(POSIX_MADV_DONTNEED)
+    err = ignore_enosys(posix_madvise(
+        env->me_map + used_aligned2os_bytes,
+        env->me_dxb_mmap.current - used_aligned2os_bytes, POSIX_MADV_DONTNEED));
+    if (unlikely(MDBX_IS_ERROR(err)))
+      return err;
+#elif defined(POSIX_FADV_DONTNEED)
+    err = ignore_enosys(posix_fadvise(
+        env->me_lazy_fd, used_aligned2os_bytes,
+        env->me_dxb_mmap.current - used_aligned2os_bytes, POSIX_FADV_DONTNEED));
+    if (unlikely(MDBX_IS_ERROR(err)))
+      return err;
+#endif /* MADV_DONTNEED */
+  }
+
+  err = mdbx_set_readahead(env, bytes2pgno(env, used_bytes), readahead, true);
+  if (unlikely(err != MDBX_SUCCESS))
+    return err;
 #endif /* MDBX_ENABLE_MADVISE */
-  }    /* lck exclusive, lck_rc == MDBX_RESULT_TRUE */
 
   return rc;
 }
@@ -12908,25 +12907,26 @@ static int __hot cmp_int_unaligned(const MDBX_val *a, const MDBX_val *b) {
 /* Compare two items lexically */
 static int __hot cmp_lexical(const MDBX_val *a, const MDBX_val *b) {
   if (a->iov_len == b->iov_len)
-    return memcmp(a->iov_base, b->iov_base, a->iov_len);
+    return a->iov_len ? memcmp(a->iov_base, b->iov_base, a->iov_len) : 0;
 
   const int diff_len = (a->iov_len < b->iov_len) ? -1 : 1;
   const size_t shortest = (a->iov_len < b->iov_len) ? a->iov_len : b->iov_len;
-  int diff_data = memcmp(a->iov_base, b->iov_base, shortest);
+  int diff_data = shortest ? memcmp(a->iov_base, b->iov_base, shortest) : 0;
   return likely(diff_data) ? diff_data : diff_len;
 }
 
 /* Compare two items in reverse byte order */
 static int __hot cmp_reverse(const MDBX_val *a, const MDBX_val *b) {
-  const uint8_t *pa = (const uint8_t *)a->iov_base + a->iov_len;
-  const uint8_t *pb = (const uint8_t *)b->iov_base + b->iov_len;
   const size_t shortest = (a->iov_len < b->iov_len) ? a->iov_len : b->iov_len;
-
-  const uint8_t *const end = pa - shortest;
-  while (pa != end) {
-    int diff = *--pa - *--pb;
-    if (likely(diff))
-      return diff;
+  if (likely(shortest)) {
+    const uint8_t *pa = (const uint8_t *)a->iov_base + a->iov_len;
+    const uint8_t *pb = (const uint8_t *)b->iov_base + b->iov_len;
+    const uint8_t *const end = pa - shortest;
+    do {
+      int diff = *--pa - *--pb;
+      if (likely(diff))
+        return diff;
+    } while (pa != end);
   }
   return CMP2INT(a->iov_len, b->iov_len);
 }
@@ -12934,7 +12934,9 @@ static int __hot cmp_reverse(const MDBX_val *a, const MDBX_val *b) {
 /* Fast non-lexically comparator */
 static int __hot cmp_lenfast(const MDBX_val *a, const MDBX_val *b) {
   int diff = CMP2INT(a->iov_len, b->iov_len);
-  return likely(diff) ? diff : memcmp(a->iov_base, b->iov_base, a->iov_len);
+  return likely(diff || a->iov_len == 0)
+             ? diff
+             : memcmp(a->iov_base, b->iov_base, a->iov_len);
 }
 
 static bool unsure_equal(MDBX_cmp_func cmp, const MDBX_val *a,
@@ -13524,8 +13526,10 @@ int mdbx_get_ex(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key, MDBX_val *data,
       MDBX_node *node = page_node(cx.outer.mc_pg[cx.outer.mc_top],
                                   cx.outer.mc_ki[cx.outer.mc_top]);
       if (F_ISSET(node_flags(node), F_DUPDATA)) {
+        // coverity[uninit_use : FALSE]
         mdbx_tassert(txn, cx.outer.mc_xcursor == &cx.inner &&
                               (cx.inner.mx_cursor.mc_flags & C_INITIALIZED));
+        // coverity[uninit_use : FALSE]
         *values_count =
             (sizeof(*values_count) >= sizeof(cx.inner.mx_db.md_entries) ||
              cx.inner.mx_db.md_entries <= PTRDIFF_MAX)
@@ -17273,18 +17277,20 @@ __cold static int mdbx_page_check(MDBX_cursor *const mc,
         break;
       case F_DUPDATA /* short sub-page */:
         if (unlikely(dsize <= PAGEHDRSZ)) {
-          rc = bad_page(mp, "invalid nested-page record size (%zu)\n", dsize);
+          rc = bad_page(mp, "invalid nested/sub-page record size (%zu)\n",
+                        dsize);
           continue;
         } else {
           const MDBX_page *const sp = (MDBX_page *)data;
           const char *const end_of_subpage = data + dsize;
           const int nsubkeys = page_numkeys(sp);
-          switch (sp->mp_flags) {
+          switch (sp->mp_flags & /* ignore legacy P_DIRTY flag */ ~0x10) {
           case P_LEAF | P_SUBP:
           case P_LEAF | P_LEAF2 | P_SUBP:
             break;
           default:
-            rc = bad_page(mp, "invalid nested-page flags (%u)\n", sp->mp_flags);
+            rc = bad_page(mp, "invalid nested/sub-page flags (0x%02x)\n",
+                          sp->mp_flags);
             continue;
           }
 
@@ -20545,7 +20551,7 @@ __cold static int mdbx_walk_tree(mdbx_walk_ctx_t *ctx, const pgno_t pgno,
       size_t subalign_bytes = 0;
       MDBX_page_type_t subtype;
 
-      switch (sp->mp_flags) {
+      switch (sp->mp_flags & /* ignore legacy P_DIRTY flag */ ~0x10) {
       case P_LEAF | P_SUBP:
         subtype = MDBX_subpage_leaf;
         break;

src/osal.c

@@ -1781,6 +1781,7 @@ retry_mapview:;
 
   if (limit < map->limit) {
     /* unmap an excess at end of mapping. */
+    // coverity[offset_free : FALSE]
     if (unlikely(munmap(map->dxb + limit, map->limit - limit)))
       return errno;
     map->limit = limit;
@@ -1854,6 +1855,7 @@ retry_mapview:;
     if (unlikely(munmap(map->address, map->limit)))
       return errno;
 
+    // coverity[pass_freed_arg : FALSE]
     ptr = mmap(map->address, limit, mmap_prot,
                (flags & MDBX_MRESIZE_MAY_MOVE)
                    ? mmap_flags
@@ -1863,11 +1865,13 @@ retry_mapview:;
     if (MAP_FIXED_NOREPLACE != 0 && MAP_FIXED_NOREPLACE != MAP_FIXED &&
         unlikely(ptr == MAP_FAILED) && !(flags & MDBX_MRESIZE_MAY_MOVE) &&
         errno == /* kernel don't support MAP_FIXED_NOREPLACE */ EINVAL)
+      // coverity[pass_freed_arg : FALSE]
       ptr = mmap(map->address, limit, mmap_prot, mmap_flags | MAP_FIXED,
                  map->fd, 0);
 
     if (unlikely(ptr == MAP_FAILED)) {
       /* try to restore prev mapping */
+      // coverity[pass_freed_arg : FALSE]
       ptr = mmap(map->address, map->limit, mmap_prot,
                  (flags & MDBX_MRESIZE_MAY_MOVE)
                      ? mmap_flags
@@ -1877,6 +1881,7 @@ retry_mapview:;
       if (MAP_FIXED_NOREPLACE != 0 && MAP_FIXED_NOREPLACE != MAP_FIXED &&
           unlikely(ptr == MAP_FAILED) && !(flags & MDBX_MRESIZE_MAY_MOVE) &&
           errno == /* kernel don't support MAP_FIXED_NOREPLACE */ EINVAL)
+        // coverity[pass_freed_arg : FALSE]
         ptr = mmap(map->address, map->limit, mmap_prot, mmap_flags | MAP_FIXED,
                    map->fd, 0);
       if (unlikely(ptr == MAP_FAILED)) {

test/main.cc

@@ -609,10 +609,6 @@ int main(int argc, char *const argv[]) {
   if (global::config::cleanup_before)
     cleanup();
 
-  log_trace(">> probe entropy_ticks()");
-  entropy_ticks();
-  log_trace("<< probe entropy_ticks()");
-
   if (global::actors.size() == 1) {
     logging::setup("main");
     global::singlemode = true;

test/nested.cc

@@ -200,7 +200,7 @@ bool testcase_nested::trim_tail(unsigned window_width) {
     while (fifo.size() > window_width) {
       uint64_t tail_serial = fifo.back().first;
       const unsigned tail_count = fifo.back().second;
-      log_verbose("nested: pop-tail (serial %" PRIu64 ", count %u)",
+      log_verbose("nested: trim-tail (serial %" PRIu64 ", count %u)",
                   tail_serial, tail_count);
       fifo.pop_back();
       for (unsigned n = 0; n < tail_count; ++n) {

test/utils.cc

@@ -101,164 +101,6 @@ bool is_samedata(const MDBX_val *a, const MDBX_val *b) {
 
 //-----------------------------------------------------------------------------
 
-/* TODO: replace my 'libmera' from t1ha. */
-uint64_t entropy_ticks(void) {
-#if defined(EMSCRIPTEN)
-  return (uint64_t)emscripten_get_now();
-#endif /* EMSCRIPTEN */
-
-#if defined(__APPLE__) || defined(__MACH__)
-  return mach_absolute_time();
-#endif /* defined(__APPLE__) || defined(__MACH__) */
-
-#if defined(__sun__) || defined(__sun)
-  return gethrtime();
-#endif /* __sun__ */
-
-#if defined(__GNUC__) || defined(__clang__)
-
-#if defined(__ia64__)
-  uint64_t ticks;
-  __asm __volatile("mov %0=ar.itc" : "=r"(ticks));
-  return ticks;
-#elif defined(__hppa__)
-  uint64_t ticks;
-  __asm __volatile("mfctl 16, %0" : "=r"(ticks));
-  return ticks;
-#elif defined(__s390__)
-  uint64_t ticks;
-  __asm __volatile("stck 0(%0)" : : "a"(&(ticks)) : "memory", "cc");
-  return ticks;
-#elif defined(__alpha__) || defined(__alpha)
-  uint64_t ticks;
-  __asm __volatile("rpcc %0" : "=r"(ticks));
-  return ticks;
-#elif defined(__sparc__) || defined(__sparc) || defined(__sparc64__) ||        \
-    defined(__sparc64) || defined(__sparc_v8plus__) ||                         \
-    defined(__sparc_v8plus) || defined(__sparc_v8plusa__) ||                   \
-    defined(__sparc_v8plusa) || defined(__sparc_v9__) || defined(__sparc_v9)
-
-  union {
-    uint64_t u64;
-    struct {
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-      uint32_t h, l;
-#else
-      uint32_t l, h;
-#endif
-    } u32;
-  } cycles;
-
-#if defined(__sparc_v8plus__) || defined(__sparc_v8plusa__) ||                 \
-    defined(__sparc_v9__) || defined(__sparc_v8plus) ||                        \
-    defined(__sparc_v8plusa) || defined(__sparc_v9)
-
-#if UINTPTR_MAX > 0xffffFFFFul || ULONG_MAX > 0xffffFFFFul ||                  \
-    defined(__sparc64__) || defined(__sparc64)
-  __asm __volatile("rd %%tick, %0" : "=r"(cycles.u64));
-#else
-  __asm __volatile("rd %%tick, %1; srlx %1, 32, %0"
-                   : "=r"(cycles.u32.h), "=r"(cycles.u32.l));
-#endif /* __sparc64__ */
-
-#else
-  __asm __volatile(".byte 0x83, 0x41, 0x00, 0x00; mov %%g1, %0"
-                   : "=r"(cycles.u64)
-                   :
-                   : "%g1");
-#endif /* __sparc8plus__ || __sparc_v9__ */
-  return cycles.u64;
-
-#elif (defined(__powerpc64__) || defined(__ppc64__) || defined(__ppc64) ||     \
-       defined(__powerpc64))
-  uint64_t ticks;
-  __asm __volatile("mfspr %0, 268" : "=r"(ticks));
-  return ticks;
-#elif (defined(__powerpc__) || defined(__ppc__) || defined(__powerpc) ||       \
-       defined(__ppc))
-#if UINTPTR_MAX > 0xffffFFFFul || ULONG_MAX > 0xffffFFFFul
-  uint64_t ticks;
-  __asm __volatile("mftb  %0" : "=r"(ticks));
-  *now = ticks;
-#else
-  uint64_t ticks;
-  uint32_t low, high_before, high_after;
-  __asm __volatile("mftbu %0; mftb  %1; mftbu %2"
-                   : "=r"(high_before), "=r"(low), "=r"(high_after));
-  ticks = (uint64_t)high_after << 32;
-  ticks |= low & /* zeroes if high part has changed */
-           ~(high_before - high_after);
-#endif
-#elif (defined(__aarch64__) || (defined(__ARM_ARCH) && __ARM_ARCH > 7)) &&     \
-    !defined(MDBX_SAFE4QEMU)
-  uint64_t virtual_timer;
-  __asm __volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer));
-  return virtual_timer;
-#elif (defined(__ARM_ARCH) && __ARM_ARCH > 5 && __ARM_ARCH < 8) ||             \
-    defined(_M_ARM)
-  static uint32_t pmcntenset = 0x00425B00;
-  if (unlikely(pmcntenset == 0x00425B00)) {
-    uint32_t pmuseren;
-#ifdef _M_ARM
-    pmuseren = _MoveFromCoprocessor(15, 0, 9, 14, 0);
-#else
-    __asm("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren));
-#endif
-    if (1 & pmuseren /* Is it allowed for user mode code? */) {
-#ifdef _M_ARM
-      pmcntenset = _MoveFromCoprocessor(15, 0, 9, 12, 1);
-#else
-      __asm("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset));
-#endif
-    } else
-      pmcntenset = 0;
-  }
-  if (pmcntenset & 0x80000000ul /* Is it counting? */) {
-#ifdef _M_ARM
-    return __rdpmccntr64();
-#else
-    uint32_t pmccntr;
-    __asm __volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr));
-    return pmccntr;
-#endif
-  }
-#elif ((defined(_MIPS_ISA) && defined(_MIPS_ISA_MIPS2) &&                      \
-        _MIPS_ISA >= _MIPS_ISA_MIPS2) ||                                       \
-       (defined(__mips) && __mips >= 2) || defined(_R4000)) &&                 \
-    !defined(MDBX_SAFE4QEMU) /* QEMU may not emulate the CC register           \
-                               (High-resolution cycle counter) */
-  unsigned count;
-  __asm __volatile("rdhwr %0, $2" : "=r"(count));
-  return count;
-#endif                       /* arch selector */
-#endif                       /* __GNUC__ || __clang__ */
-
-#if defined(__e2k__) || defined(__ia32__)
-  return __rdtsc();
-#elif defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS)
-  LARGE_INTEGER PerformanceCount;
-  if (QueryPerformanceCounter(&PerformanceCount))
-    return PerformanceCount.QuadPart;
-  return GetTickCount64();
-#else
-  struct timespec ts;
-#if defined(CLOCK_MONOTONIC_COARSE)
-  clockid_t clk_id = CLOCK_MONOTONIC_COARSE;
-#elif defined(CLOCK_MONOTONIC_RAW)
-  clockid_t clk_id = CLOCK_MONOTONIC_RAW;
-#else
-  clockid_t clk_id = CLOCK_MONOTONIC;
-#endif
-  int rc = clock_gettime(clk_id, &ts);
-  if (unlikely(rc))
-    failure_perror("clock_gettime()", rc);
-
-  return (((uint64_t)ts.tv_sec) << 32) + ts.tv_nsec;
-#endif
-}
-
-//-----------------------------------------------------------------------------
-
 uint64_t prng64_white(uint64_t &state) {
   state = prng64_map2_careless(state);
   return bleach64(state);
@@ -303,8 +145,6 @@ uint64_t prng64(void) { return prng64_white(prng_state); }
 
 void prng_fill(void *ptr, size_t bytes) { prng_fill(prng_state, ptr, bytes); }
 
-uint64_t entropy_white() { return bleach64(entropy_ticks()); }
-
 double double_from_lower(uint64_t salt) {
 #ifdef IEEE754_DOUBLE_BIAS
   ieee754_double r;
@@ -336,25 +176,25 @@ double double_from_upper(uint64_t salt) {
 #endif
 }
 
-bool flipcoin() { return bleach32((uint32_t)entropy_ticks()) & 1; }
-bool flipcoin_x2() { return (bleach32((uint32_t)entropy_ticks()) & 3) == 0; }
-bool flipcoin_x3() { return (bleach32((uint32_t)entropy_ticks()) & 7) == 0; }
-bool flipcoin_x4() { return (bleach32((uint32_t)entropy_ticks()) & 15) == 0; }
+bool flipcoin() { return prng32() & 1; }
+bool flipcoin_x2() { return (prng32() & 3) == 0; }
+bool flipcoin_x3() { return (prng32() & 7) == 0; }
+bool flipcoin_x4() { return (prng32() & 15) == 0; }
 bool flipcoin_n(unsigned n) {
-  return (bleach64(entropy_ticks()) & ((UINT64_C(1) << n) - 1)) == 0;
+  return (prng64() & ((UINT64_C(1) << n) - 1)) == 0;
 }
 
 bool jitter(unsigned probability_percent) {
   const uint32_t top = UINT32_MAX - UINT32_MAX % 100;
   uint32_t dice, edge = (top) / 100 * probability_percent;
   do
-    dice = bleach32((uint32_t)entropy_ticks());
+    dice = prng32();
   while (dice >= top);
   return dice < edge;
 }
 
 void jitter_delay(bool extra) {
-  unsigned dice = entropy_white() & 3;
+  unsigned dice = prng32() & 3;
   if (dice == 0) {
     log_trace("== jitter.no-delay");
   } else {
@@ -367,8 +207,8 @@ void jitter_delay(bool extra) {
         osal_yield();
         cpu_relax();
         if (dice > 2) {
-          unsigned us = entropy_white() &
-                        (extra ? 0xffff /* 656 ms */ : 0x3ff /* 1 ms */);
+          unsigned us =
+              prng32() & (extra ? 0xffff /* 656 ms */ : 0x3ff /* 1 ms */);
           log_trace("== jitter.delay: %0.6f", us / 1000000.0);
           osal_udelay(us);
         }

test/utils.h

@@ -292,8 +292,6 @@ inline bool is_samedata(const MDBX_val &a, const MDBX_val &b) {
 }
 std::string format(const char *fmt, ...);
 
-uint64_t entropy_ticks(void);
-uint64_t entropy_white(void);
 static inline uint64_t bleach64(uint64_t v) {
   // Tommy Ettinger, https://www.blogger.com/profile/04953541827437796598
   // http://mostlymangling.blogspot.com/2019/01/better-stronger-mixer-and-test-procedure.html