mdbx: release v0.11.11 (Тендра-1790)

The stable bugfix release.
It is planned that this will be the last release of the v0.11 branch.

Fixes:
------

 - Fixed an extra check for `MDBX_APPENDDUP` inside `mdbx_cursor_put()` which could result in returning `MDBX_EKEYMISMATCH` for valid cases.
 - Fixed an extra ensure/assertion check of `oldest_reader` inside `mdbx_txn_end()`.
 - Fixed derived C++ builds by removing `MDBX_INTERNAL_FUNC` for `mdbx_w2mb()` and `mdbx_mb2w()`.

10 files changed, 38 insertions(+), 21 deletions(-)
Signed-off-by: Леонид Юрьев (Leonid Yuriev) <leo@yuriev.ru>

ChangeLog.md

@@ -1,10 +1,29 @@
 ChangeLog
 ---------
 
+## v0.11.11 (Тендра-1790) at 2022-09-11
+
+The stable bugfix release.
+It is planned that this will be the last release of the v0.11 branch.
+
+```
+10 files changed, 38 insertions(+), 21 deletions(-)
+Signed-off-by: Леонид Юрьев (Leonid Yuriev) <leo@yuriev.ru>
+```
+
+Fixes:
+
+ - Fixed an extra check for `MDBX_APPENDDUP` inside `mdbx_cursor_put()` which could result in returning `MDBX_EKEYMISMATCH` for valid cases.
+ - Fixed an extra ensure/assertion check of `oldest_reader` inside `mdbx_txn_end()`.
+ - Fixed derived C++ builds by removing `MDBX_INTERNAL_FUNC` for `mdbx_w2mb()` and `mdbx_mb2w()`.
+
+
+-------------------------------------------------------------------------------
+
+
 ## v0.11.10 (the TriColor) at 2022-08-22
 
 The stable bugfix release.
-It is planned that this will be the last release of the v0.11 branch.
 
 New:
 

src/core.c

@@ -8788,10 +8788,6 @@ static int mdbx_txn_end(MDBX_txn *txn, const unsigned mode) {
              (void *)env, txn->mt_dbs[MAIN_DBI].md_root,
              txn->mt_dbs[FREE_DBI].md_root);
 
-  mdbx_ensure(env, txn->mt_txnid >=
-                       /* paranoia is appropriate here */ env->me_lck
-                           ->mti_oldest_reader.weak);
-
   if (!(mode & MDBX_END_EOTDONE)) /* !(already closed cursors) */
     mdbx_cursors_eot(txn, false);
 
@@ -8801,6 +8797,9 @@ static int mdbx_txn_end(MDBX_txn *txn, const unsigned mode) {
       MDBX_reader *slot = txn->to.reader;
       mdbx_assert(env, slot->mr_pid.weak == env->me_pid);
       if (likely(!F_ISSET(txn->mt_flags, MDBX_TXN_FINISHED))) {
+        mdbx_ensure(env, txn->mt_txnid >=
+                             /* paranoia is appropriate here */ env->me_lck
+                                 ->mti_oldest_reader.weak);
         mdbx_assert(env, txn->mt_txnid == slot->mr_txnid.weak &&
                              slot->mr_txnid.weak >=
                                  env->me_lck->mti_oldest_reader.weak);
@@ -8828,7 +8827,10 @@ static int mdbx_txn_end(MDBX_txn *txn, const unsigned mode) {
     txn->mt_numdbs = 0; /* prevent further DBI activity */
     txn->mt_flags = MDBX_TXN_RDONLY | MDBX_TXN_FINISHED;
     txn->mt_owner = 0;
-  } else if (!F_ISSET(txn->mt_flags, MDBX_TXN_FINISHED)) {
+  } else if (!(txn->mt_flags & MDBX_TXN_FINISHED)) {
+    mdbx_ensure(env, txn->mt_txnid >=
+                         /* paranoia is appropriate here */ env->me_lck
+                             ->mti_oldest_reader.weak);
 #if defined(MDBX_USE_VALGRIND) || defined(__SANITIZE_ADDRESS__)
     if (txn == env->me_txn0)
       mdbx_txn_valgrind(env, nullptr);
@@ -15542,7 +15544,7 @@ int mdbx_cursor_put(MDBX_cursor *mc, const MDBX_val *key, MDBX_val *data,
           mc->mc_ki[mc->mc_top]++; /* step forward for appending */
           rc = MDBX_NOTFOUND;
         } else {
-          if (unlikely(rc != MDBX_SUCCESS || !(flags & MDBX_APPENDDUP)))
+          if (unlikely(rc != MDBX_SUCCESS))
             /* new-key < last-key
              * or new-key == last-key without MDBX_APPENDDUP */
             return MDBX_EKEYMISMATCH;

src/man1/mdbx_chk.1

@@ -1,6 +1,6 @@
 .\" Copyright 2015-2022 Leonid Yuriev <leo@yuriev.ru>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH MDBX_CHK 1 "2022-08-22" "MDBX 0.11.10"
+.TH MDBX_CHK 1 "2022-09-11" "MDBX 0.11.11"
 .SH NAME
 mdbx_chk \- MDBX checking tool
 .SH SYNOPSIS

src/man1/mdbx_copy.1

@@ -2,7 +2,7 @@
 .\" Copyright 2012-2015 Howard Chu, Symas Corp. All Rights Reserved.
 .\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH MDBX_COPY 1 "2022-08-22" "MDBX 0.11.10"
+.TH MDBX_COPY 1 "2022-09-11" "MDBX 0.11.11"
 .SH NAME
 mdbx_copy \- MDBX environment copy tool
 .SH SYNOPSIS

src/man1/mdbx_drop.1

@@ -1,7 +1,7 @@
 .\" Copyright 2021-2022 Leonid Yuriev <leo@yuriev.ru>.
 .\" Copyright 2014-2021 Howard Chu, Symas Corp. All Rights Reserved.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH MDBX_DROP 1 "2022-08-22" "MDBX 0.11.10"
+.TH MDBX_DROP 1 "2022-09-11" "MDBX 0.11.11"
 .SH NAME
 mdbx_drop \- MDBX database delete tool
 .SH SYNOPSIS

src/man1/mdbx_dump.1

@@ -2,7 +2,7 @@
 .\" Copyright 2014-2015 Howard Chu, Symas Corp. All Rights Reserved.
 .\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH MDBX_DUMP 1 "2022-08-22" "MDBX 0.11.10"
+.TH MDBX_DUMP 1 "2022-09-11" "MDBX 0.11.11"
 .SH NAME
 mdbx_dump \- MDBX environment export tool
 .SH SYNOPSIS

src/man1/mdbx_load.1

@@ -2,7 +2,7 @@
 .\" Copyright 2014-2015 Howard Chu, Symas Corp. All Rights Reserved.
 .\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH MDBX_LOAD 1 "2022-08-22" "MDBX 0.11.10"
+.TH MDBX_LOAD 1 "2022-09-11" "MDBX 0.11.11"
 .SH NAME
 mdbx_load \- MDBX environment import tool
 .SH SYNOPSIS

src/man1/mdbx_stat.1

@@ -2,7 +2,7 @@
 .\" Copyright 2012-2015 Howard Chu, Symas Corp. All Rights Reserved.
 .\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.TH MDBX_STAT 1 "2022-08-22" "MDBX 0.11.10"
+.TH MDBX_STAT 1 "2022-09-11" "MDBX 0.11.11"
 .SH NAME
 mdbx_stat \- MDBX environment status tool
 .SH SYNOPSIS

src/osal.c

@@ -527,14 +527,12 @@ static const DWORD WC_ERR_INVALID_CHARS =
         : 0;
 #endif /* WC_ERR_INVALID_CHARS */
 
-MDBX_INTERNAL_FUNC size_t mdbx_mb2w(wchar_t *dst, size_t dst_n, const char *src,
-                                    size_t src_n) {
+size_t mdbx_mb2w(wchar_t *dst, size_t dst_n, const char *src, size_t src_n) {
   return MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS, src,
                              (int)src_n, dst, (int)dst_n);
 }
 
-MDBX_INTERNAL_FUNC size_t mdbx_w2mb(char *dst, size_t dst_n, const wchar_t *src,
-                                    size_t src_n) {
+size_t mdbx_w2mb(char *dst, size_t dst_n, const wchar_t *src, size_t src_n) {
   return WideCharToMultiByte(CP_THREAD_ACP, WC_ERR_INVALID_CHARS, src,
                              (int)src_n, dst, (int)dst_n, nullptr, nullptr);
 }

src/osal.h

@@ -180,10 +180,8 @@ static inline void mdbx_free(void *ptr) { HeapFree(GetProcessHeap(), 0, ptr); }
 #define vsnprintf _vsnprintf /* ntdll */
 #endif
 
-MDBX_INTERNAL_FUNC size_t mdbx_mb2w(wchar_t *dst, size_t dst_n, const char *src,
-                                    size_t src_n);
-MDBX_INTERNAL_FUNC size_t mdbx_w2mb(char *dst, size_t dst_n, const wchar_t *src,
-                                    size_t src_n);
+size_t mdbx_mb2w(wchar_t *dst, size_t dst_n, const char *src, size_t src_n);
+size_t mdbx_w2mb(char *dst, size_t dst_n, const wchar_t *src, size_t src_n);
 
 #else /*----------------------------------------------------------------------*/