mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-27 10:35:36 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

fix race on err write, only run migration tests for __LD_1__

Browse Source
This commit is contained in:
Andy Arthur
2022-08-24 09:28:59 -07:00
parent 41a00a47e9
commit d2bf21656a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/migrate/integration_test.go
View File

@@ -55,6 +55,10 @@ type assertion struct {
}
func TestMigration(t *testing.T) {
if types.Format_Default != types.Format_LD_1 {
t.Skip()
}
tests := []migrationTest{
{
name: "smoke test",

10
go/libraries/doltcore/migrate/transform.go
View File

@@ -373,14 +373,16 @@ func migrateTable(ctx context.Context, newSch schema.Schema, oldParentTbl, oldTb
eg, ctx := errgroup.WithContext(ctx)
eg.Go(func() error {
newRows, err = migrateIndex(ctx, newSch, oldParentRows, oldRows, newParentRows, newParentTbl.NodeStore())
return err
var merr error
newRows, merr = migrateIndex(ctx, newSch, oldParentRows, oldRows, newParentRows, newParentTbl.NodeStore())
return merr
})
vrw, ns := newParentTbl.ValueReadWriter(), newParentTbl.NodeStore()
eg.Go(func() error {
newSet, err = migrateIndexSet(ctx, newSch, oldParentSet, oldSet, newParentSet, vrw, ns)
return err
var merr error
newSet, merr = migrateIndexSet(ctx, newSch, oldParentSet, oldSet, newParentSet, vrw, ns)
return merr
})
if err = eg.Wait(); err != nil {