rename pdns::shuffle to pdns::shufleRecords, as suggested by @rgacogne

PowerDNS · Oct 25, 2024 · 2e9888c · 2e9888c
1 parent 5a98b0f
commit 2e9888c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pdns/recursordist/pdns_recursor.cc b/pdns/recursordist/pdns_recursor.cc
@@ -1509,7 +1509,7 @@ void startDoResolve(void* arg) // NOLINT(readability-function-cognitive-complexi
       }
 
       if (!ret.empty()) {
-        pdns::dedup(ret);
+        pdns::dedupRecords(ret);
         pdns::orderAndShuffle(ret, false);
         if (auto listToSort = luaconfsLocal->sortlist.getOrderCmp(comboWriter->d_source)) {
           stable_sort(ret.begin(), ret.end(), *listToSort);

diff --git a/pdns/recursordist/syncres.cc b/pdns/recursordist/syncres.cc
@@ -4435,7 +4435,7 @@ void SyncRes::sanitizeRecordsPass2(const std::string& prefix, LWResult& lwr, con
     }
     lwr.d_records = std::move(vec);
   }
-  if (auto count = pdns::dedup(lwr.d_records); count > 0) {
+  if (auto count = pdns::dedupRecords(lwr.d_records); count > 0) {
     LOG(prefix << qname << ": Removed " << count << " duplicate records from response received from " << auth << endl);
   }
 }

diff --git a/pdns/recursordist/test-shuffle_cc.cc b/pdns/recursordist/test-shuffle_cc.cc
@@ -40,16 +40,16 @@ BOOST_AUTO_TEST_CASE(test_simple)
   auto* address = &list;
   addRecordToList(list, DNSName("foo"), QType::A, "1.2.3.4");
   addRecordToList(list, DNSName("foo2"), QType::A, "1.2.3.4");
-  auto dups = pdns::dedup(list);
+  auto dups = pdns::dedupRecords(list);
   BOOST_CHECK_EQUAL(dups, 0U);
   BOOST_CHECK_EQUAL(list.size(), 2U);
   addRecordToList(list, DNSName("foo"), QType::A, "1.2.3.4");
-  dups = pdns::dedup(list);
+  dups = pdns::dedupRecords(list);
   BOOST_CHECK_EQUAL(dups, 1U);
   BOOST_CHECK_EQUAL(list.size(), 2U);
   addRecordToList(list, DNSName("Foo"), QType::A, "1.2.3.4");
   addRecordToList(list, DNSName("FoO"), QType::A, "1.2.3.4", DNSResourceRecord::ADDITIONAL, 999);
-  dups = pdns::dedup(list);
+  dups = pdns::dedupRecords(list);
   BOOST_CHECK_EQUAL(dups, 2U);
   BOOST_CHECK_EQUAL(list.size(), 2U);
   BOOST_CHECK_EQUAL(address, &list);

diff --git a/pdns/shuffle.cc b/pdns/shuffle.cc
@@ -141,7 +141,7 @@ void pdns::orderAndShuffle(vector<DNSRecord>& rrs, bool includingAdditionals)
   shuffle(rrs, includingAdditionals);
 }
 
-unsigned int pdns::dedup(vector<DNSRecord>& rrs)
+unsigned int pdns::dedupRecords(vector<DNSRecord>& rrs)
 {
   // This function tries to avoid unneccesary work
   // First a vector with zero or one element does not need dedupping

diff --git a/pdns/shuffle.hh b/pdns/shuffle.hh
@@ -29,5 +29,5 @@ namespace pdns
 {
 void shuffle(std::vector<DNSZoneRecord>& rrs);
 void orderAndShuffle(std::vector<DNSRecord>& rrs, bool includingAdditionals);
-unsigned int dedup(std::vector<DNSRecord>& rrs);
+unsigned int dedupRecords(std::vector<DNSRecord>& rrs);
 }
diff --git a/pdns/speedtest.cc b/pdns/speedtest.cc
@@ -1213,7 +1213,7 @@ struct DedupRecordsTest
     }
 
     if (d_dedup) {
-      pdns::dedup(vec);
+      pdns::dedupRecords(vec);
     }
   }