mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-05 02:59:44 -06:00
Code Issues Packages Projects Releases 126 Wiki Activity

go/libraries/doltcore/diff: Add recover in async_differ goroutine.

Browse Source
This commit is contained in:
Aaron Son
2020-12-15 15:28:44 -08:00
parent 4d87f6e6d9
commit dea7e002c9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
go/libraries/doltcore/diff/async_differ.go
View File

@@ -17,6 +17,7 @@ package diff
import (
"context"
"errors"
"fmt"
"time"
"golang.org/x/sync/errgroup"
@@ -52,8 +53,13 @@ func tableDontDescendLists(v1, v2 types.Value) bool {
func (ad *AsyncDiffer) Start(ctx context.Context, from, to types.Map) {
ad.eg, ad.egCtx = errgroup.WithContext(ctx)
ad.egCancel = async.GoWithCancel(ad.egCtx, ad.eg, func(ctx context.Context) error {
ad.egCancel = async.GoWithCancel(ad.egCtx, ad.eg, func(ctx context.Context) (err error) {
defer close(ad.diffChan)
defer func() {
if r := recover(); r != nil {
err = fmt.Errorf("panic in diff.Diff: %v", r)
}
}()
return diff.Diff(ctx, from, to, ad.diffChan, true, tableDontDescendLists)
})
}