26e760ee62
The JSON stream library has no safe way of aborting while Since we cannot expect the called to safely handle "Read" and "Close" calls we must handle this. Also any Read error returned from upstream will crash the server. We preserve the errors and instead always return io.EOF upstream, but send the error on Close. `readahead v1.3.1` handles Read after Close better. Updates to `progressReader` is mostly to ensure safety. Fixes #8481
107 lines
2.3 KiB
Go
107 lines
2.3 KiB
Go
/*
|
|
* MinIO Cloud Storage, (C) 2019 MinIO, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package json
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/minio/minio/pkg/s3select/sql"
|
|
)
|
|
|
|
func TestNewReader(t *testing.T) {
|
|
files, err := ioutil.ReadDir("testdata")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for _, file := range files {
|
|
t.Run(file.Name(), func(t *testing.T) {
|
|
f, err := os.Open(filepath.Join("testdata", file.Name()))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
r := NewReader(f, &ReaderArgs{})
|
|
var record sql.Record
|
|
for {
|
|
record, err = r.Read(record)
|
|
if err != nil {
|
|
break
|
|
}
|
|
}
|
|
r.Close()
|
|
if err != io.EOF {
|
|
t.Fatalf("Reading failed with %s, %s", err, file.Name())
|
|
}
|
|
})
|
|
|
|
t.Run(file.Name()+"-close", func(t *testing.T) {
|
|
f, err := os.Open(filepath.Join("testdata", file.Name()))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
r := NewReader(f, &ReaderArgs{})
|
|
r.Close()
|
|
var record sql.Record
|
|
for {
|
|
record, err = r.Read(record)
|
|
if err != nil {
|
|
break
|
|
}
|
|
}
|
|
if err != io.EOF {
|
|
t.Fatalf("Reading failed with %s, %s", err, file.Name())
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func BenchmarkReader(b *testing.B) {
|
|
files, err := ioutil.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()))
|
|
if err != nil {
|
|
b.Fatal(err)
|
|
}
|
|
b.SetBytes(int64(len(f)))
|
|
b.ReportAllocs()
|
|
b.ResetTimer()
|
|
var record sql.Record
|
|
for i := 0; i < b.N; i++ {
|
|
r := NewReader(ioutil.NopCloser(bytes.NewBuffer(f)), &ReaderArgs{})
|
|
for {
|
|
record, err = r.Read(record)
|
|
if err != nil {
|
|
break
|
|
}
|
|
}
|
|
r.Close()
|
|
if err != io.EOF {
|
|
b.Fatalf("Reading failed with %s, %s", err, file.Name())
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|