astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-19 04:00:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated io/ioutil (#15707)

Browse Source
This commit is contained in:
Klaus Post
2022-09-19 20:05:16 +02:00
committed by GitHub
parent 0b6175b742
commit ff12080ff5
89 changed files with 315 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/s3select/csv/reader_contrib_test.go
+13 -13
View File
@@ -21,7 +21,7 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"os"
"reflect"
"strings"
"testing"
@@ -46,7 +46,7 @@ func TestRead(t *testing.T) {
var record sql.Record
var result bytes.Buffer
r, _ := NewReader(ioutil.NopCloser(strings.NewReader(c.content)), &ReaderArgs{
r, _ := NewReader(io.NopCloser(strings.NewReader(c.content)), &ReaderArgs{
FileHeaderInfo: none,
RecordDelimiter: c.recordDelimiter,
FieldDelimiter: c.fieldDelimiter,
@@ -88,7 +88,7 @@ type tester interface {
}
func openTestFile(t tester, file string) []byte {
f, err := ioutil.ReadFile("testdata/testdata.zip")
f, err := os.ReadFile("testdata/testdata.zip")
if err != nil {
t.Fatal(err)
}
@@ -103,7 +103,7 @@ func openTestFile(t tester, file string) []byte {
t.Fatal(err)
}
defer rc.Close()
b, err := ioutil.ReadAll(rc)
b, err := io.ReadAll(rc)
if err != nil {
t.Fatal(err)
}
@@ -238,7 +238,7 @@ func TestReadExtended(t *testing.T) {
if !c.header {
args.FileHeaderInfo = none
}
r, _ := NewReader(ioutil.NopCloser(bytes.NewReader(input)), &args)
r, _ := NewReader(io.NopCloser(bytes.NewReader(input)), &args)
fields := 0
for {
record, err = r.Read(record)
@@ -455,7 +455,7 @@ func TestReadFailures(t *testing.T) {
if c.sendErr != nil {
inr = io.MultiReader(inr, errReader{c.sendErr})
}
r, _ := NewReader(ioutil.NopCloser(inr), &args)
r, _ := NewReader(io.NopCloser(inr), &args)
fields := 0
for {
record, err = r.Read(record)
@@ -502,7 +502,7 @@ func BenchmarkReaderBasic(b *testing.B) {
unmarshaled: true,
}
f := openTestFile(b, "nyc-taxi-data-100k.csv")
r, err := NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err := NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
@@ -512,7 +512,7 @@ func BenchmarkReaderBasic(b *testing.B) {
b.SetBytes(int64(len(f)))
var record sql.Record
for i := 0; i < b.N; i++ {
r, err = NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err = NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
@@ -550,7 +550,7 @@ func BenchmarkReaderHuge(b *testing.B) {
b.ResetTimer()
var record sql.Record
for i := 0; i < b.N; i++ {
r, err := NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err := NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
@@ -584,7 +584,7 @@ func BenchmarkReaderReplace(b *testing.B) {
unmarshaled: true,
}
f := openTestFile(b, "nyc-taxi-data-100k-single-delim.csv")
r, err := NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err := NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
@@ -594,7 +594,7 @@ func BenchmarkReaderReplace(b *testing.B) {
b.SetBytes(int64(len(f)))
var record sql.Record
for i := 0; i < b.N; i++ {
r, err = NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err = NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
@@ -621,7 +621,7 @@ func BenchmarkReaderReplaceTwo(b *testing.B) {
unmarshaled: true,
}
f := openTestFile(b, "nyc-taxi-data-100k-multi-delim.csv")
r, err := NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err := NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
@@ -631,7 +631,7 @@ func BenchmarkReaderReplaceTwo(b *testing.B) {
b.SetBytes(int64(len(f)))
var record sql.Record
for i := 0; i < b.N; i++ {
r, err = NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &args)
r, err = NewReader(io.NopCloser(bytes.NewBuffer(f)), &args)
if err != nil {
b.Fatalf("Reading init failed with %s", err)
}
internal/s3select/json/preader_test.go
+4 -5
View File
@@ -20,7 +20,6 @@ package json
import (
"bytes"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -29,7 +28,7 @@ import (
)
func TestNewPReader(t *testing.T) {
files, err := ioutil.ReadDir("testdata")
files, err := os.ReadDir("testdata")
if err != nil {
t.Fatal(err)
}
@@ -75,13 +74,13 @@ func TestNewPReader(t *testing.T) {
}
func BenchmarkPReader(b *testing.B) {
files, err := ioutil.ReadDir("testdata")
files, err := os.ReadDir("testdata")
if err != nil {
b.Fatal(err)
}
for _, file := range files {
b.Run(file.Name(), func(b *testing.B) {
f, err := ioutil.ReadFile(filepath.Join("testdata", file.Name()))
f, err := os.ReadFile(filepath.Join("testdata", file.Name()))
if err != nil {
b.Fatal(err)
}
@@ -90,7 +89,7 @@ func BenchmarkPReader(b *testing.B) {
b.ResetTimer()
var record sql.Record
for i := 0; i < b.N; i++ {
r := NewPReader(ioutil.NopCloser(bytes.NewBuffer(f)), &ReaderArgs{})
r := NewPReader(io.NopCloser(bytes.NewBuffer(f)), &ReaderArgs{})
for {
record, err = r.Read(record)
if err != nil {
internal/s3select/json/reader_test.go
+4 -5
View File
@@ -20,7 +20,6 @@ package json
import (
"bytes"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -29,7 +28,7 @@ import (
)
func TestNewReader(t *testing.T) {
files, err := ioutil.ReadDir("testdata")
files, err := os.ReadDir("testdata")
if err != nil {
t.Fatal(err)
}
@@ -75,13 +74,13 @@ func TestNewReader(t *testing.T) {
}
func BenchmarkReader(b *testing.B) {
files, err := ioutil.ReadDir("testdata")
files, err := os.ReadDir("testdata")
if err != nil {
b.Fatal(err)
}
for _, file := range files {
b.Run(file.Name(), func(b *testing.B) {
f, err := ioutil.ReadFile(filepath.Join("testdata", file.Name()))
f, err := os.ReadFile(filepath.Join("testdata", file.Name()))
if err != nil {
b.Fatal(err)
}
@@ -90,7 +89,7 @@ func BenchmarkReader(b *testing.B) {
b.ResetTimer()
var record sql.Record
for i := 0; i < b.N; i++ {
r := NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &ReaderArgs{})
r := NewReader(io.NopCloser(bytes.NewBuffer(f)), &ReaderArgs{})
for {
record, err = r.Read(record)
if err != nil {
internal/s3select/select.go
+3 -4
View File
@@ -25,7 +25,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"strings"
@@ -83,9 +82,9 @@ var bufPool = sync.Pool{
var bufioWriterPool = sync.Pool{
New: func() interface{} {
// ioutil.Discard is just used to create the writer. Actual destination
// io.Discard is just used to create the writer. Actual destination
// writer is set later by Reset() before using it.
return bufio.NewWriter(ioutil.Discard)
return bufio.NewWriter(io.Discard)
},
}
@@ -461,7 +460,7 @@ func (s3Select *S3Select) marshal(buf *bytes.Buffer, record sql.Record) error {
// Use bufio Writer to prevent csv.Writer from allocating a new buffer.
bufioWriter := bufioWriterPool.Get().(*bufio.Writer)
defer func() {
bufioWriter.Reset(ioutil.Discard)
bufioWriter.Reset(io.Discard)
bufioWriterPool.Put(bufioWriter)
}()
internal/s3select/select_test.go
+22 -23
View File
@@ -22,7 +22,6 @@ import (
"encoding/xml"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"reflect"
@@ -636,7 +635,7 @@ func TestJSONQueries(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -644,7 +643,7 @@ func TestJSONQueries(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -682,7 +681,7 @@ func TestJSONQueries(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -690,7 +689,7 @@ func TestJSONQueries(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -763,7 +762,7 @@ func TestCSVQueries(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -771,7 +770,7 @@ func TestCSVQueries(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -946,7 +945,7 @@ func TestCSVQueries2(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -954,7 +953,7 @@ func TestCSVQueries2(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1090,7 +1089,7 @@ true`,
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1098,7 +1097,7 @@ true`,
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1236,7 +1235,7 @@ func TestCSVInput(t *testing.T) {
if !reflect.DeepEqual(w.response, testCase.expectedResult) {
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1244,7 +1243,7 @@ func TestCSVInput(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1356,7 +1355,7 @@ func TestJSONInput(t *testing.T) {
if !reflect.DeepEqual(w.response, testCase.expectedResult) {
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1364,7 +1363,7 @@ func TestJSONInput(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1663,7 +1662,7 @@ func TestCSVRanges(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1671,7 +1670,7 @@ func TestCSVRanges(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1765,7 +1764,7 @@ func TestParquetInput(t *testing.T) {
if !reflect.DeepEqual(w.response, testCase.expectedResult) {
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1773,7 +1772,7 @@ func TestParquetInput(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1866,7 +1865,7 @@ func TestParquetInputSchema(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1874,7 +1873,7 @@ func TestParquetInputSchema(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
@@ -1966,7 +1965,7 @@ func TestParquetInputSchemaCSV(t *testing.T) {
s3Select.Close()
resp := http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader(w.response)),
Body: io.NopCloser(bytes.NewReader(w.response)),
ContentLength: int64(len(w.response)),
}
res, err := minio.NewSelectResults(&resp, "testbucket")
@@ -1974,7 +1973,7 @@ func TestParquetInputSchemaCSV(t *testing.T) {
t.Error(err)
return
}
got, err := ioutil.ReadAll(res)
got, err := io.ReadAll(res)
if err != nil {
t.Error(err)
return
internal/s3select/simdj/reader_amd64_test.go
+4 -4
View File
@@ -20,7 +20,7 @@ package simdj
import (
"bytes"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -40,7 +40,7 @@ func loadCompressed(t tester, file string) (js []byte) {
t.Fatal(err)
}
defer dec.Close()
js, err = ioutil.ReadFile(filepath.Join("testdata", file+".json.zst"))
js, err = os.ReadFile(filepath.Join("testdata", file+".json.zst"))
if err != nil {
t.Fatal(err)
}
@@ -86,7 +86,7 @@ func TestNDJSON(t *testing.T) {
if false {
t.Log(string(b))
}
// _ = ioutil.WriteFile(filepath.Join("testdata", tt.name+".json"), b, os.ModePerm)
// _ = os.WriteFile(filepath.Join("testdata", tt.name+".json"), b, os.ModePerm)
parser:
for {
@@ -121,7 +121,7 @@ func TestNDJSON(t *testing.T) {
t.Fatal("unexpected type:", typ.String())
}
}
refDec := json.NewReader(ioutil.NopCloser(bytes.NewBuffer(ref)), &json.ReaderArgs{ContentType: "json"})
refDec := json.NewReader(io.NopCloser(bytes.NewBuffer(ref)), &json.ReaderArgs{ContentType: "json"})
for {
rec, err := dec.Read(nil)
internal/s3select/sql/jsonpath_test.go
+2 -2
View File
@@ -20,7 +20,7 @@ package sql
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"os"
"path/filepath"
"reflect"
@@ -48,7 +48,7 @@ func TestJsonpathEval(t *testing.T) {
t.Fatal(err)
}
b, err := ioutil.ReadAll(f)
b, err := io.ReadAll(f)
if err != nil {
t.Fatal(err)
}