59 Replace THashSet to std::unordered_set (#96)

Author: SvRgK11010

client/ydb_persqueue_core/ut/read_session_ut.cpp

@@ -1320,8 +1320,8 @@ Y_UNIT_TEST_SUITE(ReadSessionImplTest) {
         std::cerr << "Compressed message data size: " << compressedMessageData.size() << std::endl;
         ui64 offset = 1;
         ui64 seqNo = 42;
-        THashSet<ui64> committedCookies;
-        THashSet<ui64> committedOffsets;
+        std::unordered_set<ui64> committedCookies;
+        std::unordered_set<ui64> committedOffsets;
         EXPECT_CALL(*setup.MockProcessor, OnCommitRequest(_))
             .WillRepeatedly(Invoke([&committedCookies, &committedOffsets](const Ydb::PersQueue::V1::MigrationStreamingReadClientMessage::Commit& req) {
                 for (const auto& commit : req.cookies()) {

client/ydb_persqueue_core/ut/ut_utils/test_server.h

@@ -136,7 +136,7 @@ class TTestServer {
 
         if (killPq)
         {
-            THashSet<ui64> restartedTablets;
+            std::unordered_set<ui64> restartedTablets;
             for (const auto& p : persQueueGroup.GetPartitions())
                 if (restartedTablets.insert(p.GetTabletId()).second)
                 {

client/ydb_persqueue_core/ut/ut_utils/ut_utils.cpp

@@ -3,7 +3,7 @@
 namespace NYdb::NPersQueue::NTests {
 
 void WaitMessagesAcked(std::shared_ptr<IWriteSession> writer, ui64 startSeqNo, ui64 endSeqNo) {
-    THashSet<ui64> ackedSeqNo;
+    std::unordered_set<ui64> ackedSeqNo;
     while (ackedSeqNo.size() < endSeqNo - startSeqNo + 1) {
         auto event = *writer->GetEvent(true);
         if (std::holds_alternative<TWriteSessionEvent::TReadyToAcceptEvent>(event)) {

library/cpp/cache/cache.h

@@ -3,9 +3,9 @@
 #include <util/generic/algorithm.h>
 #include <util/generic/ptr.h>
 #include <util/generic/intrlist.h>
-#include <util/generic/hash_set.h>
 #include <util/generic/yexception.h>
 #include <utility>
+#include <unordered_set>
 
 template <class TValue>
 struct TUniformSizeProvider {
@@ -67,6 +67,7 @@ class TLRUList {
         TValue Value;
 
         struct THash {
+            using is_transparent = void;
             size_t operator()(const TItem& item) const {
                 return ::THash<TKey>()(item.Key);
             }
@@ -76,6 +77,7 @@ class TLRUList {
         };
 
         struct TEqualTo {
+            using is_transparent = void;
             bool operator()(const TItem& lhs, const TItem& rhs) const {
                 return lhs.Key == rhs.Key;
             }
@@ -203,6 +205,7 @@ class TLFUList {
         size_t Counter;
 
         struct THash {
+            using is_transparent = void;
             size_t operator()(const TItem& item) const {
                 return ::THash<TKey>()(item.Key);
             }
@@ -212,6 +215,7 @@ class TLFUList {
         };
 
         struct TEqualTo {
+            using is_transparent = void;
             bool operator()(const TItem& lhs, const TItem& rhs) const {
                 return lhs.Key == rhs.Key;
             }
@@ -333,6 +337,7 @@ class TLWList {
         TWeight Weight;
 
         struct THash {
+            using is_transparent = void;
             size_t operator()(const TItem& item) const {
                 return ::THash<TKey>()(item.Key);
             }
@@ -341,7 +346,8 @@ class TLWList {
             }
         };
 
-        struct TEqualTo {
+        struct TEqualTo {    
+            using is_transparent = void;       
             bool operator()(const TItem& lhs, const TItem& rhs) const {
                 return lhs.Key == rhs.Key;
             }
@@ -446,17 +452,17 @@ class TLWList {
 
 private:
     std::vector<TItem*> Heap;
-    THashSet<TItem*> Removed;
+    std::unordered_set<TItem*> Removed;
 
     size_t Size;
     size_t MaxSize;
 };
 
-template <typename TKey, typename TValue, typename TListType, typename TDeleter, typename TAllocator = std::allocator<void>>
+template <typename TKey, typename TValue, typename TListType, typename TDeleter, typename TAllocator = std::allocator<typename TListType::TItem>>
 class TCache {
     typedef typename TListType::TItem TItem;
     typedef typename TItem::THash THash;
-    typedef THashMultiSet<TItem, THash, typename TItem::TEqualTo, TAllocator> TIndex;
+    typedef std::unordered_multiset<TItem, THash, typename TItem::TEqualTo, TAllocator> TIndex;
     typedef typename TIndex::iterator TIndexIterator;
     typedef typename TIndex::const_iterator TIndexConstIterator;
 
@@ -657,7 +663,7 @@ class TCache {
         Index.reserve(hint);
     }
 
-    typedef typename TIndex::node_allocator_type TNodeAllocatorType;
+    typedef typename std::allocator_traits<typename TIndex::allocator_type>::template rebind_alloc<typename TIndex::value_type> TNodeAllocatorType;
     TNodeAllocatorType& GetNodeAllocator() {
         return Index.GetNodeAllocator();
     }
@@ -691,7 +697,7 @@ struct TNoopDelete {
     }
 };
 
-template <typename TKey, typename TValue, typename TDeleter = TNoopDelete, class TSizeProvider = TUniformSizeProvider<TValue>, typename TAllocator = std::allocator<void>>
+template <typename TKey, typename TValue, typename TDeleter = TNoopDelete, class TSizeProvider = TUniformSizeProvider<TValue>, typename TAllocator = std::allocator<typename TLRUList<TKey, TValue, TSizeProvider>::TItem>>
 class TLRUCache: public TCache<TKey, TValue, TLRUList<TKey, TValue, TSizeProvider>, TDeleter, TAllocator> {
     using TListType = TLRUList<TKey, TValue, TSizeProvider>;
     typedef TCache<TKey, TValue, TListType, TDeleter, TAllocator> TBase;

library/cpp/charset/codepage.cpp

@@ -9,12 +9,12 @@
 #include <util/generic/hash.h>
 #include <string>
 
-#include <util/generic/hash_set.h>
 #include <util/generic/singleton.h>
 #include <util/generic/yexception.h>
 #include <util/memory/pool.h>
 
 #include <cstring>
+#include <unordered_set>
 
 #include <ctype.h>
 
@@ -202,7 +202,7 @@ ECharset CharsetByNameOrDie(std::string_view name) {
 }
 
 namespace {
-    class THashSetType: public THashSet<std::string> {
+    class THashSetType: public std::unordered_set<std::string> {
     public:
         inline void Add(const std::string& s) {
             insert(s);

library/cpp/charset/wide_ut.cpp

@@ -6,9 +6,9 @@
 
 #include <util/charset/utf8.h>
 #include <util/digest/numeric.h>
-#include <util/generic/hash_set.h>
 
 #include <algorithm>
+#include <unordered_set>
 
 namespace {
     //! three UTF8 encoded russian letters (A, B, V)
@@ -346,7 +346,7 @@ void TConversionTest::TestRecode() {
         if (!SingleByteCodepage(enc))
             continue;
 
-        using THash = THashSet<char>;
+        using THash = std::unordered_set<char>;
         THash hash;
 
         for (int i = 0; i != 256; ++i) {

library/cpp/cppparser/parser.cpp

@@ -1,7 +1,7 @@
 #include <util/generic/hash.h>
 #include <util/string/cast.h>
-#include <util/generic/hash_set.h>
 #include <util/generic/yexception.h>
+#include <unordered_set>
 
 #include "parser.h"
 
@@ -558,7 +558,7 @@ void TCppSimpleSax::DoCode(const TText& text) {
 }
 
 class TCppFullSax::TImpl {
-    typedef THashSet<std::string> TKeyWords;
+    typedef std::unordered_set<std::string> TKeyWords;
 
     class TRegExp {
     public:

library/cpp/dbg_output/dump.h

@@ -7,8 +7,8 @@
 
 #include <util/stream/format.h>
 #include <util/system/type_name.h>
-#include <util/generic/hash_set.h>
 #include <utility>
+#include <unordered_set>
 
 /*
  * std::cout << DbgDump(any) << std::endl;
@@ -59,7 +59,7 @@ namespace NPrivate {
                 }
             }
 
-            THashSet<size_t> Visited;
+            std::unordered_set<size_t> Visited;
         };
     };
 

library/cpp/dbg_output/dumpers.h

@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 #include <string_view>
+#include <unordered_set>
 
 //smart pointers
 template <class T, class D>
@@ -139,11 +140,11 @@ struct TDumper<THashMultiMap<K, V, H, P, A>>: public TAssocDumper {
 };
 
 template <class T, class H, class P, class A>
-struct TDumper<THashSet<T, H, P, A>>: public TAssocDumper {
+struct TDumper<std::unordered_set<T, H, P, A>>: public TAssocDumper {
 };
 
 template <class T, class H, class P, class A>
-struct TDumper<THashMultiSet<T, H, P, A>>: public TAssocDumper {
+struct TDumper<std::unordered_multiset<T, H, P, A>>: public TAssocDumper {
 };
 
 //strings

library/cpp/getopt/small/completion_generator.cpp

@@ -246,7 +246,7 @@ namespace NLastGetopt {
     void TZshCompletionGenerator::GenerateOptCompletion(TFormattedOutput& out, const TOpts& opts, const TOpt& opt, NComp::TCompleterManager& manager) {
         auto& line = L;
 
-        THashSet<std::string> disableOptions;
+        std::unordered_set<std::string> disableOptions;
         if (opt.DisableCompletionForOptions_) {
             disableOptions.insert("-");
         } else {