mirror of
https://github.com/dolthub/dolt.git
synced 2026-04-22 19:43:51 -05:00
Merge pull request #4970 from dolthub/aaron/conjoin-ctx-not-canceled
go/store/nbs: conjoiner.go: Fix bug with use of canceled context.
This commit is contained in:
@@ -187,13 +187,13 @@ func conjoin(ctx context.Context, s conjoinStrategy, upstream manifestContents,
|
||||
}
|
||||
|
||||
func conjoinTables(ctx context.Context, conjoinees []tableSpec, p tablePersister, stats *Stats) (conjoined tableSpec, err error) {
|
||||
eg, ctx := errgroup.WithContext(ctx)
|
||||
eg, ectx := errgroup.WithContext(ctx)
|
||||
toConjoin := make(chunkSources, len(conjoinees))
|
||||
|
||||
for idx := range conjoinees {
|
||||
i, spec := idx, conjoinees[idx]
|
||||
eg.Go(func() (err error) {
|
||||
toConjoin[i], err = p.Open(ctx, spec.name, spec.chunkCount, stats)
|
||||
toConjoin[i], err = p.Open(ectx, spec.name, spec.chunkCount, stats)
|
||||
return
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user