Skip to content

Commit 0f37a8d

Browse files
committed
migrate to stdlib
1 parent c963aaf commit 0f37a8d

5 files changed

Lines changed: 9 additions & 11 deletions

File tree

compact/deletes_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package compact
22

33
import (
44
"context"
5+
"slices"
56
"testing"
67
"time"
78

89
"github.com/klev-dev/klevdb"
910
"github.com/klev-dev/klevdb/message"
1011
"github.com/stretchr/testify/require"
11-
"golang.org/x/exp/slices"
1212
)
1313

1414
func TestDeletes(t *testing.T) {

compact/updates_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package compact
22

33
import (
44
"context"
5+
"slices"
56
"testing"
67
"time"
78

89
"github.com/klev-dev/klevdb"
910
"github.com/klev-dev/klevdb/message"
1011
"github.com/stretchr/testify/require"
11-
"golang.org/x/exp/slices"
1212
)
1313

1414
func TestUpdates(t *testing.T) {

delete.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package klevdb
22

33
import (
44
"context"
5+
"maps"
56
"time"
6-
7-
"golang.org/x/exp/maps"
87
)
98

109
// DeleteMultiBackoff is call on each iteration of [DeleteMulti] to give applications

log.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package klevdb
33
import (
44
"errors"
55
"fmt"
6+
"maps"
67
"os"
78
"path/filepath"
9+
"slices"
810
"sync"
911
"time"
1012

1113
"github.com/gofrs/flock"
12-
"golang.org/x/exp/maps"
13-
"golang.org/x/exp/slices"
1414

1515
"github.com/klev-dev/klevdb/index"
1616
"github.com/klev-dev/klevdb/message"
@@ -423,7 +423,7 @@ func (l *log) Delete(offsets map[int64]struct{}) (map[int64]struct{}, int64, err
423423
}
424424

425425
func (l *log) findDeleteReader(offsets map[int64]struct{}) (*reader, error) {
426-
orderedOffsets := maps.Keys(offsets)
426+
orderedOffsets := slices.Collect(maps.Keys(offsets))
427427
slices.Sort(orderedOffsets)
428428
lowestOffset := orderedOffsets[0]
429429

segment/segment.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import (
44
"errors"
55
"fmt"
66
"io"
7+
"maps"
78
"os"
89
"path/filepath"
9-
10-
"golang.org/x/exp/maps"
11-
"golang.org/x/exp/slices"
10+
"slices"
1211

1312
"github.com/klev-dev/klevdb/index"
1413
"github.com/klev-dev/klevdb/message"
@@ -328,7 +327,7 @@ type RewriteSegment struct {
328327
}
329328

330329
func (r *RewriteSegment) GetNewSegment() Segment {
331-
orderedOffsets := maps.Keys(r.SurviveOffsets)
330+
orderedOffsets := slices.Collect(maps.Keys(r.SurviveOffsets))
332331
slices.Sort(orderedOffsets)
333332
lowestOffset := orderedOffsets[0]
334333
return New(r.Segment.Dir, lowestOffset)

0 commit comments

Comments
 (0)