FlatHashMap: remove_if; generic td::table_remove_if

tdutils/td/utils/FlatHashMap.h

@@ -360,33 +360,31 @@ class FlatHashMapImpl {
   void erase(Iterator it) {
     DCHECK(it != end());
     DCHECK(!is_key_empty(it->key()));
-    size_t empty_i = it.it_ - nodes_.begin();
+    erase_node(it.it_);
-    auto empty_bucket = empty_i;
+  }
-    DCHECK(0 <= empty_i && empty_i < nodes_.size());
-    nodes_[empty_bucket].clear();
-    used_nodes_--;
 
-    for (size_t test_i = empty_i + 1;; test_i++) {
+  template <class F>
-      auto test_bucket = test_i;
+  void remove_if(F &&f) {
-      if (test_bucket >= nodes_.size()) {
+    auto it = nodes_.begin();
-        test_bucket -= nodes_.size();
+    while (it != nodes_.end() && !it->empty()) {
-      }
+      ++it;
-
+    }
-      if (nodes_[test_bucket].empty()) {
+    auto first_empty = it;
-        break;
+    for (; it != nodes_.end();) {
-      }
+      if (!it->empty() && f(*it)) {
-
+        erase_node(it);
-      auto want_i = calc_bucket(nodes_[test_bucket].key());
+      } else {
-      if (want_i < empty_i) {
+        ++it;
-        want_i += nodes_.size();
-      }
-
-      if (want_i <= empty_i || want_i > test_i) {
-        nodes_[empty_bucket] = std::move(nodes_[test_bucket]);
-        empty_i = test_i;
-        empty_bucket = test_bucket;
       }
     }
+    for (it = nodes_.begin(); it != first_empty;) {
+      if (!it->empty() && f(*it)) {
+        erase_node(it);
+      } else {
+        ++it;
+      }
+    }
+    // TODO: resize hashtable is necessary
   }
 
  private:
@@ -449,8 +447,43 @@ class FlatHashMapImpl {
       bucket = 0;
     }
   }
+
+  void erase_node(NodeIterator it) {
+    size_t empty_i = it - nodes_.begin();
+    auto empty_bucket = empty_i;
+        DCHECK(0 <= empty_i && empty_i < nodes_.size());
+    nodes_[empty_bucket].clear();
+    used_nodes_--;
+
+    for (size_t test_i = empty_i + 1;; test_i++) {
+      auto test_bucket = test_i;
+      if (test_bucket >= nodes_.size()) {
+        test_bucket -= nodes_.size();
+      }
+
+      if (nodes_[test_bucket].empty()) {
+        break;
+      }
+
+      auto want_i = calc_bucket(nodes_[test_bucket].key());
+      if (want_i < empty_i) {
+        want_i += nodes_.size();
+      }
+
+      if (want_i <= empty_i || want_i > test_i) {
+        nodes_[empty_bucket] = std::move(nodes_[test_bucket]);
+        empty_i = test_i;
+        empty_bucket = test_bucket;
+      }
+    }
+  }
 };
 
+template <class K, class V, class H, class FuncT>
+void table_remove_if(FlatHashMapImpl<K, V, H> &table, FuncT &&func) {
+  table.remove_if(func);
+}
+
 template <class KeyT, class ValueT, class HashT = std::hash<KeyT>>
 using FlatHashMap = FlatHashMapImpl<KeyT, ValueT, HashT>;
 //using FlatHashMap = std::unordered_map<KeyT, ValueT, HashT>;

tdutils/td/utils/algorithm.h

@@ -195,4 +195,15 @@ detail::reversion_wrapper<T> reversed(T &iterable) {
   return {iterable};
 }
 
+template <class TableT, class FuncT>
+void table_remove_if(TableT &table, FuncT &&func) {
+  for (auto it = table.begin(); it != table.end();) {
+    if (func(*it)) {
+      it = table.erase(it);
+    } else {
+      ++it;
+    }
+  }
+}
+
 }  // namespace td

tdutils/test/HashSet.cpp

@@ -9,6 +9,8 @@
 #include "td/utils/tests.h"
 
 #include <array>
+#include "td/utils/Random.h"
+#include "td/utils/algorithm.h"
 
 TEST(FlatHashMap, basic) {
   {
@@ -47,3 +49,36 @@ TEST(FlatHashMap, basic) {
     ASSERT_EQ(1u, map.size());
   }
 }
+
+template <class T>
+auto extract_kv(const T &reference) {
+  auto expected = td::transform(reference, [](auto &it) {return std::make_pair(it.first, it.second);});
+  std::sort(expected.begin(), expected.end());
+  return expected;
+}
+
+TEST(FlatHashMap, remove_if_basic) {
+  td::Random::Xorshift128plus rnd(123);
+
+  for (int test_i = 0; test_i < 1000000; test_i++) {
+    std::unordered_map<td::uint64, td::uint64> reference;
+    td::FlatHashMap<td::uint64, td::uint64> table;
+    LOG_IF(ERROR, test_i % 1000 == 0) << test_i;
+    int N = rnd.fast(1, 1000);
+    for (int i = 0; i < N; i++) {
+      auto key = rnd();
+      auto value = i;
+      reference[key] = value;
+      table[key] = value;
+    }
+    ASSERT_EQ(extract_kv(reference), extract_kv(table));
+
+    std::vector<std::pair<td::uint64, td::uint64>> kv;
+    td::table_remove_if(table, [&](auto &it) {kv.emplace_back(it.first, it.second); return it.second % 2 == 0; });
+    std::sort(kv.begin(), kv.end());
+    ASSERT_EQ(extract_kv(reference), kv);
+
+    td::table_remove_if(reference, [](auto &it) {return it.second % 2 == 0;});
+    ASSERT_EQ(extract_kv(reference), extract_kv(table));
+  }
+}

tdutils/test/hashset_benchmark.cpp

@@ -4,6 +4,7 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#include "td/utils/algorithm.h"
 #include "td/utils/common.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/format.h"
@@ -251,6 +252,43 @@ static void BM_emplace_same(benchmark::State &state) {
   }
 }
 
+namespace td {
+template <class K, class V, class FunctT>
+void table_remove_if(absl::flat_hash_map<K, V> &table, FunctT &&func) {
+  for (auto it = table.begin(); it != table.end();) {
+    if (func(*it)) {
+      auto copy = it;
+      ++it;
+      table.erase(copy);
+    } else {
+      ++it;
+    }
+  }
+}
+}
+
+
+template <typename TableT>
+static void BM_remove_if(benchmark::State &state) {
+  constexpr size_t N = 100000;
+  constexpr size_t BATCH_SIZE = N;
+
+  TableT table;
+  reserve(table, N);
+  while (state.KeepRunningBatch(BATCH_SIZE)) {
+    state.PauseTiming();
+    td::Random::Xorshift128plus rnd(123);
+    for (size_t i = 0; i < N; i++) {
+      table.emplace(rnd(), i);
+    }
+    state.ResumeTiming();
+
+    td::table_remove_if(table, [](auto &it) {
+      return it.second % 2 == 0;
+    });
+  }
+}
+
 template <typename TableT>
 static void benchmark_create(td::Slice name) {
   td::Random::Xorshift128plus rnd(123);
@@ -296,6 +334,7 @@ static void benchmark_create(td::Slice name) {
 //BENCHMARK(BM_Get<NoOpTable<td::uint64, td::uint64>>)->Range(1, 1 << 26);
 
 #define REGISTER_GET_BENCHMARK(HT) BENCHMARK(BM_Get<HT<td::uint64, td::uint64>>)->Range(1, 1 << 23);
+#define REGISTER_REMOVE_IF_BENCHMARK(HT) BENCHMARK(BM_remove_if<HT<td::uint64, td::uint64>>);
 
 #define REGISTER_FIND_BENCHMARK(HT)                                                                                 \
   BENCHMARK(BM_find_same<HT<td::uint64, td::uint64>>)                                                               \
@@ -308,12 +347,13 @@ static void benchmark_create(td::Slice name) {
 
 #define RUN_CREATE_BENCHMARK(HT) benchmark_create<HT<td::uint64, td::uint64>>(#HT);
 
+FOR_EACH_TABLE(REGISTER_REMOVE_IF_BENCHMARK)
 FOR_EACH_TABLE(REGISTER_FIND_BENCHMARK)
 FOR_EACH_TABLE(REGISTER_EMPLACE_BENCHMARK)
 FOR_EACH_TABLE(REGISTER_GET_BENCHMARK)
 
 int main(int argc, char **argv) {
-  FOR_EACH_TABLE(RUN_CREATE_BENCHMARK);
+//  FOR_EACH_TABLE(RUN_CREATE_BENCHMARK);
 
   benchmark::Initialize(&argc, argv);
   benchmark::RunSpecifiedBenchmarks();