Compare commits
4 Commits
main
...
e2ba398a62
| Author | SHA1 | Date | |
|---|---|---|---|
|
e2ba398a62
|
|||
|
c1314f8a3c
|
|||
|
74ed81761c
|
|||
|
d4acdda95b
|
12
bucket.go
12
bucket.go
@@ -26,6 +26,18 @@ func (b bucket[K, V]) get(key K) (value V, found bool) {
|
|||||||
return slot.value, slot.occupied && b.compare(slot.key, key)
|
return slot.value, slot.occupied && b.compare(slot.key, key)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (b *bucket[K, V]) drop(key K) (occupied bool) {
|
||||||
|
slot := &b.slots[b.location(key)]
|
||||||
|
|
||||||
|
if slot.occupied && b.compare(slot.key, key) {
|
||||||
|
slot.occupied = false
|
||||||
|
b.size--
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func (b *bucket[K, V]) resize(capacity uint64) {
|
func (b *bucket[K, V]) resize(capacity uint64) {
|
||||||
b.slots = make([]slot[K, V], capacity)
|
b.slots = make([]slot[K, V], capacity)
|
||||||
b.capacity = capacity
|
b.capacity = capacity
|
||||||
|
|||||||
@@ -25,6 +25,6 @@ func TestLoad(t *testing.T) {
|
|||||||
for i := range 16 {
|
for i := range 16 {
|
||||||
err := table.Put(i, true)
|
err := table.Put(i, true)
|
||||||
assert.NoError(err)
|
assert.NoError(err)
|
||||||
assert.Equal(float64(table.Size())/float64(table.Capacity()), table.load())
|
assert.Equal(float64(table.Size())/float64(table.TotalCapacity()), table.load())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ func TestStartingCapacity(t *testing.T) {
|
|||||||
assert := assert.New(t)
|
assert := assert.New(t)
|
||||||
table := cuckoo.NewTable[int, bool](cuckoo.Capacity(64))
|
table := cuckoo.NewTable[int, bool](cuckoo.Capacity(64))
|
||||||
|
|
||||||
assert.Equal(uint64(128), table.Capacity())
|
assert.Equal(uint64(128), table.TotalCapacity())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestResizeCapacity(t *testing.T) {
|
func TestResizeCapacity(t *testing.T) {
|
||||||
@@ -74,12 +74,12 @@ func TestResizeCapacity(t *testing.T) {
|
|||||||
cuckoo.GrowthFactor(2),
|
cuckoo.GrowthFactor(2),
|
||||||
)
|
)
|
||||||
|
|
||||||
for table.Capacity() == 16 {
|
for table.TotalCapacity() == 16 {
|
||||||
err := table.Put(rand.Int(), true)
|
err := table.Put(rand.Int(), true)
|
||||||
assert.NoError(err)
|
assert.NoError(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
assert.Equal(uint64(32), table.Capacity())
|
assert.Equal(uint64(32), table.TotalCapacity())
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPutMany(t *testing.T) {
|
func TestPutMany(t *testing.T) {
|
||||||
@@ -128,3 +128,16 @@ func TestRemove(t *testing.T) {
|
|||||||
|
|
||||||
assert.True(table.Has(0))
|
assert.True(table.Has(0))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDropItem(t *testing.T) {
|
||||||
|
assert := assert.New(t)
|
||||||
|
key, value := 0, true
|
||||||
|
table := cuckoo.NewTable[int, bool]()
|
||||||
|
(table.Put(key, value))
|
||||||
|
|
||||||
|
err := table.Drop(key)
|
||||||
|
|
||||||
|
assert.NoError(err)
|
||||||
|
assert.Equal(0, table.Size())
|
||||||
|
assert.False(table.Has(key))
|
||||||
|
}
|
||||||
|
|||||||
31
table.go
31
table.go
@@ -16,9 +16,9 @@ type Table[K, V any] struct {
|
|||||||
minLoadFactor float64
|
minLoadFactor float64
|
||||||
}
|
}
|
||||||
|
|
||||||
// Capacity returns the number of slots allocated for the [Table]. To get the
|
// TotalCapacity returns the number of slots allocated for the [Table]. To get the
|
||||||
// number of slots filled, look at [Table.Size].
|
// number of slots filled, look at [Table.Size].
|
||||||
func (t Table[K, V]) Capacity() uint64 {
|
func (t Table[K, V]) TotalCapacity() uint64 {
|
||||||
return t.bucketA.capacity + t.bucketB.capacity
|
return t.bucketA.capacity + t.bucketB.capacity
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -32,21 +32,21 @@ func log2(n uint64) (m int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t Table[K, V]) maxEvictions() int {
|
func (t Table[K, V]) maxEvictions() int {
|
||||||
return 3 * log2(t.Capacity())
|
return 3 * log2(t.TotalCapacity())
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t Table[K, V]) load() float64 {
|
func (t Table[K, V]) load() float64 {
|
||||||
return float64(t.Size()) / float64(t.Capacity())
|
return float64(t.Size()) / float64(t.TotalCapacity())
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *Table[K, V]) resize() error {
|
func (t *Table[K, V]) resize(capacity uint64) error {
|
||||||
entries := make([]entry[K, V], 0, t.Size())
|
entries := make([]entry[K, V], 0, t.Size())
|
||||||
for k, v := range t.Entries() {
|
for k, v := range t.Entries() {
|
||||||
entries = append(entries, entry[K, V]{k, v})
|
entries = append(entries, entry[K, V]{k, v})
|
||||||
}
|
}
|
||||||
|
|
||||||
t.bucketA.resize(t.growthFactor * t.bucketA.capacity)
|
t.bucketA.resize(capacity)
|
||||||
t.bucketB.resize(t.growthFactor * t.bucketB.capacity)
|
t.bucketB.resize(capacity)
|
||||||
|
|
||||||
for _, entry := range entries {
|
for _, entry := range entries {
|
||||||
if err := t.Put(entry.key, entry.value); err != nil {
|
if err := t.Put(entry.key, entry.value); err != nil {
|
||||||
@@ -99,10 +99,10 @@ func (t *Table[K, V]) Put(key K, value V) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if t.load() < t.minLoadFactor {
|
if t.load() < t.minLoadFactor {
|
||||||
return fmt.Errorf("bad hash: resize on load %d/%d = %f", t.Size(), t.Capacity(), t.load())
|
return fmt.Errorf("bad hash: resize on load %d/%d = %f", t.Size(), t.TotalCapacity(), t.load())
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := t.resize(); err != nil {
|
if err := t.resize(t.growthFactor * t.bucketA.capacity); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,10 +111,15 @@ func (t *Table[K, V]) Put(key K, value V) (err error) {
|
|||||||
|
|
||||||
// Drop removes a value for a key in the table. Returns an error if its value
|
// Drop removes a value for a key in the table. Returns an error if its value
|
||||||
// cannot be removed.
|
// cannot be removed.
|
||||||
//
|
func (t *Table[K, V]) Drop(key K) (err error) {
|
||||||
// Deprecated: Do not use.
|
t.bucketA.drop(key)
|
||||||
func (t Table[K, V]) Drop(_ K) {
|
t.bucketB.drop(key)
|
||||||
panic("Not implemented")
|
|
||||||
|
if t.load() < t.minLoadFactor {
|
||||||
|
return t.resize(t.bucketA.capacity / t.growthFactor)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Entries returns an unordered sequence of all key-value pairs in the table.
|
// Entries returns an unordered sequence of all key-value pairs in the table.
|
||||||
|
|||||||
Reference in New Issue
Block a user