aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxenoxeno <xeno@ydb.tech>2022-08-29 18:09:53 +0300
committerxenoxeno <xeno@ydb.tech>2022-08-29 18:09:53 +0300
commite75659c2d7b5d34972c0d6dfc73650e8819134fd (patch)
tree12a1ee6411daf804bd4d5b6ce23f60591a7eae73
parent0fb93996e01cac4e95120396cf60d638afe3724e (diff)
downloadydb-e75659c2d7b5d34972c0d6dfc73650e8819134fd.tar.gz
attempt to better fix user time of some tests
-rw-r--r--contrib/restricted/boost/spirit/include/boost/spirit/home/qi/directive/repeat.hpp1
-rw-r--r--contrib/restricted/boost/spirit/include/boost/spirit/home/support/nonterminal/expand_arg.hpp1
-rw-r--r--ydb/core/mind/hive/hive_impl_ut.cpp36
3 files changed, 26 insertions, 12 deletions
diff --git a/contrib/restricted/boost/spirit/include/boost/spirit/home/qi/directive/repeat.hpp b/contrib/restricted/boost/spirit/include/boost/spirit/home/qi/directive/repeat.hpp
index d9e334e812..cae27cc5f5 100644
--- a/contrib/restricted/boost/spirit/include/boost/spirit/home/qi/directive/repeat.hpp
+++ b/contrib/restricted/boost/spirit/include/boost/spirit/home/qi/directive/repeat.hpp
@@ -93,6 +93,7 @@ namespace boost { namespace spirit { namespace qi
// silence MSVC warning C4512: assignment operator could not be generated
BOOST_DELETED_FUNCTION(exact_iterator& operator= (exact_iterator const&));
+ exact_iterator(const exact_iterator&) = default;
};
template <typename T>
diff --git a/contrib/restricted/boost/spirit/include/boost/spirit/home/support/nonterminal/expand_arg.hpp b/contrib/restricted/boost/spirit/include/boost/spirit/home/support/nonterminal/expand_arg.hpp
index 6c9b2113d4..f3809f1dc8 100644
--- a/contrib/restricted/boost/spirit/include/boost/spirit/home/support/nonterminal/expand_arg.hpp
+++ b/contrib/restricted/boost/spirit/include/boost/spirit/home/support/nonterminal/expand_arg.hpp
@@ -80,6 +80,7 @@ namespace boost { namespace spirit { namespace detail
// silence MSVC warning C4512: assignment operator could not be generated
BOOST_DELETED_FUNCTION(expand_arg& operator= (expand_arg const&));
+ expand_arg(const expand_arg&) = default;
};
}}}
diff --git a/ydb/core/mind/hive/hive_impl_ut.cpp b/ydb/core/mind/hive/hive_impl_ut.cpp
index 9e6ff996ff..a664f4bdce 100644
--- a/ydb/core/mind/hive/hive_impl_ut.cpp
+++ b/ydb/core/mind/hive/hive_impl_ut.cpp
@@ -1,6 +1,7 @@
#include <library/cpp/testing/unittest/registar.h>
#include <library/cpp/testing/unittest/tests_data.h>
#include <util/stream/null.h>
+#include <util/datetime/cputimer.h>
#include "hive_impl.h"
#include "balancer.h"
@@ -32,7 +33,7 @@ Y_UNIT_TEST_SUITE(THiveImplTest) {
hiveStorage->TabletType = TTabletTypes::Hive;
THive hive(hiveStorage.Get(), TActorId());
std::unordered_map<ui64, TLeaderTabletInfo> tablets;
- THPTimer timer;
+ TProfileTimer timer;
for (ui64 i = 0; i < NUM_TABLETS; ++i) {
TLeaderTabletInfo& tablet = tablets.emplace(std::piecewise_construct, std::tuple<TTabletId>(i), std::tuple<TTabletId, THive&>(i, hive)).first->second;
@@ -40,12 +41,15 @@ Y_UNIT_TEST_SUITE(THiveImplTest) {
bootQueue.AddToBootQueue(tablet);
}
- double passed = timer.Passed();
+ double passed = timer.Get().SecondsFloat();
Ctest << "Create = " << passed << Endl;
#ifndef SANITIZER_TYPE
- UNIT_ASSERT(passed < 5);
+#ifndef NDEBUG
+ UNIT_ASSERT(passed < 3);
+#else
+ UNIT_ASSERT(passed < 1);
+#endif
#endif
-
timer.Reset();
double maxP = 100;
@@ -60,13 +64,13 @@ Y_UNIT_TEST_SUITE(THiveImplTest) {
}
}
- passed = timer.Passed();
+ passed = timer.Get().SecondsFloat();
Ctest << "Process = " << passed << Endl;
#ifndef SANITIZER_TYPE
#ifndef NDEBUG
UNIT_ASSERT(passed < 10);
#else
- UNIT_ASSERT(passed < 2);
+ UNIT_ASSERT(passed < 1);
#endif
#endif
@@ -74,15 +78,19 @@ Y_UNIT_TEST_SUITE(THiveImplTest) {
bootQueue.MoveFromWaitQueueToBootQueue();
- passed = timer.Passed();
+ passed = timer.Get().SecondsFloat();
Ctest << "Move = " << passed << Endl;
#ifndef SANITIZER_TYPE
- UNIT_ASSERT(passed < 0.5);
+#ifndef NDEBUG
+ UNIT_ASSERT(passed < 2);
+#else
+ UNIT_ASSERT(passed < 0.1);
+#endif
#endif
}
Y_UNIT_TEST(BalancerSpeedAndDistribution) {
- static constexpr ui64 NUM_TABLETS = 100000;
+ static constexpr ui64 NUM_TABLETS = 1000000;
static constexpr ui64 NUM_BUCKETS = 16;
auto CheckSpeedAndDistribution = [](
@@ -94,15 +102,19 @@ Y_UNIT_TEST_SUITE(THiveImplTest) {
tablets.emplace_back(&tab);
}
- THPTimer timer;
+ TProfileTimer timer;
func(tablets);
- double passed = timer.Passed();
+ double passed = timer.Get().SecondsFloat();
Ctest << "Time=" << passed << Endl;
#ifndef SANITIZER_TYPE
- UNIT_ASSERT(passed < 0.2);
+#ifndef NDEBUG
+ UNIT_ASSERT(passed < 1);
+#else
+ UNIT_ASSERT(passed < 0.4);
+#endif
#endif
std::vector<double> buckets(NUM_BUCKETS, 0);
size_t revs = 0;