merge with recent libmdbx

10 files changed, 211 insertions, 48 deletions

diff --git a/libs/libmdbx/src/test/config.cc b/libs/libmdbx/src/test/config.cc
index cbff68ce4e..c17c0d71e0 100644
--- a/libs/libmdbx/src/test/config.cc
+++ b/libs/libmdbx/src/test/config.cc
@@ -43,6 +43,11 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
 
   if (narg + 1 < argc && strncmp("--", argv[narg + 1], 2) != 0) {
     *value = argv[narg + 1];
+    if (strcmp(*value, "default") == 0) {
+      if (!default_value)
+        failure("Option '--%s' doen't accept default value\n", option);
+      *value = default_value;
+    }
     ++narg;
     return true;
   }
@@ -57,9 +62,15 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   std::string &value, bool allow_empty) {
+  return parse_option(argc, argv, narg, option, value, allow_empty,
+                      allow_empty ? "" : nullptr);
+}
+
+bool parse_option(int argc, char *const argv[], int &narg, const char *option,
+                  std::string &value, bool allow_empty,
+                  const char *default_value) {
   const char *value_cstr;
-  if (!parse_option(argc, argv, narg, option, &value_cstr,
-                    allow_empty ? "" : nullptr))
+  if (!parse_option(argc, argv, narg, option, &value_cstr, default_value))
     return false;
 
   if (!allow_empty && strlen(value_cstr) == 0)
@@ -75,7 +86,7 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
   if (!parse_option(argc, argv, narg, option, &list))
     return false;
 
-  mask = 0;
+  unsigned clear = 0;
   while (*list) {
     if (*list == ',' || *list == ' ' || *list == '\t') {
       ++list;
@@ -83,14 +94,21 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
     }
 
     const char *const comma = strchr(list, ',');
+    const bool strikethrough = *list == '-' || *list == '~';
+    if (strikethrough || *list == '+')
+      ++list;
+    else
+      mask = clear;
     const size_t len = (comma) ? comma - list : strlen(list);
     const option_verb *scan = verbs;
+
     while (true) {
       if (!scan->verb)
         failure("Unknown verb '%.*s', for option '==%s'\n", (int)len, list,
                 option);
       if (strlen(scan->verb) == len && strncmp(list, scan->verb, len) == 0) {
-        mask |= scan->mask;
+        mask = strikethrough ? mask & ~scan->mask : mask | scan->mask;
+        clear = strikethrough ? clear & ~scan->mask : clear | scan->mask;
         list += len;
         break;
       }
@@ -103,15 +121,36 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   uint64_t &value, const scale_mode scale,
-                  const uint64_t minval, const uint64_t maxval) {
+                  const uint64_t minval, const uint64_t maxval,
+                  const uint64_t default_value) {
 
   const char *value_cstr;
   if (!parse_option(argc, argv, narg, option, &value_cstr))
     return false;
 
+  if (default_value && strcmp(value_cstr, "default") == 0) {
+    value = default_value;
+    return true;
+  }
+
+  if (strcmp(value_cstr, "min") == 0 || strcmp(value_cstr, "minimal") == 0) {
+    value = minval;
+    return true;
+  }
+
+  if (strcmp(value_cstr, "max") == 0 || strcmp(value_cstr, "maximal") == 0) {
+    value = maxval;
+    return true;
+  }
+
   char *suffix = nullptr;
   errno = 0;
-  unsigned long raw = strtoul(value_cstr, &suffix, 0);
+  unsigned long long raw = strtoull(value_cstr, &suffix, 0);
+  if ((suffix && *suffix) || errno) {
+    suffix = nullptr;
+    errno = 0;
+    raw = strtoull(value_cstr, &suffix, 10);
+  }
   if (errno)
     failure("Option '--%s' expects a numeric value (%s)\n", option,
             test_strerror(errno));
@@ -167,28 +206,58 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   unsigned &value, const scale_mode scale,
-                  const unsigned minval, const unsigned maxval) {
+                  const unsigned minval, const unsigned maxval,
+                  const unsigned default_value) {
 
   uint64_t huge;
-  if (!parse_option(argc, argv, narg, option, huge, scale, minval, maxval))
+  if (!parse_option(argc, argv, narg, option, huge, scale, minval, maxval,
+                    default_value))
     return false;
   value = (unsigned)huge;
   return true;
 }
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
-                  uint8_t &value, const uint8_t minval, const uint8_t maxval) {
+                  uint8_t &value, const uint8_t minval, const uint8_t maxval,
+                  const uint8_t default_value) {
 
   uint64_t huge;
-  if (!parse_option(argc, argv, narg, option, huge, no_scale, minval, maxval))
+  if (!parse_option(argc, argv, narg, option, huge, no_scale, minval, maxval,
+                    default_value))
     return false;
   value = (uint8_t)huge;
   return true;
 }
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
+                  int64_t &value, const int64_t minval, const int64_t maxval,
+                  const int64_t default_value) {
+  uint64_t proxy = (uint64_t)value;
+  if (parse_option(argc, argv, narg, option, proxy, config::binary,
+                   (uint64_t)minval, (uint64_t)maxval,
+                   (uint64_t)default_value)) {
+    value = (int64_t)proxy;
+    return true;
+  }
+  return false;
+}
+
+bool parse_option(int argc, char *const argv[], int &narg, const char *option,
+                  int32_t &value, const int32_t minval, const int32_t maxval,
+                  const int32_t default_value) {
+  uint64_t proxy = (uint64_t)value;
+  if (parse_option(argc, argv, narg, option, proxy, config::binary,
+                   (uint64_t)minval, (uint64_t)maxval,
+                   (uint64_t)default_value)) {
+    value = (int32_t)proxy;
+    return true;
+  }
+  return false;
+}
+
+bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   bool &value) {
-  const char *value_cstr = NULL;
+  const char *value_cstr = nullptr;
   if (!parse_option(argc, argv, narg, option, &value_cstr, "yes")) {
     const char *current = argv[narg];
     if (strncmp(current, "--no-", 5) == 0 && strcmp(current + 5, option) == 0) {
@@ -288,8 +357,12 @@ void dump(const char *title) {
                                               : i->params.pathname_log.c_str());
     }
 
-    log_info("database: %s, size %" PRIu64 "\n", i->params.pathname_db.c_str(),
-             i->params.size);
+    log_info("database: %s, size %" PRIuPTR "[%" PRIiPTR "..%" PRIiPTR
+             ", %i %i, %i]\n",
+             i->params.pathname_db.c_str(), i->params.size_now,
+             i->params.size_lower, i->params.size_upper,
+             i->params.shrink_threshold, i->params.growth_step,
+             i->params.pagesize);
 
     dump_verbs("mode", i->params.mode_flags, mode_bits);
     dump_verbs("table", i->params.table_flags, table_bits);
diff --git a/libs/libmdbx/src/test/config.h b/libs/libmdbx/src/test/config.h
index 86f37fbed8..e8dc87577d 100644
--- a/libs/libmdbx/src/test/config.h
+++ b/libs/libmdbx/src/test/config.h
@@ -63,6 +63,10 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   std::string &value, bool allow_empty = false);
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
+                  std::string &value, bool allow_empty,
+                  const char *default_value);
+
+bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   bool &value);
 
 struct option_verb {
@@ -75,16 +79,25 @@ bool parse_option(int argc, char *const argv[], int &narg, const char *option,
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   uint64_t &value, const scale_mode scale,
-                  const uint64_t minval = 0, const uint64_t maxval = INT64_MAX);
+                  const uint64_t minval = 0, const uint64_t maxval = INT64_MAX,
+                  const uint64_t default_value = 0);
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   unsigned &value, const scale_mode scale,
-                  const unsigned minval = 0, const unsigned maxval = INT32_MAX);
+                  const unsigned minval = 0, const unsigned maxval = INT32_MAX,
+                  const unsigned default_value = 0);
 
 bool parse_option(int argc, char *const argv[], int &narg, const char *option,
                   uint8_t &value, const uint8_t minval = 0,
-                  const uint8_t maxval = 255);
+                  const uint8_t maxval = 255, const uint8_t default_value = 0);
 
+bool parse_option(int argc, char *const argv[], int &narg, const char *option,
+                  int64_t &value, const int64_t minval, const int64_t maxval,
+                  const int64_t default_value = -1);
+
+bool parse_option(int argc, char *const argv[], int &narg, const char *option,
+                  int32_t &value, const int32_t minval, const int32_t maxval,
+                  const int32_t default_value = -1);
 //-----------------------------------------------------------------------------
 
 #pragma pack(push, 1)
@@ -203,7 +216,12 @@ struct actor_params_pod {
 
   unsigned mode_flags;
   unsigned table_flags;
-  uint64_t size;
+  intptr_t size_lower;
+  intptr_t size_now;
+  intptr_t size_upper;
+  int shrink_threshold;
+  int growth_step;
+  int pagesize;
 
   unsigned test_duration;
   unsigned test_nops;
diff --git a/libs/libmdbx/src/test/gc.sh b/libs/libmdbx/src/test/gc.sh
new file mode 100644
index 0000000000..84f31a50e7
--- /dev/null
+++ b/libs/libmdbx/src/test/gc.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -euo pipefail
+TESTDB_PREFIX=${1:-/dev/shm/mdbx-gc-test}
+
+function rep9 { printf "%*s" $1 '' | tr ' ' '9'; }
+function join { local IFS="$1"; shift; echo "$*"; }
+function bit2option { local -n arr=$1; (( ($2&(1<<$3)) != 0 )) && echo -n '+' || echo -n '-'; echo "${arr[$3]}"; }
+
+options=(writemap coalesce lifo)
+
+function bits2list {
+	local -n arr=$1
+	local i
+	local list=()
+	for ((i=0; i<${#arr[@]}; ++i)) do
+		list[$i]=$(bit2option $1 $2 $i)
+	done
+	join , "${list[@]}"
+}
+
+for nops in {7..1}; do
+	for ((wbatch=nops; wbatch > 0; --wbatch)); do
+		for ((bits=2**${#options[@]}; --bits >= 0; )); do
+			echo "=================================== $(date)"
+			rm -f ${TESTDB_PREFIX}*
+			echo --nops=$( rep9 $nops ) --batch.write=$( rep9 $wbatch ) --mode=$(bits2list options $bits)
+			./mdbx_test --pathname=${TESTDB_PREFIX} --pagesize=min --size=8G --keylen.min=1 --keylen.max=250 --datalen.min=1 --datalen.max=1500 \
+				--nops=$( rep9 $nops ) --batch.write=$( rep9 $wbatch ) --mode=$(bits2list options $bits) \
+				--keygen.seed=$(date +%N) --hill | bzip2 -c > ${TESTDB_PREFIX}.log.bz2
+			./mdbx_chk -nvv ${TESTDB_PREFIX} | tee ${TESTDB_PREFIX}-chk.log
+		done
+	done
+done
+
+echo "=== ALL DONE ====================== $(date)"
diff --git a/libs/libmdbx/src/test/hill.cc b/libs/libmdbx/src/test/hill.cc
index c9115784d4..0d609b8692 100644
--- a/libs/libmdbx/src/test/hill.cc
+++ b/libs/libmdbx/src/test/hill.cc
@@ -156,8 +156,6 @@ bool testcase_hill::run() {
               a_serial);
     generate_pair(a_serial, a_key, a_data_0, 0);
     generate_pair(a_serial, a_key, a_data_1, age_shift);
-    if (a_serial == 808)
-      log_trace("!!!");
     int rc = mdbx_replace(txn_guard.get(), dbi, &a_key->value, &a_data_1->value,
                           &a_data_0->value, update_flags);
     if (unlikely(rc != MDBX_SUCCESS))
diff --git a/libs/libmdbx/src/test/keygen.cc b/libs/libmdbx/src/test/keygen.cc
index 99b46f2976..1b18fa0033 100644
--- a/libs/libmdbx/src/test/keygen.cc
+++ b/libs/libmdbx/src/test/keygen.cc
@@ -122,16 +122,16 @@ void maker::setup(const config::actor_params_pod &actor,
                   unsigned thread_number) {
   key_essentials.flags =
       actor.table_flags & (MDBX_INTEGERKEY | MDBX_REVERSEKEY);
-  assert(actor.keylen_min < UINT8_MAX);
+  assert(actor.keylen_min <= UINT8_MAX);
   key_essentials.minlen = (uint8_t)actor.keylen_min;
-  assert(actor.keylen_max < UINT16_MAX);
+  assert(actor.keylen_max <= UINT16_MAX);
   key_essentials.maxlen = (uint16_t)actor.keylen_max;
 
   value_essentials.flags =
       actor.table_flags & (MDBX_INTEGERDUP | MDBX_REVERSEDUP);
-  assert(actor.datalen_min < UINT8_MAX);
+  assert(actor.datalen_min <= UINT8_MAX);
   value_essentials.minlen = (uint8_t)actor.datalen_min;
-  assert(actor.datalen_max < UINT16_MAX);
+  assert(actor.datalen_max <= UINT16_MAX);
   value_essentials.maxlen = (uint16_t)actor.datalen_max;
 
   assert(thread_number < 2);
diff --git a/libs/libmdbx/src/test/log.h b/libs/libmdbx/src/test/log.h
index e97e954cea..3e9f9483ab 100644
--- a/libs/libmdbx/src/test/log.h
+++ b/libs/libmdbx/src/test/log.h
@@ -17,16 +17,7 @@
 #include "base.h"
 
 void __noreturn usage(void);
-
-#ifdef __GNUC__
-#define __printf_args(format_index, first_arg)                                 \
-  __attribute__((format(printf, format_index, first_arg)))
-#else
-#define __printf_args(format_index, first_arg)
-#endif
-
 void __noreturn __printf_args(1, 2) failure(const char *fmt, ...);
-
 void __noreturn failure_perror(const char *what, int errnum);
 const char *test_strerror(int errnum);
 
diff --git a/libs/libmdbx/src/test/main.cc b/libs/libmdbx/src/test/main.cc
index bc3198ed3a..1cac3506a3 100644
--- a/libs/libmdbx/src/test/main.cc
+++ b/libs/libmdbx/src/test/main.cc
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2017-2018 Leonid Yuriev <leo@yuriev.ru>
  * and other libmdbx authors: please see AUTHORS file.
  * All rights reserved.
@@ -35,7 +35,13 @@ void actor_params::set_defaults(const std::string &tmpdir) {
   mode_flags = MDBX_NOSUBDIR | MDBX_WRITEMAP | MDBX_MAPASYNC | MDBX_NORDAHEAD |
                MDBX_NOMEMINIT | MDBX_COALESCE | MDBX_LIFORECLAIM;
   table_flags = MDBX_DUPSORT;
-  size = 1024 * 1024 * 4;
+
+  size_lower = -1;
+  size_now = 1024 * 1024 * 4;
+  size_upper = -1;
+  shrink_threshold = -1;
+  growth_step = -1;
+  pagesize = -1;
 
   keygen.seed = 1;
   keygen.keycase = kc_random;
@@ -150,8 +156,34 @@ int main(int argc, char *const argv[]) {
     if (config::parse_option(argc, argv, narg, "table", params.table_flags,
                              config::table_bits))
       continue;
-    if (config::parse_option(argc, argv, narg, "size", params.size,
-                             config::binary, 4096 * 4))
+
+    if (config::parse_option(argc, argv, narg, "pagesize", params.pagesize,
+                             mdbx_limits_pgsize_min(),
+                             mdbx_limits_pgsize_max()))
+      continue;
+    if (config::parse_option(argc, argv, narg, "size-lower", params.size_lower,
+                             mdbx_limits_dbsize_min(params.pagesize),
+                             mdbx_limits_dbsize_max(params.pagesize)))
+      continue;
+    if (config::parse_option(argc, argv, narg, "size", params.size_now,
+                             mdbx_limits_dbsize_min(params.pagesize),
+                             mdbx_limits_dbsize_max(params.pagesize)))
+      continue;
+    if (config::parse_option(argc, argv, narg, "size-upper", params.size_upper,
+                             mdbx_limits_dbsize_min(params.pagesize),
+                             mdbx_limits_dbsize_max(params.pagesize)))
+      continue;
+    if (config::parse_option(
+            argc, argv, narg, "shrink-threshold", params.shrink_threshold, 0,
+            (int)std::min((intptr_t)INT_MAX,
+                          mdbx_limits_dbsize_max(params.pagesize) -
+                              mdbx_limits_dbsize_min(params.pagesize))))
+      continue;
+    if (config::parse_option(
+            argc, argv, narg, "growth-step", params.growth_step, 0,
+            (int)std::min((intptr_t)INT_MAX,
+                          mdbx_limits_dbsize_max(params.pagesize) -
+                              mdbx_limits_dbsize_min(params.pagesize))))
       continue;
 
     if (config::parse_option(argc, argv, narg, "keygen.width",
@@ -188,20 +220,33 @@ int main(int argc, char *const argv[]) {
                              config::duration, 1))
       continue;
     if (config::parse_option(argc, argv, narg, "keylen.min", params.keylen_min,
-                             config::no_scale, 0, params.keylen_max))
+                             config::no_scale, 0, UINT8_MAX)) {
+      if (params.keylen_max < params.keylen_min)
+        params.keylen_max = params.keylen_min;
       continue;
+    }
     if (config::parse_option(argc, argv, narg, "keylen.max", params.keylen_max,
-                             config::no_scale, params.keylen_min,
-                             mdbx_get_maxkeysize(0)))
+                             config::no_scale, 0,
+                             std::min((unsigned)mdbx_limits_keysize_max(0),
+                                      (unsigned)UINT16_MAX))) {
+      if (params.keylen_min > params.keylen_max)
+        params.keylen_min = params.keylen_max;
       continue;
+    }
     if (config::parse_option(argc, argv, narg, "datalen.min",
                              params.datalen_min, config::no_scale, 0,
-                             params.datalen_max))
+                             UINT8_MAX)) {
+      if (params.datalen_max < params.datalen_min)
+        params.datalen_max = params.datalen_min;
       continue;
+    }
     if (config::parse_option(argc, argv, narg, "datalen.max",
-                             params.datalen_max, config::no_scale,
-                             params.datalen_min, MDBX_MAXDATASIZE))
+                             params.datalen_max, config::no_scale, 0,
+                             std::min((int)UINT16_MAX, MDBX_MAXDATASIZE))) {
+      if (params.datalen_min > params.datalen_max)
+        params.datalen_min = params.datalen_max;
       continue;
+    }
     if (config::parse_option(argc, argv, narg, "batch.read", params.batch_read,
                              config::no_scale, 1))
       continue;
diff --git a/libs/libmdbx/src/test/osal-windows.cc b/libs/libmdbx/src/test/osal-windows.cc
index 109c835a96..b8cdb53513 100644
--- a/libs/libmdbx/src/test/osal-windows.cc
+++ b/libs/libmdbx/src/test/osal-windows.cc
@@ -53,7 +53,7 @@ void osal_wait4barrier(void) {
   }
 }
 
-static HANDLE make_inharitable(HANDLE hHandle) {
+static HANDLE make_inheritable(HANDLE hHandle) {
   assert(hHandle != NULL && hHandle != INVALID_HANDLE_VALUE);
   if (!DuplicateHandle(GetCurrentProcess(), hHandle, GetCurrentProcess(),
                        &hHandle, 0, TRUE,
@@ -71,7 +71,7 @@ void osal_setup(const std::vector<actor_config> &actors) {
     HANDLE hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
     if (!hEvent)
       failure_perror("CreateEvent()", GetLastError());
-    hEvent = make_inharitable(hEvent);
+    hEvent = make_inheritable(hEvent);
     log_trace("osal_setup: event %" PRIuPTR " -> %p", i, hEvent);
     events[i] = hEvent;
   }
@@ -79,12 +79,12 @@ void osal_setup(const std::vector<actor_config> &actors) {
   hBarrierSemaphore = CreateSemaphore(NULL, 0, (LONG)actors.size(), NULL);
   if (!hBarrierSemaphore)
     failure_perror("CreateSemaphore(BarrierSemaphore)", GetLastError());
-  hBarrierSemaphore = make_inharitable(hBarrierSemaphore);
+  hBarrierSemaphore = make_inheritable(hBarrierSemaphore);
 
   hBarrierEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
   if (!hBarrierEvent)
     failure_perror("CreateEvent(BarrierEvent)", GetLastError());
-  hBarrierEvent = make_inharitable(hBarrierEvent);
+  hBarrierEvent = make_inheritable(hBarrierEvent);
 }
 
 void osal_broadcast(unsigned id) {
diff --git a/libs/libmdbx/src/test/test.cc b/libs/libmdbx/src/test/test.cc
index 3750af525f..80694827a6 100644
--- a/libs/libmdbx/src/test/test.cc
+++ b/libs/libmdbx/src/test/test.cc
@@ -149,7 +149,10 @@ void testcase::db_prepare() {
   if (unlikely(rc != MDBX_SUCCESS))
     failure_perror("mdbx_env_set_oomfunc()", rc);
 
-  rc = mdbx_env_set_mapsize(env, (size_t)config.params.size);
+  rc = mdbx_env_set_geometry(
+      env, config.params.size_lower, config.params.size_now,
+      config.params.size_upper, config.params.growth_step,
+      config.params.shrink_threshold, config.params.pagesize);
   if (unlikely(rc != MDBX_SUCCESS))
     failure_perror("mdbx_env_set_mapsize()", rc);
 
diff --git a/libs/libmdbx/src/test/utils.cc b/libs/libmdbx/src/test/utils.cc
index 0855c7eef3..53a750e314 100644
--- a/libs/libmdbx/src/test/utils.cc
+++ b/libs/libmdbx/src/test/utils.cc
@@ -93,7 +93,7 @@ bool hex2data(const char *hex_begin, const char *hex_end, void *ptr,
 
 //-----------------------------------------------------------------------------
 
-/* TODO: replace my 'libmera' fomr t1ha. */
+/* TODO: replace my 'libmera' from t1ha. */
 uint64_t entropy_ticks(void) {
 #if defined(EMSCRIPTEN)
   return (uint64_t)emscripten_get_now();