feat: remove minimum-load option, hard-coded to 5%
This commit is contained in:
@@ -3,7 +3,6 @@ package cuckoo_test
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"maps"
|
"maps"
|
||||||
"math"
|
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@@ -30,7 +29,6 @@ type fuzzStep struct {
|
|||||||
type fuzzScenario struct {
|
type fuzzScenario struct {
|
||||||
seedA, seedB uint32
|
seedA, seedB uint32
|
||||||
capacity, growthFactor uint8
|
capacity, growthFactor uint8
|
||||||
load float64
|
|
||||||
steps []fuzzStep
|
steps []fuzzStep
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,7 +46,6 @@ func FuzzInsertLookup(f *testing.F) {
|
|||||||
seedA, seedB := scenario.seedA, scenario.seedB
|
seedA, seedB := scenario.seedA, scenario.seedB
|
||||||
growthFactor := max(2, int(scenario.growthFactor))
|
growthFactor := max(2, int(scenario.growthFactor))
|
||||||
capacity := int(scenario.capacity)
|
capacity := int(scenario.capacity)
|
||||||
minimumLoad := math.Abs(math.Mod(scenario.load, 1.0))
|
|
||||||
|
|
||||||
// If they are the same number, the hashes will clash, always causing an
|
// If they are the same number, the hashes will clash, always causing an
|
||||||
// error.
|
// error.
|
||||||
@@ -56,14 +53,8 @@ func FuzzInsertLookup(f *testing.F) {
|
|||||||
t.Skip()
|
t.Skip()
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the load is too high, the hashs will not be able to allocate
|
fmt.Fprintf(os.Stderr, "seedA=%d seedB=%d capacity=%d growthFactor=%d\n",
|
||||||
// properly.
|
seedA, seedB, capacity, growthFactor)
|
||||||
if minimumLoad > 0.20 {
|
|
||||||
t.Skip()
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Fprintf(os.Stderr, "seedA=%d seedB=%d capacity=%d growthFactor=%d minimumLoad=%f\n",
|
|
||||||
seedA, seedB, capacity, growthFactor, minimumLoad)
|
|
||||||
|
|
||||||
actual := cuckoo.NewCustomTable[uint32, uint32](
|
actual := cuckoo.NewCustomTable[uint32, uint32](
|
||||||
offsetHash(seedA),
|
offsetHash(seedA),
|
||||||
@@ -71,7 +62,6 @@ func FuzzInsertLookup(f *testing.F) {
|
|||||||
func(a, b uint32) bool { return a == b },
|
func(a, b uint32) bool { return a == b },
|
||||||
cuckoo.Capacity(capacity),
|
cuckoo.Capacity(capacity),
|
||||||
cuckoo.GrowthFactor(growthFactor),
|
cuckoo.GrowthFactor(growthFactor),
|
||||||
cuckoo.MinimumLoad(minimumLoad),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
expected := map[uint32]uint32{}
|
expected := map[uint32]uint32{}
|
||||||
|
|||||||
18
settings.go
18
settings.go
@@ -12,11 +12,12 @@ const DefaultCapacity uint64 = 16
|
|||||||
// hash table implementations use 2.
|
// hash table implementations use 2.
|
||||||
const DefaultGrowthFactor uint64 = 2
|
const DefaultGrowthFactor uint64 = 2
|
||||||
|
|
||||||
// DefaultMinimumLoad is the default lowest acceptable occupancy of a [Table].
|
// MinimumLoad is the default lowest acceptable occupancy of a [Table]. The
|
||||||
|
// higher the minimum load, the more likely that a [Table.Put] will not succeed.
|
||||||
// The value of 5% is taken from [libcuckoo].
|
// The value of 5% is taken from [libcuckoo].
|
||||||
//
|
//
|
||||||
// [libcuckoo]: https://github.com/efficient/libcuckoo/blob/656714705a055df2b7a605eb3c71586d9da1e119/libcuckoo/cuckoohash_config.hh#L21
|
// [libcuckoo]: https://github.com/efficient/libcuckoo/blob/656714705a055df2b7a605eb3c71586d9da1e119/libcuckoo/cuckoohash_config.hh#L21
|
||||||
const DefaultMinimumLoad float64 = 0.05
|
const MinimumLoad float64 = 0.05
|
||||||
|
|
||||||
type settings struct {
|
type settings struct {
|
||||||
growthFactor uint64
|
growthFactor uint64
|
||||||
@@ -38,19 +39,6 @@ func Capacity(value int) Option {
|
|||||||
return func(s *settings) { s.bucketSize = uint64(value) }
|
return func(s *settings) { s.bucketSize = uint64(value) }
|
||||||
}
|
}
|
||||||
|
|
||||||
// MinimumLoad modifies the [DefaultMinimumLoad] of the [Table]. The value must
|
|
||||||
// be between 0.00 and 1.00.
|
|
||||||
//
|
|
||||||
// The higher the minimum load, the more likely that a [Table.Put] will not
|
|
||||||
// succeed. Minimum loads above 20% are not tested.
|
|
||||||
func MinimumLoad(value float64) Option {
|
|
||||||
if value < 0.00 || value > 1.00 {
|
|
||||||
panic(fmt.Sprintf("go-cuckoo: MinimumLoad must be between 0.00 and 1.00, got %f", value))
|
|
||||||
}
|
|
||||||
|
|
||||||
return func(s *settings) { s.minLoadFactor = value }
|
|
||||||
}
|
|
||||||
|
|
||||||
// GrowthFactor controls how much the capacity of the [Table] multiplies when
|
// GrowthFactor controls how much the capacity of the [Table] multiplies when
|
||||||
// it must resize. The value must be greater than 1.
|
// it must resize. The value must be greater than 1.
|
||||||
func GrowthFactor(value int) Option {
|
func GrowthFactor(value int) Option {
|
||||||
|
|||||||
2
table.go
2
table.go
@@ -198,7 +198,7 @@ func NewCustomTable[K, V any](hashA, hashB Hash[K], compare EqualFunc[K], option
|
|||||||
settings := &settings{
|
settings := &settings{
|
||||||
growthFactor: DefaultGrowthFactor,
|
growthFactor: DefaultGrowthFactor,
|
||||||
bucketSize: DefaultCapacity,
|
bucketSize: DefaultCapacity,
|
||||||
minLoadFactor: DefaultMinimumLoad,
|
minLoadFactor: MinimumLoad,
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, option := range options {
|
for _, option := range options {
|
||||||
|
|||||||
Reference in New Issue
Block a user