tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move FlatHashTable implementation to FlatHashTable.h.

Browse Source
This commit is contained in:
levlam 2022-03-09 18:03:56 +03:00
parent 15520c5ddd
commit 07bb129653
7 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/hashmap_build.cpp
View File

@ -5,8 +5,6 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
// //
#include "td/utils/FlatHashMap.h" #include "td/utils/FlatHashMap.h"
#include "td/utils/FlatHashMapChunks.h"
#include "td/utils/FlatHashMapLinear.h"
#ifdef SCOPE_EXIT #ifdef SCOPE_EXIT
#undef SCOPE_EXIT #undef SCOPE_EXIT

8
benchmark/hashset_memory.cpp
View File

@ -11,7 +11,7 @@
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/FlatHashMap.h" #include "td/utils/FlatHashMap.h"
#include "td/utils/FlatHashMapChunks.h" #include "td/utils/FlatHashMapChunks.h"
#include "td/utils/FlatHashMapLinear.h" #include "td/utils/FlatHashTable.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/misc.h" #include "td/utils/misc.h"
#include "td/utils/port/Stat.h" #include "td/utils/port/Stat.h"
@ -25,6 +25,7 @@
#include <absl/container/flat_hash_map.h> #include <absl/container/flat_hash_map.h>
#include <array> #include <array>
#include <folly/container/F14Map.h> #include <folly/container/F14Map.h>
#include <functional>
#include <map> #include <map>
#include <unordered_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) \ #define FOR_EACH_TABLE(F) \
F(td::FlatHashMapImpl) \ F(FlatHashMapImpl) \
F(folly::F14FastMap) \ F(folly::F14FastMap) \
F(absl::flat_hash_map) \ F(absl::flat_hash_map) \
F(std::unordered_map) \ F(std::unordered_map) \

2
tdutils/CMakeLists.txt
View File

@ -207,7 +207,7 @@ set(TDUTILS_SOURCE
td/utils/find_boundary.h td/utils/find_boundary.h
td/utils/FlatHashMap.h td/utils/FlatHashMap.h
td/utils/FlatHashMapChunks.h td/utils/FlatHashMapChunks.h
td/utils/FlatHashMapLinear.h td/utils/FlatHashTable.h
td/utils/FloodControlFast.h td/utils/FloodControlFast.h
td/utils/FloodControlStrict.h td/utils/FloodControlStrict.h
td/utils/format.h td/utils/format.h

8
tdutils/td/utils/FlatHashMap.h
View File

@ -7,7 +7,9 @@
#pragma once #pragma once
//#include "td/utils/FlatHashMapChunks.h" //#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 <functional>
#include <unordered_map> #include <unordered_map>
@ -16,12 +18,12 @@
namespace td { namespace td {
template <class KeyT, class ValueT, class HashT = std::hash<KeyT>, class EqT = std::equal_to<KeyT>> 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 = FlatHashMapChunks<KeyT, ValueT, HashT, EqT>;
using FlatHashMap = std::unordered_map<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>> 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 = FlatHashSetChunks<KeyT, HashT, EqT>;
using FlatHashSet = std::unordered_set<KeyT, HashT, EqT>; using FlatHashSet = std::unordered_set<KeyT, HashT, EqT>;

6
tdutils/td/utils/FlatHashMapLinear.h → tdutils/td/utils/FlatHashTable.h
View File

@ -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 } // namespace td

1
tdutils/test/HashSet.cpp
View File

@ -8,7 +8,6 @@
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/FlatHashMap.h" #include "td/utils/FlatHashMap.h"
#include "td/utils/FlatHashMapChunks.h" #include "td/utils/FlatHashMapChunks.h"
#include "td/utils/FlatHashMapLinear.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/Random.h" #include "td/utils/Random.h"
#include "td/utils/Slice.h" #include "td/utils/Slice.h"

9
tdutils/test/hashset_benchmark.cpp
View File

@ -8,10 +8,11 @@
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/FlatHashMap.h" #include "td/utils/FlatHashMap.h"
#include "td/utils/FlatHashMapChunks.h" #include "td/utils/FlatHashMapChunks.h"
#include "td/utils/FlatHashMapLinear.h" #include "td/utils/FlatHashTable.h"
#include "td/utils/format.h" #include "td/utils/format.h"
#include "td/utils/Hash.h" #include "td/utils/Hash.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/MapNode.h"
#include "td/utils/Random.h" #include "td/utils/Random.h"
#include "td/utils/Slice.h" #include "td/utils/Slice.h"
#include "td/utils/Span.h" #include "td/utils/Span.h"
@ -27,6 +28,7 @@
#include <algorithm> #include <algorithm>
#include <benchmark/benchmark.h> #include <benchmark/benchmark.h>
#include <folly/container/F14Map.h> #include <folly/container/F14Map.h>
#include <functional>
#include <map> #include <map>
#include <random> #include <random>
#include <unordered_map> #include <unordered_map>
@ -558,8 +560,11 @@ BENCHMARK_TEMPLATE(BM_mask, td::MaskNeon);
BENCHMARK_TEMPLATE(BM_mask, td::MaskSse2); BENCHMARK_TEMPLATE(BM_mask, td::MaskSse2);
#endif #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) \ #define FOR_EACH_TABLE(F) \
F(td::FlatHashMapImpl) \ F(FlatHashMapImpl) \
F(td::FlatHashMapChunks) \ F(td::FlatHashMapChunks) \
F(folly::F14FastMap) \ F(folly::F14FastMap) \
F(absl::flat_hash_map) \ F(absl::flat_hash_map) \