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

Fix issue #31. When 'min_load_factor()' > 0, the 'clear()' method will also reset the 'bucket_count' of the hash table to 0.

Browse Source
This commit is contained in:
Tessil 2020-03-28 21:07:13 +00:00
parent 0e0df6c99a
commit cb6b7cf8c7
2 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/tsl/robin_hash.h
View File

@ -623,14 +623,7 @@ public:
m_min_load_factor(other.m_min_load_factor),
m_try_skrink_on_next_insert(other.m_try_skrink_on_next_insert)
{
other.GrowthPolicy::clear();
other.m_buckets_data.clear();
other.m_buckets = static_empty_bucket_ptr();
other.m_bucket_count = 0;
other.m_nb_elements = 0;
other.m_load_threshold = 0;
other.m_grow_on_next_insert = false;
other.m_try_skrink_on_next_insert = false;
other.clear_and_shrink();
}
robin_hash& operator=(const robin_hash& other) {
@ -725,12 +718,17 @@ public:
* Modifiers
*/
void clear() noexcept {
for(auto& bucket: m_buckets_data) {
bucket.clear();
if(m_min_load_factor > 0.0f) {
clear_and_shrink();
}
else {
for(auto& bucket: m_buckets_data) {
bucket.clear();
}
m_nb_elements = 0;
m_grow_on_next_insert = false;
}
m_nb_elements = 0;
m_grow_on_next_insert = false;
}
@ -1322,6 +1320,18 @@ private:
new_table.swap(*this);
}
// Same as rehash(0) but noexcept and faster.
void clear_and_shrink() noexcept {
GrowthPolicy::clear();
m_buckets_data.clear();
m_buckets = static_empty_bucket_ptr();
m_bucket_count = 0;
m_nb_elements = 0;
m_load_threshold = 0;
m_grow_on_next_insert = false;
m_try_skrink_on_next_insert = false;
}
void insert_value_on_rehash(std::size_t ibucket, distance_type dist_from_ideal_bucket,
truncated_hash_type hash, value_type&& value)
{

19
tests/robin_map_tests.cpp
View File

@ -646,6 +646,25 @@ BOOST_AUTO_TEST_CASE(test_clear) {
BOOST_CHECK(map == (HMap({{5, -5}, {1, -1}, {2, -1}, {4, -4}, {3, -3}})));
}
BOOST_AUTO_TEST_CASE(test_clear_with_min_load_factor) {
// insert x values, clear map, test insert
using HMap = tsl::robin_map<std::int64_t, std::int64_t>;
const std::size_t nb_values = 1000;
auto map = utils::get_filled_hash_map<HMap>(nb_values);
map.min_load_factor(0.1f);
map.clear();
BOOST_CHECK_EQUAL(map.bucket_count(), 0);
BOOST_CHECK_EQUAL(map.size(), 0);
BOOST_CHECK_EQUAL(std::distance(map.begin(), map.end()), 0);
map.insert({5, -5});
map.insert({{1, -1}, {2, -1}, {4, -4}, {3, -3}});
BOOST_CHECK(map == (HMap({{5, -5}, {1, -1}, {2, -1}, {4, -4}, {3, -3}})));
}
/**
* iterator.value()