Skip to content

Commit c65a8ac

Browse files
mangalaman93mangalaman93
authored
chore: remove dependency on io/ioutil (#1879)
we still have a couple of places where we are using io/ioutil.
1 parent f30306f commit c65a8ac

21 files changed

+131
-140
lines changed

‎backup_test.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package badger
1919
import (
2020
"bytes"
2121
"fmt"
22-
"io/ioutil"
2322
"math/rand"
2423
"os"
2524
"path/filepath"
@@ -34,7 +33,7 @@ import (
3433
)
3534

3635
func TestBackupRestore1(t *testing.T) {
37-
dir, err := ioutil.TempDir("", "badger-test")
36+
dir, err := os.MkdirTemp("", "badger-test")
3837
require.NoError(t, err)
3938
defer removeDir(dir)
4039
db, err := Open(getTestOptions(dir))
@@ -72,10 +71,10 @@ func TestBackupRestore1(t *testing.T) {
7271
require.NoError(t, err)
7372

7473
// Use different directory.
75-
dir, err = ioutil.TempDir("", "badger-test")
74+
dir, err = os.MkdirTemp("", "badger-test")
7675
require.NoError(t, err)
7776
defer removeDir(dir)
78-
bak, err := ioutil.TempFile(dir, "badgerbak")
77+
bak, err := os.CreateTemp(dir, "badgerbak")
7978
require.NoError(t, err)
8079
_, err = db.Backup(bak, 0)
8180
require.NoError(t, err)
@@ -118,7 +117,7 @@ func TestBackupRestore1(t *testing.T) {
118117
}
119118

120119
func TestBackupRestore2(t *testing.T) {
121-
tmpdir, err := ioutil.TempDir("", "badger-test")
120+
tmpdir, err := os.MkdirTemp("", "badger-test")
122121
require.NoError(t, err)
123122

124123
defer removeDir(tmpdir)
@@ -306,7 +305,7 @@ func TestBackup(t *testing.T) {
306305
require.NoError(t, err)
307306
}
308307
t.Run("disk mode", func(t *testing.T) {
309-
tmpdir, err := ioutil.TempDir("", "badger-test")
308+
tmpdir, err := os.MkdirTemp("", "badger-test")
310309
require.NoError(t, err)
311310

312311
defer removeDir(tmpdir)
@@ -326,7 +325,7 @@ func TestBackup(t *testing.T) {
326325

327326
func TestBackupRestore3(t *testing.T) {
328327
var bb bytes.Buffer
329-
tmpdir, err := ioutil.TempDir("", "badger-test")
328+
tmpdir, err := os.MkdirTemp("", "badger-test")
330329
require.NoError(t, err)
331330

332331
defer removeDir(tmpdir)
@@ -387,7 +386,7 @@ func TestBackupRestore3(t *testing.T) {
387386
}
388387

389388
func TestBackupLoadIncremental(t *testing.T) {
390-
tmpdir, err := ioutil.TempDir("", "badger-test")
389+
tmpdir, err := os.MkdirTemp("", "badger-test")
391390
require.NoError(t, err)
392391

393392
defer removeDir(tmpdir)
@@ -507,7 +506,7 @@ func TestBackupLoadIncremental(t *testing.T) {
507506
}
508507

509508
func TestBackupBitClear(t *testing.T) {
510-
dir, err := ioutil.TempDir("", "badger-test")
509+
dir, err := os.MkdirTemp("", "badger-test")
511510
require.NoError(t, err)
512511
defer removeDir(dir)
513512

@@ -528,11 +527,11 @@ func TestBackupBitClear(t *testing.T) {
528527
require.NoError(t, err)
529528

530529
// Use different directory.
531-
dir, err = ioutil.TempDir("", "badger-test")
530+
dir, err = os.MkdirTemp("", "badger-test")
532531
require.NoError(t, err)
533532
defer removeDir(dir)
534533

535-
bak, err := ioutil.TempFile(dir, "badgerbak")
534+
bak, err := os.CreateTemp(dir, "badgerbak")
536535
require.NoError(t, err)
537536
_, err = db.Backup(bak, 0)
538537
require.NoError(t, err)

‎badger/cmd/bank.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"context"
2222
"errors"
2323
"fmt"
24-
"io/ioutil"
2524
"log"
2625
"math"
2726
"math/rand"
27+
"os"
2828
"strconv"
2929
"sync"
3030
"sync/atomic"
@@ -382,7 +382,7 @@ func runTest(cmd *cobra.Command, args []string) error {
382382
var tmpDb *badger.DB
383383
var subscribeDB *badger.DB
384384
if checkSubscriber {
385-
dir, err := ioutil.TempDir("", "bank_subscribe")
385+
dir, err := os.MkdirTemp("", "bank_subscribe")
386386
y.Check(err)
387387

388388
subscribeDB, err = badger.Open(badger.DefaultOptions(dir).WithSyncWrites(false))
@@ -393,7 +393,7 @@ func runTest(cmd *cobra.Command, args []string) error {
393393
}
394394

395395
if checkStream {
396-
dir, err := ioutil.TempDir("", "bank_stream")
396+
dir, err := os.MkdirTemp("", "bank_stream")
397397
y.Check(err)
398398

399399
tmpDb, err = badger.Open(badger.DefaultOptions(dir).WithSyncWrites(false))

‎badger/cmd/rotate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package cmd
1818

1919
import (
20-
"io/ioutil"
20+
"io"
2121
"os"
2222
"time"
2323

@@ -79,5 +79,5 @@ func getKey(path string) ([]byte, error) {
7979
if err != nil {
8080
return nil, err
8181
}
82-
return ioutil.ReadAll(fp)
82+
return io.ReadAll(fp)
8383
}

‎badger/cmd/rotate_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package cmd
1818

1919
import (
20-
"io/ioutil"
2120
"math/rand"
2221
"os"
2322
"testing"
@@ -29,7 +28,7 @@ import (
2928
)
3029

3130
func TestRotate(t *testing.T) {
32-
dir, err := ioutil.TempDir("", "badger-test")
31+
dir, err := os.MkdirTemp("", "badger-test")
3332
require.NoError(t, err)
3433
defer os.RemoveAll(dir)
3534

@@ -38,7 +37,7 @@ func TestRotate(t *testing.T) {
3837
_, err = rand.Read(key)
3938
require.NoError(t, err)
4039

41-
fp, err := ioutil.TempFile("", "*.key")
40+
fp, err := os.CreateTemp("", "*.key")
4241
require.NoError(t, err)
4342
_, err = fp.Write(key)
4443
require.NoError(t, err)
@@ -64,7 +63,7 @@ func TestRotate(t *testing.T) {
6463
key2 := make([]byte, 32)
6564
_, err = rand.Read(key2)
6665
require.NoError(t, err)
67-
fp2, err := ioutil.TempFile("", "*.key")
66+
fp2, err := os.CreateTemp("", "*.key")
6867
require.NoError(t, err)
6968
_, err = fp2.Write(key2)
7069
require.NoError(t, err)
@@ -99,7 +98,7 @@ func TestRotate(t *testing.T) {
9998

10099
// This test shows that rotate tool can be used to enable encryption.
101100
func TestRotatePlainTextToEncrypted(t *testing.T) {
102-
dir, err := ioutil.TempDir("", "badger-test")
101+
dir, err := os.MkdirTemp("", "badger-test")
103102
require.NoError(t, err)
104103
defer os.RemoveAll(dir)
105104

@@ -117,7 +116,7 @@ func TestRotatePlainTextToEncrypted(t *testing.T) {
117116
// Create an encryption key.
118117
key := make([]byte, 32)
119118
y.Check2(rand.Read(key))
120-
fp, err := ioutil.TempFile("", "*.key")
119+
fp, err := os.CreateTemp("", "*.key")
121120
require.NoError(t, err)
122121
_, err = fp.Write(key)
123122
require.NoError(t, err)

‎batch_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package badger
1818

1919
import (
2020
"fmt"
21-
"io/ioutil"
21+
"os"
2222
"testing"
2323
"time"
2424

@@ -150,7 +150,7 @@ func TestFlushPanic(t *testing.T) {
150150
}
151151

152152
func TestBatchErrDeadlock(t *testing.T) {
153-
dir, err := ioutil.TempDir("", "badger-test")
153+
dir, err := os.MkdirTemp("", "badger-test")
154154
require.NoError(t, err)
155155
defer removeDir(dir)
156156

‎db2_test.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"encoding/binary"
2323
"flag"
2424
"fmt"
25-
"io/ioutil"
2625
"log"
2726
"math"
2827
"math/rand"
@@ -54,7 +53,7 @@ func TestTruncateVlogWithClose(t *testing.T) {
5453
return m
5554
}
5655

57-
dir, err := ioutil.TempDir("", "badger-test")
56+
dir, err := os.MkdirTemp("", "badger-test")
5857
require.NoError(t, err)
5958
defer removeDir(dir)
6059

@@ -425,7 +424,7 @@ func TestBigValues(t *testing.T) {
425424
// tables on level 3 and 3 tables on level 2. Tables on level 2 have overlap with 2, 4, 3 tables on
426425
// level 3.
427426
func TestCompactionFilePicking(t *testing.T) {
428-
dir, err := ioutil.TempDir("", "badger-test")
427+
dir, err := os.MkdirTemp("", "badger-test")
429428
require.NoError(t, err)
430429
defer removeDir(dir)
431430

@@ -578,7 +577,7 @@ func TestReadSameVlog(t *testing.T) {
578577
func TestL0GCBug(t *testing.T) {
579578
t.Skipf("TestL0GCBug is DISABLED. TODO(ibrahim): Do we need this?")
580579

581-
dir, err := ioutil.TempDir("", "badger-test")
580+
dir, err := os.MkdirTemp("", "badger-test")
582581
require.NoError(t, err)
583582
defer removeDir(dir)
584583

@@ -673,7 +672,7 @@ func TestWindowsDataLoss(t *testing.T) {
673672
t.Skip("The test is only for Windows.")
674673
}
675674

676-
dir, err := ioutil.TempDir("", "badger-test")
675+
dir, err := os.MkdirTemp("", "badger-test")
677676
require.NoError(t, err)
678677
defer removeDir(dir)
679678

@@ -826,7 +825,7 @@ func TestIsClosed(t *testing.T) {
826825
if inMemory {
827826
opt.InMemory = true
828827
} else {
829-
dir, err := ioutil.TempDir("", "badger-test")
828+
dir, err := os.MkdirTemp("", "badger-test")
830829
require.NoError(t, err)
831830
defer removeDir(dir)
832831

@@ -867,7 +866,7 @@ func TestMaxVersion(t *testing.T) {
867866
})
868867
})
869868
t.Run("multiple versions", func(t *testing.T) {
870-
dir, err := ioutil.TempDir("", "badger-test")
869+
dir, err := os.MkdirTemp("", "badger-test")
871870
require.NoError(t, err)
872871
defer removeDir(dir)
873872

@@ -893,7 +892,7 @@ func TestMaxVersion(t *testing.T) {
893892
require.NoError(t, db.Close())
894893
})
895894
t.Run("Managed mode", func(t *testing.T) {
896-
dir, err := ioutil.TempDir("", "badger-test")
895+
dir, err := os.MkdirTemp("", "badger-test")
897896
require.NoError(t, err)
898897
defer removeDir(dir)
899898

@@ -919,7 +918,7 @@ func TestMaxVersion(t *testing.T) {
919918
}
920919

921920
func TestTxnReadTs(t *testing.T) {
922-
dir, err := ioutil.TempDir("", "badger-test")
921+
dir, err := os.MkdirTemp("", "badger-test")
923922
require.NoError(t, err)
924923
defer removeDir(dir)
925924

@@ -1017,7 +1016,7 @@ func TestKeyCount(t *testing.T) {
10171016
}
10181017

10191018
N := uint64(10 * 1e6) // 10 million entries
1020-
dir, err := ioutil.TempDir("", "badger-test")
1019+
dir, err := os.MkdirTemp("", "badger-test")
10211020
require.NoError(t, err)
10221021
defer removeDir(dir)
10231022
opt := DefaultOptions(dir).

0 commit comments

Comments
 (0)