Skip to content
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

Jump to bottom

executor: report error in AddRecordLD function #13980

Merged
merged 3 commits into from
Dec 10, 2019
Merged

executor: report error in AddRecordLD function #13980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fcd55f
report error in addRecordLD
cfzjywxk Dec 9, 2019
406d427
add time usage log
cfzjywxk Dec 9, 2019
a5b2703
Merge branch 'release-3.0' into add_error_3_0
cfzjywxk Dec 9, 2019
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
1 change: 1 addition & 0 deletions executor/load_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ func (e *LoadDataInfo) addRecordLD(row []types.Datum) (int64, error) {
h, err := e.addRecord(row)
if err != nil {
e.handleWarning(err)
return 0, err
}
return h, nil
}
Expand Down
2 changes: 2 additions & 0 deletions server/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,7 @@ func insertDataWithCommit(ctx context.Context, prevData, curData []byte, loadDat
if !reachLimit {
break
}
start := time.Now()
if err = loadDataInfo.Ctx.StmtCommit(); err != nil {
return nil, err
}
Expand All @@ -1080,6 +1081,7 @@ func insertDataWithCommit(ctx context.Context, prevData, curData []byte, loadDat
}
curData = prevData
prevData = nil
logutil.Logger(ctx).Info("commit one task finished", zap.Duration("commit time usage", time.Since(start)))
}
return prevData, nil
}
Expand Down