From 1cee9b2b662688c9e32642b3d90495a53c930ac9 Mon Sep 17 00:00:00 2001
From: Noah Treuhaft <noah.treuhaft@gmail.com>
Date: Fri, 21 Aug 2026 18:19:18 -0400
Subject: [PATCH] sio/csupio: don't close underlying io.Reader

If the io.Reader argument to NewReader implements io.Closer, then
Reader.ConcurrentPull will close it at EOS.  This can cause a panic if
methods on vector.TypeValue instances are called that use
TypeValue.loader because they rely on the reader.  Fix that by removing
the code that closes the underlying reader.

This aligns csupio.Reader behavior with that of the other sio.Reader
implementations, none of which close their underlying reader.  Closing
them in a timely fashion rather than relying on the garbage collector to
close them is future work.
---
 sio/csupio/reader.go | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/sio/csupio/reader.go b/sio/csupio/reader.go
index 37aff0f956..3c7425e311 100644
--- a/sio/csupio/reader.go
+++ b/sio/csupio/reader.go
@@ -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 {
@@ -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
@@ -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)
@@ -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
-}