drop upgradeToSchemav3

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 10ca370f4c371df3048b4bb95a29549114dabe28..e0e9aacadb00156ec906e750024f007bc88c1217 100644 (file)
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -893,20 +893,6 @@ namespace serialization
     }
   }
 
-  template <class Archive>
-  void save(Archive& ar, const QType& g, const unsigned int /* version */)
-  {
-    ar & g.getCode();
-  }
-
-  template <class Archive>
-  void load(Archive& ar, QType& g, const unsigned int /* version */)
-  {
-    uint16_t tmp;
-    ar & tmp;
-    g = QType(tmp);
-  }
-
   template <class Archive>
   void save(Archive& ar, const DomainInfo& g, const unsigned int /* version */)
   {
@@ -978,7 +964,6 @@ namespace serialization
 
 BOOST_SERIALIZATION_SPLIT_FREE(DNSName);
 BOOST_SERIALIZATION_SPLIT_FREE(ZoneName);
-BOOST_SERIALIZATION_SPLIT_FREE(QType);
 BOOST_SERIALIZATION_SPLIT_FREE(LMDBBackend::KeyDataDB);
 BOOST_SERIALIZATION_SPLIT_FREE(DomainInfo);
 BOOST_IS_BITWISE_SERIALIZABLE(ComboAddress);
@@ -1345,71 +1330,6 @@ std::shared_ptr<LMDBBackend::RecordsROTransaction> LMDBBackend::getRecordsROTran
   }
 }
 
-#if 0
-// FIXME reinstate soon
-bool LMDBBackend::upgradeToSchemav3()
-{
-  g_log << Logger::Warning << "Upgrading LMDB schema" << endl;
-
-  for (auto i = 0; i < s_shards; i++) {
-    string filename = getArg("filename") + "-" + std::to_string(i);
-    if (rename(filename.c_str(), (filename + "-old").c_str()) < 0) {
-      if (errno == ENOENT) {
-        // apparently this shard doesn't exist yet, moving on
-        continue;
-      }
-      unixDie("Rename failed during LMDB upgrade");
-    }
-
-    LMDBBackend::RecordsDB oldShard, newShard;
-
-    oldShard.env = getMDBEnv((filename + "-old").c_str(),
-                             MDB_NOSUBDIR | d_asyncFlag, 0600);
-    oldShard.dbi = oldShard.env->openDB("records", MDB_CREATE | MDB_DUPSORT);
-    auto txn = oldShard.env->getROTransaction();
-    auto cursor = txn->getROCursor(oldShard.dbi);
-
-    newShard.env = getMDBEnv((filename).c_str(),
-                             MDB_NOSUBDIR | d_asyncFlag, 0600);
-    newShard.dbi = newShard.env->openDB("records", MDB_CREATE);
-    auto newTxn = newShard.env->getRWTransaction();
-
-    MDBOutVal key, val;
-    if (cursor.first(key, val) != 0) {
-      cursor.close();
-      txn->abort();
-      newTxn->abort();
-      continue;
-    }
-    string_view currentKey;
-    string value;
-    for (;;) {
-      auto newKey = key.getNoStripHeader<string_view>();
-      if (currentKey.compare(newKey) != 0) {
-        if (value.size() > 0) {
-          newTxn->put(newShard.dbi, currentKey, value);
-        }
-        currentKey = newKey;
-        value = "";
-      }
-      value += val.get<string>();
-      if (cursor.next(key, val) != 0) {
-        if (value.size() > 0) {
-          newTxn->put(newShard.dbi, currentKey, value);
-        }
-        break;
-      }
-    }
-
-    cursor.close();
-    txn->commit();
-    newTxn->commit();
-  }
-
-  return true;
-}
-#endif
-
 bool LMDBBackend::deleteDomain(const ZoneName& domain)
 {
   if (!d_rwtxn) {

diff --git a/modules/lmdbbackend/lmdbbackend.hh b/modules/lmdbbackend/lmdbbackend.hh
index f29c97070495cbc0d5d43441baadc91c9c3b71e6..fb3ed1e927346073871102e35046e5a3c10166ab 100644 (file)
--- a/modules/lmdbbackend/lmdbbackend.hh
+++ b/modules/lmdbbackend/lmdbbackend.hh
@@ -321,8 +321,6 @@ private:
   void lookupInternal(const QType& type, const DNSName& qdomain, int zoneId, DNSPacket* p, bool include_disabled);
   bool getSerial(DomainInfo& di);
 
-  bool upgradeToSchemav3();
-
   bool get_list(DNSZoneRecord& rr);
   bool get_lookup(DNSZoneRecord& rr);
   std::string d_matchkey;