From 07bb12965302afa69d0bf4771641d453e08fb3a3 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 9 Mar 2022 18:03:56 +0300
Subject: [PATCH] Move FlatHashTable implementation to FlatHashTable.h.

---
 benchmark/hashmap_build.cpp                              | 2 --
 benchmark/hashset_memory.cpp                             | 8 ++++++--
 tdutils/CMakeLists.txt                                   | 2 +-
 tdutils/td/utils/FlatHashMap.h                           | 8 +++++---
 .../td/utils/{FlatHashMapLinear.h => FlatHashTable.h}    | 6 ------
 tdutils/test/HashSet.cpp                                 | 1 -
 tdutils/test/hashset_benchmark.cpp                       | 9 +++++++--
 7 files changed, 19 insertions(+), 17 deletions(-)
 rename tdutils/td/utils/{FlatHashMapLinear.h => FlatHashTable.h} (97%)

diff --git a/benchmark/hashmap_build.cpp b/benchmark/hashmap_build.cpp
index 4f8a3daf6..7d63acb71 100644
--- a/benchmark/hashmap_build.cpp
+++ b/benchmark/hashmap_build.cpp
@@ -5,8 +5,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 #include "td/utils/FlatHashMap.h"
-#include "td/utils/FlatHashMapChunks.h"
-#include "td/utils/FlatHashMapLinear.h"
 
 #ifdef SCOPE_EXIT
 #undef SCOPE_EXIT
diff --git a/benchmark/hashset_memory.cpp b/benchmark/hashset_memory.cpp
index 3ed7e6393..aacd18247 100644
--- a/benchmark/hashset_memory.cpp
+++ b/benchmark/hashset_memory.cpp
@@ -11,7 +11,7 @@
 #include "td/utils/common.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FlatHashMapChunks.h"
-#include "td/utils/FlatHashMapLinear.h"
+#include "td/utils/FlatHashTable.h"
 #include "td/utils/logging.h"
 #include "td/utils/misc.h"
 #include "td/utils/port/Stat.h"
@@ -25,6 +25,7 @@
 #include <absl/container/flat_hash_map.h>
 #include <array>
 #include <folly/container/F14Map.h>
+#include <functional>
 #include <map>
 #include <unordered_map>
 
@@ -164,8 +165,11 @@ void print_memory_stats(td::Slice name) {
   }
 }
 
+template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
+using FlatHashMapImpl = td::FlatHashTable<td::MapNode<KeyT, ValueT>, HashT, EqT>;
+
 #define FOR_EACH_TABLE(F) \
-  F(td::FlatHashMapImpl)  \
+  F(FlatHashMapImpl)      \
   F(folly::F14FastMap)    \
   F(absl::flat_hash_map)  \
   F(std::unordered_map)   \
diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
index e5083f1ed..f8a69ecad 100644
--- a/tdutils/CMakeLists.txt
+++ b/tdutils/CMakeLists.txt
@@ -207,7 +207,7 @@ set(TDUTILS_SOURCE
   td/utils/find_boundary.h
   td/utils/FlatHashMap.h
   td/utils/FlatHashMapChunks.h
-  td/utils/FlatHashMapLinear.h
+  td/utils/FlatHashTable.h
   td/utils/FloodControlFast.h
   td/utils/FloodControlStrict.h
   td/utils/format.h
diff --git a/tdutils/td/utils/FlatHashMap.h b/tdutils/td/utils/FlatHashMap.h
index a271a5222..d4d3fc3dd 100644
--- a/tdutils/td/utils/FlatHashMap.h
+++ b/tdutils/td/utils/FlatHashMap.h
@@ -7,7 +7,9 @@
 #pragma once
 
 //#include "td/utils/FlatHashMapChunks.h"
-//#include "td/utils/FlatHashMapLinear.h"
+//#include "td/utils/FlatHashTable.h"
+//#include "td/utils/MapNode.h"
+//#include "td/utils/SetNode.h"
 
 #include <functional>
 #include <unordered_map>
@@ -16,12 +18,12 @@
 namespace td {
 
 template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
-//using FlatHashMap = FlatHashMapImpl<KeyT, ValueT, HashT, EqT>;
+//using FlatHashMap = FlatHashTable<MapNode<KeyT, ValueT>, HashT, EqT>;
 //using FlatHashMap = FlatHashMapChunks<KeyT, ValueT, HashT, EqT>;
 using FlatHashMap = std::unordered_map<KeyT, ValueT, HashT, EqT>;
 
 template <class KeyT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
-//using FlatHashSet = FlatHashSetImpl<KeyT, HashT, EqT>;
+//using FlatHashSet = FlatHashTable<SetNode<KeyT>, HashT, EqT>;
 //using FlatHashSet = FlatHashSetChunks<KeyT, HashT, EqT>;
 using FlatHashSet = std::unordered_set<KeyT, HashT, EqT>;
 
diff --git a/tdutils/td/utils/FlatHashMapLinear.h b/tdutils/td/utils/FlatHashTable.h
similarity index 97%
rename from tdutils/td/utils/FlatHashMapLinear.h
rename to tdutils/td/utils/FlatHashTable.h
index 0e0fae8cc..2aaae21a4 100644
--- a/tdutils/td/utils/FlatHashMapLinear.h
+++ b/tdutils/td/utils/FlatHashTable.h
@@ -503,10 +503,4 @@ class FlatHashTable {
   }
 };
 
-template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
-using FlatHashMapImpl = FlatHashTable<MapNode<KeyT, ValueT>, HashT, EqT>;
-
-template <class KeyT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
-using FlatHashSetImpl = FlatHashTable<SetNode<KeyT>, HashT, EqT>;
-
 }  // namespace td
diff --git a/tdutils/test/HashSet.cpp b/tdutils/test/HashSet.cpp
index 06859946e..aa3a28ed5 100644
--- a/tdutils/test/HashSet.cpp
+++ b/tdutils/test/HashSet.cpp
@@ -8,7 +8,6 @@
 #include "td/utils/common.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FlatHashMapChunks.h"
-#include "td/utils/FlatHashMapLinear.h"
 #include "td/utils/logging.h"
 #include "td/utils/Random.h"
 #include "td/utils/Slice.h"
diff --git a/tdutils/test/hashset_benchmark.cpp b/tdutils/test/hashset_benchmark.cpp
index 41e83d7a2..d0eb20e2e 100644
--- a/tdutils/test/hashset_benchmark.cpp
+++ b/tdutils/test/hashset_benchmark.cpp
@@ -8,10 +8,11 @@
 #include "td/utils/common.h"
 #include "td/utils/FlatHashMap.h"
 #include "td/utils/FlatHashMapChunks.h"
-#include "td/utils/FlatHashMapLinear.h"
+#include "td/utils/FlatHashTable.h"
 #include "td/utils/format.h"
 #include "td/utils/Hash.h"
 #include "td/utils/logging.h"
+#include "td/utils/MapNode.h"
 #include "td/utils/Random.h"
 #include "td/utils/Slice.h"
 #include "td/utils/Span.h"
@@ -27,6 +28,7 @@
 #include <algorithm>
 #include <benchmark/benchmark.h>
 #include <folly/container/F14Map.h>
+#include <functional>
 #include <map>
 #include <random>
 #include <unordered_map>
@@ -558,8 +560,11 @@ BENCHMARK_TEMPLATE(BM_mask, td::MaskNeon);
 BENCHMARK_TEMPLATE(BM_mask, td::MaskSse2);
 #endif
 
+template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>>
+using FlatHashMapImpl = td::FlatHashTable<td::MapNode<KeyT, ValueT>, HashT, EqT>;
+
 #define FOR_EACH_TABLE(F)  \
-  F(td::FlatHashMapImpl)   \
+  F(FlatHashMapImpl)       \
   F(td::FlatHashMapChunks) \
   F(folly::F14FastMap)     \
   F(absl::flat_hash_map)   \