Skip to content

sio/csupio: don't close underlying io.Reader #7235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nwt merged 1 commit into from
Aug 23, 2026
Merged

sio/csupio: don't close underlying io.Reader #7235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions sio/csupio/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ func (r *Reader) Pull(done bool) (vector.Any, error) {

func (r *Reader) ConcurrentPull(done bool, n int) (vector.Any, error) {
if done {
return nil, r.close()
return nil, nil
}
if err := r.ctx.Err(); err != nil {
r.close()
return nil, err
}
for {
Expand All @@ -99,16 +98,11 @@ func (r *Reader) ConcurrentPull(done bool, n int) (vector.Any, error) {
return vec, nil
}
hdr, off, err := r.stream.next()
if err != nil {
r.close()
if hdr == nil || err != nil {
return nil, err
}
if hdr == nil {
return nil, r.close()
}
o, err := csup.NewObjectFromHeader(io.NewSectionReader(r.readerAt, off, math.MaxInt64), *hdr)
if err != nil {
r.close()
return nil, err
}
// XXX using the query context for the metadata filter unnecessarily
Expand All @@ -126,13 +120,11 @@ func (r *Reader) ConcurrentPull(done bool, n int) (vector.Any, error) {
if r.pushdown != nil && r.pushdown.Unordered() {
r.vecs[n], err = vo.FetchUnordered(r.vecs[n][:0], r.sctx, proj)
if err != nil {
r.close()
return nil, err
}
} else {
vec, err := vo.Fetch(r.sctx, proj)
if err != nil {
r.close()
return nil, err
}
r.vecs[n] = append(r.vecs[n], vec)
Expand All @@ -153,12 +145,3 @@ func pruneObject(sctx *super.Context, mf *metafilter, o *csup.Object) bool {
func (r *Reader) Type() (super.Type, error) {
return csup.FusedType(r.sctx, r.readerAt)
}

func (r *Reader) close() error {
if r.activeReaders.Add(-1) == 0 {
if closer, ok := r.readerAt.(io.Closer); ok {
return closer.Close()
}
}
return nil
}
Loading