mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 02:15:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(dash table): bucket count returns the number of buckets (#2359)

Browse source 
Signed-off-by: adi_holden <adi@dragonflydb.io>
This commit is contained in:
adiholden 2024-01-02 21:57:52 +02:00 • committed by GitHub
parent 4b2dd9e726
commit 8411ce71d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/dash.h
View file

@ -213,12 +213,12 @@ class DashTable : public detail::DashTableBase {
}
size_t bucket_count() const {
return unique_segments_ * SegmentType::capacity();
return unique_segments_ * SegmentType::kNumBuckets;
}
// Overall capacity of the table (including stash buckets).
size_t capacity() const {
return bucket_count();
return unique_segments_ * SegmentType::capacity();
}
double load_factor() const {
@ -721,7 +721,7 @@ void DashTable<_Key, _Value, Policy>::Erase(iterator it) {
template <typename _Key, typename _Value, typename Policy>
void DashTable<_Key, _Value, Policy>::Reserve(size_t size) {
if (size <= bucket_count())
if (size <= capacity())
return;
size_t sg_floor = (size - 1) / SegmentType::capacity();

8
src/core/dash_test.cc
View file

@ -465,7 +465,7 @@ TEST_F(DashTest, Custom) {
}
TEST_F(DashTest, Reserve) {
unsigned bc = dt_.bucket_count();
unsigned bc = dt_.capacity();
for (unsigned i = 0; i <= bc * 2; ++i) {
dt_.Reserve(i);
ASSERT_GE((1 << dt_.depth()) * Dash64::kSegCapacity, i);
@ -562,7 +562,7 @@ struct TestEvictionPolicy {
}
bool CanGrow(const Dash64& tbl) const {
return tbl.bucket_count() < max_capacity;
return tbl.capacity() < max_capacity;
}
void RecordSplit(Dash64::Segment_t*) {
@ -876,7 +876,7 @@ struct SimpleEvictPolicy {
static constexpr bool can_evict = true;
bool CanGrow(const U64Dash& tbl) {
return tbl.bucket_count() + U64Dash::kSegCapacity < max_capacity;
return tbl.capacity() + U64Dash::kSegCapacity < max_capacity;
}
void RecordSplit(U64Dash::Segment_t* segment) {
@ -921,7 +921,7 @@ struct ShiftRightPolicy {
static constexpr bool can_evict = true;
bool CanGrow(const U64Dash& tbl) {
return tbl.bucket_count() + U64Dash::kSegCapacity < max_capacity;
return tbl.capacity() + U64Dash::kSegCapacity < max_capacity;
}
void RecordSplit(U64Dash::Segment_t* segment) {