Skip to content

query: also teard down on ctx done #106

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
merged 1 commit into from
May 13, 2022
Merged

query: also teard down on ctx done #106

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
12 changes: 8 additions & 4 deletions flatfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ func (fs *Datastore) Query(ctx context.Context, q query.Query) (query.Results, e
// to `Close`.
b := query.NewResultBuilder(q)
b.Process.Go(func(p goprocess.Process) {
err := fs.walkTopLevel(fs.path, b)
err := fs.walkTopLevel(ctx, fs.path, b)
if err == nil {
return
}
Expand All @@ -782,7 +782,7 @@ func (fs *Datastore) Query(ctx context.Context, q query.Query) (query.Results, e
return query.NaiveQueryApply(q, b.Results()), nil
}

func (fs *Datastore) walkTopLevel(path string, result *query.ResultBuilder) error {
func (fs *Datastore) walkTopLevel(ctx context.Context, path string, result *query.ResultBuilder) error {
dir, err := os.Open(path)
if err != nil {
return err
Expand All @@ -801,13 +801,15 @@ func (fs *Datastore) walkTopLevel(path string, result *query.ResultBuilder) erro
continue
}

err = fs.walk(filepath.Join(path, dir), result)
err = fs.walk(ctx, filepath.Join(path, dir), result)
if err != nil {
return err
}

// Are we closing?
select {
case <-ctx.Done():
return ctx.Err()
case <-result.Process.Closing():
return nil
default:
Expand Down Expand Up @@ -1123,7 +1125,7 @@ func (fs *Datastore) tempFileOnce() (*os.File, error) {
}

// only call this on directories.
func (fs *Datastore) walk(path string, qrb *query.ResultBuilder) error {
func (fs *Datastore) walk(ctx context.Context, path string, qrb *query.ResultBuilder) error {
dir, err := os.Open(path)
if err != nil {
if os.IsNotExist(err) {
Expand Down Expand Up @@ -1174,6 +1176,8 @@ func (fs *Datastore) walk(path string, qrb *query.ResultBuilder) error {

select {
case qrb.Output <- result:
case <-ctx.Done():
return ctx.Err()
case <-qrb.Process.Closing():
return nil
}
Expand Down