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

session: return an error when a non-transactional DML partially fails #34488

Merged
merged 4 commits into from
May 10, 2022
Merged

session: return an error when a non-transactional DML partially fails #34488

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2688026
return an error when a nt-dml partially fails
ekexium May 9, 2022
2b34480
support ignore errors in nt-dml.
ekexium May 10, 2022
2cf5a9a
improve an error message
ekexium May 10, 2022
0b81d4c
Merge branch 'master' into error-when-error
ti-chi-bot May 10, 2022
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
39 changes: 6 additions & 33 deletions session/nontransactional.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tidb/util/collate"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tidb/util/mathutil"
"github.com/pingcap/tidb/util/memory"
"github.com/pingcap/tidb/util/sqlexec"
"go.uber.org/zap"
Expand Down Expand Up @@ -580,44 +581,16 @@ func buildExecuteResults(ctx context.Context, jobs []job, maxChunkSize int, reda
MaxChunkSize: maxChunkSize,
}, nil
}
resultFields := []*ast.ResultField{
{
Column: &model.ColumnInfo{
FieldType: *types.NewFieldType(mysql.TypeString),
},
ColumnAsName: model.NewCIStr("job"),
},
{
Column: &model.ColumnInfo{
FieldType: *types.NewFieldType(mysql.TypeString),
},
ColumnAsName: model.NewCIStr("sql"),
},
{
Column: &model.ColumnInfo{
FieldType: *types.NewFieldType(mysql.TypeString),
},
ColumnAsName: model.NewCIStr("error"),
},
}

rows := make([][]interface{}, 0, len(failedJobs))
var sb strings.Builder
for _, job := range failedJobs {
row := make([]interface{}, 2)
row[0] = job.String(false)
row[1] = job.err.Error()
rows = append(rows, row)
sb.WriteString(fmt.Sprintf("%s, %s;\n", job.String(redactLog), job.err.Error()))
}

errStr := sb.String()
// log errors here in case the output is too long. There can be thousands of errors.
logutil.Logger(ctx).Warn("Non-transactional delete failed",
zap.Int("num_failed_jobs", len(failedJobs)), zap.String("failed_jobs", sb.String()))
logutil.Logger(ctx).Error("Non-transactional delete failed",
zap.Int("num_failed_jobs", len(failedJobs)), zap.String("failed_jobs", errStr))

return &sqlexec.SimpleRecordSet{
ResultFields: resultFields,
Rows: rows,
MaxChunkSize: maxChunkSize,
}, nil
return nil, errors.New(fmt.Sprintf("%d jobs failed in the non-transactional statement: %s, ...(more in logs)",
len(failedJobs), errStr[:mathutil.Min(500, len(errStr)-1)]))
}