move handle_dups flag to lmdbbackend

diff --git a/ext/lmdb-safe/lmdb-safe.cc b/ext/lmdb-safe/lmdb-safe.cc
index d4b820e73749822bb6e010ab3bbfe92444d2e165..6b93b3b7cfaf1bd994b02ff19475b420130a27b6 100644 (file)
--- a/ext/lmdb-safe/lmdb-safe.cc
+++ b/ext/lmdb-safe/lmdb-safe.cc
@@ -74,7 +74,6 @@ namespace LMDBLS {
     return lsh->getTimestamp();
   }
   bool s_flag_deleted{false};
-  bool s_handle_dups{false};
 }
 
 #endif /* #ifndef DNSDIST */

diff --git a/ext/lmdb-safe/lmdb-safe.hh b/ext/lmdb-safe/lmdb-safe.hh
index b10b4568ec6b3b4a3f1011fb9c9e70b9d71508f5..af1c87fcb6d39b041a9eb1f57307d84d9025a219 100644 (file)
--- a/ext/lmdb-safe/lmdb-safe.hh
+++ b/ext/lmdb-safe/lmdb-safe.hh
@@ -160,7 +160,6 @@ namespace LMDBLS {
   uint64_t LSgetTimestamp(std::string_view val);
 
   extern bool s_flag_deleted;
-  extern bool s_handle_dups;
 }
 
 #undef _LMDB_SAFE_BSWAP64MAYBE

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 6259841feaedb5d6bb4213f903aeeff92dbcd5d4..23804d3674598f47b817bd0a31a8828c5476bf66 100644 (file)
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -666,12 +666,12 @@ LMDBBackend::LMDBBackend(const std::string& suffix)
   }
 
   LMDBLS::s_flag_deleted = mustDo("flag-deleted");
-  LMDBLS::s_handle_dups = false;
+  d_handle_dups = false;
 
   if (mustDo("lightning-stream")) {
     d_random_ids = true;
+    d_handle_dups = true;
     LMDBLS::s_flag_deleted = true;
-    LMDBLS::s_handle_dups = true;
   }
 
   bool opened = false;

diff --git a/modules/lmdbbackend/lmdbbackend.hh b/modules/lmdbbackend/lmdbbackend.hh
index 3b69451ec65fc68243d2b8a3cdaf29eef12cfb3c..d684a37b91cbc12266c162b6dbe31e11da27b597 100644 (file)
--- a/modules/lmdbbackend/lmdbbackend.hh
+++ b/modules/lmdbbackend/lmdbbackend.hh
@@ -330,5 +330,6 @@ private:
   uint32_t d_transactiondomainid;
   bool d_dolog;
   bool d_random_ids;
+  bool d_handle_dups;
   DTime d_dtime; // used only for logging
 };