feat: add AddMany()

src/core/intrusive_string_set.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include <absl/numeric/bits.h>
+#include <absl/types/span.h>
+
 #include <cassert>
 #include <cstring>
 #include <memory>
@@ -159,30 +162,62 @@ class IntrusiveStringSet {
 
   // TODO add TTL processing
   ISLEntry Add(std::string_view str, uint32_t ttl_sec = UINT32_MAX) {
-    if (size_ >= entries_.size()) {
-      auto prev_size = entries_.size();
-      ++capacity_log_;
-      entries_.resize(Capacity());
-      Rehash(prev_size);
+    if (entries_.empty() || size_ >= entries_.size()) {
+      Resize(Capacity() * 2);
     }
-    auto bucket_id = BucketId(Hash(str));
+    const auto bucket_id = BucketId(Hash(str));
     auto& bucket = entries_[bucket_id];
 
     if (auto existed_item = bucket.Find(str); existed_item) {
       // TODO consider common implementation for key value pair
       return ISLEntry();
     }
 
+    return AddUnique(str, bucket, ttl_sec);
+  }
+
+  void Resize(size_t sz) {
+    sz = absl::bit_ceil(sz);
+    if (sz > entries_.size()) {
+      size_t prev_size = entries_.size();
+      capacity_log_ = absl::bit_width(sz) - 1;
+      entries_.resize(sz);
+      Rehash(prev_size);
+    }
+  }
+
+  ISLEntry AddUnique(std::string_view str, IntrusiveStringList& bucket,
+                     uint32_t ttl_sec = UINT32_MAX) {
     ++size_;
     return bucket.Emplace(str);
   }
 
+  unsigned AddMany(absl::Span<std::string_view> span, uint32_t ttl_sec, bool keepttl) {
+    Resize(span.size());
+    unsigned res = 0;
+    for (auto& s : span) {
+      const auto bucket_id = BucketId(Hash(s));
+      auto& bucket = entries_[bucket_id];
+      if (auto existed_item = bucket.Find(s); existed_item) {
+        // TODO update TTL
+      } else {
+        ++res;
+        AddUnique(s, bucket, ttl_sec);
+      }
+    }
+    return res;
+  }
+
   bool Erase(std::string_view str) {
+    if (entries_.empty())
+      return false;
     auto bucket_id = BucketId(Hash(str));
     return entries_[bucket_id].Erase(str);
   }
 
   ISLEntry Find(std::string_view member) const {
+    if (entries_.empty())
+      return {};
     auto bucket_id = BucketId(Hash(member));
     return entries_[bucket_id].Find(member);
   }

src/core/intrusive_string_set_test.cc

@@ -155,57 +155,57 @@ TEST_F(IntrusiveStringSetTest, StandardAddErase) {
   EXPECT_TRUE(ss_->Erase("AAAAAAAAAAAAAAA@"));
 }
 
-// TEST_F(IntrusiveStringSetTest, DisplacedBug) {
-//   string_view vals[] = {"imY", "OVl", "NhH", "BCe", "YDL", "lpb",
-//                         "nhF", "xod", "zYR", "PSa", "hce", "cTR"};
-//   ss_->AddMany(absl::MakeSpan(vals), UINT32_MAX, false);
-
-//   ss_->Add("fIc");
-//   ss_->Erase("YDL");
-//   ss_->Add("fYs");
-//   ss_->Erase("hce");
-//   ss_->Erase("nhF");
-//   ss_->Add("dye");
-//   ss_->Add("xZT");
-//   ss_->Add("LVK");
-//   ss_->Erase("zYR");
-//   ss_->Erase("fYs");
-//   ss_->Add("ueB");
-//   ss_->Erase("PSa");
-//   ss_->Erase("OVl");
-//   ss_->Add("cga");
-//   ss_->Add("too");
-//   ss_->Erase("ueB");
-//   ss_->Add("HZe");
-//   ss_->Add("oQn");
-//   ss_->Erase("too");
-//   ss_->Erase("HZe");
-//   ss_->Erase("xZT");
-//   ss_->Erase("cga");
-//   ss_->Erase("cTR");
-//   ss_->Erase("BCe");
-//   ss_->Add("eua");
-//   ss_->Erase("lpb");
-//   ss_->Add("OXK");
-//   ss_->Add("QmO");
-//   ss_->Add("SzV");
-//   ss_->Erase("QmO");
-//   ss_->Add("jbe");
-//   ss_->Add("BPN");
-//   ss_->Add("OfH");
-//   ss_->Add("Muf");
-//   ss_->Add("CwP");
-//   ss_->Erase("Muf");
-//   ss_->Erase("xod");
-//   ss_->Add("Cis");
-//   ss_->Add("Xvd");
-//   ss_->Erase("SzV");
-//   ss_->Erase("eua");
-//   ss_->Add("DGb");
-//   ss_->Add("leD");
-//   ss_->Add("MVX");
-//   ss_->Add("HPq");
-// }
+TEST_F(IntrusiveStringSetTest, DisplacedBug) {
+  string_view vals[] = {"imY", "OVl", "NhH", "BCe", "YDL", "lpb",
+                        "nhF", "xod", "zYR", "PSa", "hce", "cTR"};
+  ss_->AddMany(absl::MakeSpan(vals), UINT32_MAX, false);
+
+  ss_->Add("fIc");
+  ss_->Erase("YDL");
+  ss_->Add("fYs");
+  ss_->Erase("hce");
+  ss_->Erase("nhF");
+  ss_->Add("dye");
+  ss_->Add("xZT");
+  ss_->Add("LVK");
+  ss_->Erase("zYR");
+  ss_->Erase("fYs");
+  ss_->Add("ueB");
+  ss_->Erase("PSa");
+  ss_->Erase("OVl");
+  ss_->Add("cga");
+  ss_->Add("too");
+  ss_->Erase("ueB");
+  ss_->Add("HZe");
+  ss_->Add("oQn");
+  ss_->Erase("too");
+  ss_->Erase("HZe");
+  ss_->Erase("xZT");
+  ss_->Erase("cga");
+  ss_->Erase("cTR");
+  ss_->Erase("BCe");
+  ss_->Add("eua");
+  ss_->Erase("lpb");
+  ss_->Add("OXK");
+  ss_->Add("QmO");
+  ss_->Add("SzV");
+  ss_->Erase("QmO");
+  ss_->Add("jbe");
+  ss_->Add("BPN");
+  ss_->Add("OfH");
+  ss_->Add("Muf");
+  ss_->Add("CwP");
+  ss_->Erase("Muf");
+  ss_->Erase("xod");
+  ss_->Add("Cis");
+  ss_->Add("Xvd");
+  ss_->Erase("SzV");
+  ss_->Erase("eua");
+  ss_->Add("DGb");
+  ss_->Add("leD");
+  ss_->Add("MVX");
+  ss_->Add("HPq");
+}
 
 // static string random_string(mt19937& rand, unsigned len) {
 //   const string_view alpanum = "1234567890abcdefghijklmnopqrstuvwxyz";