MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-20 02:27:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert s3 select simdjson reuse (#17310)

Browse Source
This commit is contained in:
Klaus Post 2023-05-30 10:02:22 -07:00 committed by GitHub
parent 1cd7f1e38d
commit 6fe028b7c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/s3select/simdj/reader.go
View File

@ -81,7 +81,7 @@ func (r *Reader) Close() error {
// If r.input is closed, it is assumed that no more input will come. // If r.input is closed, it is assumed that no more input will come.
// When this function returns r.readerWg will be decremented and r.decoded will be closed. // When this function returns r.readerWg will be decremented and r.decoded will be closed.
// On errors, r.err will be set. This should only be accessed after r.decoded has been closed. // On errors, r.err will be set. This should only be accessed after r.decoded has been closed.
func (r *Reader) startReader(reuse chan<- *simdjson.ParsedJson) { func (r *Reader) startReader() {
defer r.onReaderExit() defer r.onReaderExit()
var tmpObj simdjson.Object var tmpObj simdjson.Object
for { for {
@ -144,11 +144,6 @@ func (r *Reader) startReader(reuse chan<- *simdjson.ParsedJson) {
return return
} }
} }
// Don't block if we cannot reuse.
select {
case reuse <- in.Value:
default:
}
if in.Error == io.EOF { if in.Error == io.EOF {
return return
} }
@ -174,10 +169,10 @@ func NewReader(readCloser io.ReadCloser, args *json.ReaderArgs) *Reader {
r.readerWg.Done() r.readerWg.Done()
} }
reuse := make(chan *simdjson.ParsedJson, 1000) // We cannot reuse as we are sending parsed objects elsewhere.
simdjson.ParseNDStream(readCloser, r.input, reuse) simdjson.ParseNDStream(readCloser, r.input, nil)
r.readerWg.Add(1) r.readerWg.Add(1)
go r.startReader(reuse) go r.startReader()
return &r return &r
} }