diff options
author | gilazhev <gilazhev@yandex-team.ru> | 2022-02-10 16:51:44 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:51:44 +0300 |
commit | 35d70ae7f13aa7c0440e36075f3e3fbeb7d14869 (patch) | |
tree | ab7fbbf3253d4c0e2793218f09378908beb025fb | |
parent | 92cfb4675218679cfbf49d8b80c9caab32897902 (diff) | |
download | ydb-35d70ae7f13aa7c0440e36075f3e3fbeb7d14869.tar.gz |
Restoring authorship annotation for <gilazhev@yandex-team.ru>. Commit 2 of 2.
-rw-r--r-- | util/ysaveload.h | 24 | ||||
-rw-r--r-- | util/ysaveload_ut.cpp | 46 |
2 files changed, 35 insertions, 35 deletions
diff --git a/util/ysaveload.h b/util/ysaveload.h index 0d2862b821..02efb4049b 100644 --- a/util/ysaveload.h +++ b/util/ysaveload.h @@ -515,19 +515,19 @@ public: } }; -template <class T1, class T2, class T3, class T4, class T5, class TValue> +template <class T1, class T2, class T3, class T4, class T5, class TValue> class TSetSerializerInserter<THashMultiMap<T1, T2, T3, T4, T5>, TValue, false>: public TSetSerializerInserterBase<THashMultiMap<T1, T2, T3, T4, T5>, TValue> { using TMapType = THashMultiMap<T1, T2, T3, T4, T5>; using TBase = TSetSerializerInserterBase<TMapType, TValue>; - -public: + +public: inline TSetSerializerInserter(TMapType& m, size_t cnt) - : TBase(m) - { - m.reserve(cnt); - } -}; - + : TBase(m) + { + m.reserve(cnt); + } +}; + template <class T1, class T2, class T3, class T4, class TValue> class TSetSerializerInserter<THashSet<T1, T2, T3, T4>, TValue, false>: public TSetSerializerInserterBase<THashSet<T1, T2, T3, T4>, TValue> { using TSetType = THashSet<T1, T2, T3, T4>; @@ -601,10 +601,10 @@ template <class T1, class T2, class T3, class T4, class T5> class TSerializer<THashMap<T1, T2, T3, T4, T5>>: public TMapSerializer<THashMap<T1, T2, T3, T4, T5>, false> { }; -template <class T1, class T2, class T3, class T4, class T5> +template <class T1, class T2, class T3, class T4, class T5> class TSerializer<THashMultiMap<T1, T2, T3, T4, T5>>: public TMapSerializer<THashMultiMap<T1, T2, T3, T4, T5>, false> { -}; - +}; + template <class K, class C, class A> class TSerializer<TSet<K, C, A>>: public TSetSerializer<TSet<K, C, A>, true> { }; diff --git a/util/ysaveload_ut.cpp b/util/ysaveload_ut.cpp index 9bb11fb1ad..723c68f391 100644 --- a/util/ysaveload_ut.cpp +++ b/util/ysaveload_ut.cpp @@ -210,16 +210,16 @@ private: Save(&S_, h); } - { + { THashMultiMap<TString, int> mm; - - mm.insert({"one", 1}); - mm.insert({"two", 2}); - mm.insert({"two", 22}); - - Save(&S_, mm); - } - + + mm.insert({"one", 1}); + mm.insert({"two", 2}); + mm.insert({"two", 22}); + + Save(&S_, mm); + } + //load part { ui8 val; @@ -359,21 +359,21 @@ private: Load(&S_, h); UNIT_ASSERT(!h); } - - { + + { THashMultiMap<TString, int> mm; - - Load(&S_, mm); - - UNIT_ASSERT_EQUAL(mm.size(), 3); - UNIT_ASSERT_EQUAL(mm.count("one"), 1); - auto oneIter = mm.equal_range("one").first; - UNIT_ASSERT_EQUAL(oneIter->second, 1); - UNIT_ASSERT_EQUAL(mm.count("two"), 2); - auto twoIter = mm.equal_range("two").first; - UNIT_ASSERT_EQUAL(twoIter->second, 2); - UNIT_ASSERT_EQUAL((++twoIter)->second, 22); - } + + Load(&S_, mm); + + UNIT_ASSERT_EQUAL(mm.size(), 3); + UNIT_ASSERT_EQUAL(mm.count("one"), 1); + auto oneIter = mm.equal_range("one").first; + UNIT_ASSERT_EQUAL(oneIter->second, 1); + UNIT_ASSERT_EQUAL(mm.count("two"), 2); + auto twoIter = mm.equal_range("two").first; + UNIT_ASSERT_EQUAL(twoIter->second, 2); + UNIT_ASSERT_EQUAL((++twoIter)->second, 22); + } } void TestList() { |