FEX-Emu/robin-map
1
0
Fork 0
mirror of https://github.com/FEX-Emu/robin-map.git synced 2024-11-23 06:09:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix shrink when min_load_factor is set and a range erase with end() as last is called. The m_try_skrink_on_next_insert was not correctly set.

Browse Source
This commit is contained in:
Tessil 2020-04-17 19:49:36 +01:00
parent a3451bde49
commit 5c6b2e5c55
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/tsl/robin_hash.h
View File

@ -858,6 +858,7 @@ public:
} }
if(last_mutable == end()) { if(last_mutable == end()) {
m_try_skrink_on_next_insert = true;
return end(); return end();
} }

45
tests/robin_map_tests.cpp
View File

@ -521,6 +521,10 @@ BOOST_AUTO_TEST_CASE(test_min_load_factor_extreme_factors) {
} }
BOOST_AUTO_TEST_CASE(test_min_load_factor) { BOOST_AUTO_TEST_CASE(test_min_load_factor) {
// set min_load_factor to 0.15 and max_load_factor to 0.5.
// rehash to 100 buckets, insert 50 elements, erase until load_factor() < min_load_factor(),
// insert an element, check if map has shrinked.
const std::size_t nb_values = 50;
tsl::robin_map<std::int64_t, std::int64_t> map; tsl::robin_map<std::int64_t, std::int64_t> map;
map.min_load_factor(0.15f); map.min_load_factor(0.15f);
@ -530,15 +534,11 @@ BOOST_AUTO_TEST_CASE(test_min_load_factor) {
BOOST_CHECK_EQUAL(map.max_load_factor(), 0.5f); BOOST_CHECK_EQUAL(map.max_load_factor(), 0.5f);
map.rehash(100); map.rehash(nb_values*2);
for(std::size_t i = 0; i < map.bucket_count()/2; i++) { for(std::size_t i = 0; i < nb_values; i++) {
map.insert({utils::get_key<std::int64_t>(i), map.insert({utils::get_key<std::int64_t>(i), utils::get_value<std::int64_t>(i)});
utils::get_value<std::int64_t>(i)});
} }
BOOST_CHECK_GT(map.load_factor(), map.min_load_factor()); BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
// Can't use BOOST_CHECK_CLOSE with -fno-exceptions
BOOST_CHECK(std::abs(map.load_factor() - 0.5f) < 0.005f);
while(map.load_factor() >= map.min_load_factor()) { while(map.load_factor() >= map.min_load_factor()) {
@ -551,6 +551,37 @@ BOOST_AUTO_TEST_CASE(test_min_load_factor) {
BOOST_CHECK_GT(map.load_factor(), map.min_load_factor()); BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
} }
BOOST_AUTO_TEST_CASE(test_min_load_factor_range_erase) {
// set min_load_factor to 0.15 and max_load_factor to 0.5.
// rehash to 100 buckets, insert 50 elements, erase 40 with range erase, insert an element,
// check if map has shrinked.
const std::size_t nb_values = 50;
const std::size_t nb_values_erase = 40;
tsl::robin_map<std::int64_t, std::int64_t> map;
map.min_load_factor(0.15f);
BOOST_CHECK_EQUAL(map.min_load_factor(), 0.15f);
map.max_load_factor(0.5f);
BOOST_CHECK_EQUAL(map.max_load_factor(), 0.5f);
map.rehash(nb_values*2);
for(std::size_t i = 0; i < nb_values; i++) {
map.insert({utils::get_key<std::int64_t>(i), utils::get_value<std::int64_t>(i)});
}
BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
map.erase(std::next(map.begin(), nb_values - nb_values_erase) , map.end());
// Shrink is done on insert.
map.insert({utils::get_key<std::int64_t>(map.bucket_count()),
utils::get_value<std::int64_t>(map.bucket_count())});
BOOST_CHECK_GT(map.load_factor(), map.min_load_factor());
BOOST_CHECK_LT(map.bucket_count(), nb_values*2);
}
/** /**
* rehash * rehash
*/ */