From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 28 Apr 2023 12:18:15 +0000 (+0200)
Subject: move handle_dups flag to lmdbbackend
X-Git-Tag: auth-4.8.0-beta1~1^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c11405d6b75a652763248a76c50cc7ed56759c7;p=thirdparty%2Fpdns.git

move handle_dups flag to lmdbbackend
---

diff --git a/ext/lmdb-safe/lmdb-safe.cc b/ext/lmdb-safe/lmdb-safe.cc
index d4b820e737..6b93b3b7cf 100644
--- 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 b10b4568ec..af1c87fcb6 100644
--- 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 6259841fea..23804d3674 100644
--- 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 3b69451ec6..d684a37b91 100644
--- 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
 };