mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-01 20:00:22 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

go vet

Browse Source
This commit is contained in:
Andy Arthur
2020-05-15 18:33:35 -07:00
parent 5ab9933260
commit baec1983a9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/tblcmds/cp.go
+1 -1
View File
@@ -248,7 +248,7 @@ func newTableCopyDataMover(ctx context.Context, root *doltdb.RootValue, fs files
return nil, errhand.BuildDError("Could not create table writer for %s", co.newTblName).AddCause(err).Build()
}
imp := &mvdata.DataMover{rd, transforms, wr, co.contOnErr}
imp := &mvdata.DataMover{Rd: rd, Transforms: transforms, Wr: wr, ContOnErr: co.contOnErr}
rd = nil
return imp, nil
go/cmd/dolt/commands/tblcmds/export.go
+1 -1
View File
@@ -270,7 +270,7 @@ func NewExportDataMover(ctx context.Context, root *doltdb.RootValue, fs filesys.
emptyTransColl := pipeline.NewTransformCollection()
imp := &mvdata.DataMover{rd, emptyTransColl, wr, exOpts.contOnErr}
imp := &mvdata.DataMover{Rd: rd, Transforms: emptyTransColl, Wr: wr, ContOnErr: exOpts.contOnErr}
rd = nil
return imp, nil
go/cmd/dolt/commands/tblcmds/import.go
+7 -7
View File
@@ -433,22 +433,22 @@ func newImportDataMover(ctx context.Context, root *doltdb.RootValue, fs filesys.
ow, err := impOpts.checkOverwrite(ctx, root, fs)
if err != nil {
return nil, &mvdata.DataMoverCreationError{mvdata.CreateReaderErr, err}
return nil, &mvdata.DataMoverCreationError{ErrType: mvdata.CreateReaderErr, Cause: err}
}
if ow {
return nil, &mvdata.DataMoverCreationError{mvdata.CreateReaderErr, fmt.Errorf("%s already exists. Use -f to overwrite.", impOpts.DestName())}
return nil, &mvdata.DataMoverCreationError{ErrType: mvdata.CreateReaderErr, Cause: fmt.Errorf( "%s already exists. Use -f to overwrite.", impOpts.DestName())}
}
wrSch, err := getImportSchema(ctx, root, fs, impOpts)
if err != nil {
return nil, &mvdata.DataMoverCreationError{mvdata.SchemaErr, err}
return nil, &mvdata.DataMoverCreationError{ErrType: mvdata.SchemaErr, Cause: err}
}
rd, srcIsSorted, err := impOpts.src.NewReader(ctx, root, fs, impOpts.srcOptions)
if err != nil {
return nil, &mvdata.DataMoverCreationError{mvdata.CreateReaderErr, err}
return nil, &mvdata.DataMoverCreationError{ErrType: mvdata.CreateReaderErr, Cause: err}
}
defer func() {
@@ -465,7 +465,7 @@ func newImportDataMover(ctx context.Context, root *doltdb.RootValue, fs filesys.
transforms, err := mvdata.NameMapTransform(rd.GetSchema(), wrSch, impOpts.nameMapper)
if err != nil {
return nil, &mvdata.DataMoverCreationError{mvdata.CreateMapperErr, err}
return nil, &mvdata.DataMoverCreationError{ErrType: mvdata.CreateMapperErr, Cause: err}
}
var wr table.TableWriteCloser
@@ -481,10 +481,10 @@ func newImportDataMover(ctx context.Context, root *doltdb.RootValue, fs filesys.
}
if err != nil {
return nil, &mvdata.DataMoverCreationError{mvdata.CreateWriterErr, err}
return nil, &mvdata.DataMoverCreationError{ErrType: mvdata.CreateWriterErr, Cause: err}
}
imp := &mvdata.DataMover{rd, transforms, wr, impOpts.contOnErr}
imp := &mvdata.DataMover{Rd: rd, Transforms: transforms, Wr: wr, ContOnErr: impOpts.contOnErr}
rd = nil
return imp, nil