fix: 审核插件 AuditResult 以及相关函数格式变更 #1426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sjjian
reviewed
Apr 7, 2023
sqle/driver/mysql/mysql.go
Outdated
| @@ -352,7 +352,7 @@ func (i *MysqlDriverImpl) audit(ctx context.Context, sql string) (*driverV2.Audi | |||
| buf.WriteString(fmt.Sprintf(", 原因(%s)", advice.Reason)) | |||
| } | |||
| } | |||
| i.result.Add(driverV2.RuleLevelNotice, buf.String()) | |||
| i.result.Add(driverV2.RuleLevelNotice, "", buf.String()) | |||
sjjian
reviewed
Apr 7, 2023
sqle/driver/mysql/mysql.go
Outdated
| @@ -362,9 +362,9 @@ func (i *MysqlDriverImpl) audit(ctx context.Context, sql string) (*driverV2.Audi | |||
| } | |||
| if useGhost { | |||
| if _, err := i.executeByGhost(ctx, sql, true); err != nil { | |||
| i.result.Add(driverV2.RuleLevelError, fmt.Sprintf("表空间大小超过%vMB, 将使用gh-ost进行上线, 但是dry-run抛出如下错误: %v", i.cnf.DDLGhostMinSize, err)) | |||
| i.result.Add(driverV2.RuleLevelError, "", fmt.Sprintf("表空间大小超过%vMB, 将使用gh-ost进行上线, 但是dry-run抛出如下错误: %v", i.cnf.DDLGhostMinSize, err)) | |||
sjjian
reviewed
Apr 7, 2023
sqle/driver/mysql/mysql.go
Outdated
| } else { | ||
| i.result.Add(ghostRule.Level, fmt.Sprintf("表空间大小超过%vMB, 将使用gh-ost进行上线", i.cnf.DDLGhostMinSize)) | ||
| i.result.Add(ghostRule.Level, "", fmt.Sprintf("表空间大小超过%vMB, 将使用gh-ost进行上线", i.cnf.DDLGhostMinSize)) |
sjjian
reviewed
Apr 7, 2023
sqle/driver/mysql/mysql.go
Outdated
| @@ -374,7 +374,7 @@ func (i *MysqlDriverImpl) audit(ctx context.Context, sql string) (*driverV2.Audi | |||
| return nil, err | |||
| } | |||
| if oscCommandLine != "" { | |||
| i.result.Add(driverV2.RuleLevelNotice, fmt.Sprintf("[osc]%s", oscCommandLine)) | |||
| i.result.Add(driverV2.RuleLevelNotice, "", fmt.Sprintf("[osc]%s", oscCommandLine)) | |||
sjjian
reviewed
Apr 7, 2023
sqle/driver/mysql/audit.go
Outdated
| @@ -81,7 +81,7 @@ func (i *MysqlDriverImpl) CheckExplain(node ast.Node) error { | |||
| _, err = i.Ctx.GetExecutionPlan(node.Text()) | |||
| } | |||
| if err != nil { | |||
| i.result.Add(driverV2.RuleLevelWarn, fmt.Sprintf(CheckInvalidErrorFormat, err)) | |||
| i.result.Add(driverV2.RuleLevelWarn, "", fmt.Sprintf(CheckInvalidErrorFormat, err)) | |||
sjjian
approved these changes
Apr 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix:
related: #1411