Skip to content

Commit

Permalink
fix: panic in ordered_map Key() (#721)
Browse files Browse the repository at this point in the history
* fix: panic in ordered_map Key()

* test: improve ordered map
  • Loading branch information
lklimek authored Dec 20, 2023
1 parent 71e32bd commit 548add8
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 4 deletions.
11 changes: 7 additions & 4 deletions libs/ds/ordered_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,15 @@ func (m *OrderedMap[T, V]) Delete(key T) {
if !ok {
return
}
i++
for ; i < len(m.values); i++ {
m.values[i-1] = m.values[i]
}
delete(m.keys, key)

m.values = append(m.values[:i], m.values[i+1:]...)
m.len--
for k, v := range m.keys {
if v > i {
m.keys[k] = v - 1
}
}
}

// Values returns all values in the map
Expand Down
23 changes: 23 additions & 0 deletions libs/ds/ordered_map_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"sync"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -59,3 +60,25 @@ func TestOrderedMapMultithread(t *testing.T) {

wg.Wait()
}

func TestOrderedMapDelete(t *testing.T) {
m := NewOrderedMap[int, int]()
m.Put(1, 1)
m.Put(2, 2)
m.Put(3, 3)
m.Delete(2)
keys := m.Keys()
if len(keys) != 2 {
t.Errorf("Expected 2 keys, got %d", len(keys))
}
if keys[0] != 1 && keys[1] != 3 {
t.Errorf("Expected keys [1, 3], got %v", keys)
}
v1, ok := m.Get(1)
assert.Equal(t, v1, 1)
assert.True(t, ok)

v3, ok := m.Get(3)
assert.Equal(t, v3, 3)
assert.True(t, ok)
}

0 comments on commit 548add8

Please sign in to comment.