MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-08 21:24:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix stale locks held by SelectParquet API (#7364)

Browse Source 
Vendorize upstream parquet-go to fix this issue.
This commit is contained in:
Harshavardhana
2019-03-13 20:33:18 -07:00
committed by GitHub
parent 7079abc931
commit 91d85a0d53
16 changed files with 1838 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/s3select/parquet/reader.go
View File

@@ -28,13 +28,13 @@ import (
// Reader - Parquet record reader for S3Select.
type Reader struct {
args *ReaderArgs
file *parquetgo.File
args *ReaderArgs
reader *parquetgo.Reader
}
// Read - reads single record.
func (r *Reader) Read() (rec sql.Record, rerr error) {
parquetRecord, err := r.file.Read()
parquetRecord, err := r.reader.Read()
if err != nil {
if err != io.EOF {
return nil, errParquetParsingError(err)
@@ -79,12 +79,12 @@ func (r *Reader) Read() (rec sql.Record, rerr error) {
// Close - closes underlaying readers.
func (r *Reader) Close() error {
return r.file.Close()
return r.reader.Close()
}
// NewReader - creates new Parquet reader using readerFunc callback.
func NewReader(getReaderFunc func(offset, length int64) (io.ReadCloser, error), args *ReaderArgs) (*Reader, error) {
file, err := parquetgo.Open(getReaderFunc, nil)
reader, err := parquetgo.NewReader(getReaderFunc, nil)
if err != nil {
if err != io.EOF {
return nil, errParquetParsingError(err)
@@ -94,7 +94,7 @@ func NewReader(getReaderFunc func(offset, length int64) (io.ReadCloser, error),
}
return &Reader{
args: args,
file: file,
args: args,
reader: reader,
}, nil
}