PMM-10891 PG Explain with placeholders. #1434
Open
+4,196
−2,408
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
BupycHuk
reviewed
Dec 7, 2022
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -146,7 +146,7 @@ func (s *actionsServer) StartMySQLExplainAction(ctx context.Context, req *manage | |||
| return nil, status.Errorf(codes.FailedPrecondition, "Cannot find right agent") | |||
| } | |||
|
|
|||
| err = s.a.StartMySQLExplainAction(ctx, res.ID, res.PMMAgentID, req.ServiceId, dsn, req.Query, req.QueryId, req.Placeholders, agentpb.MysqlExplainOutputFormat_MYSQL_EXPLAIN_OUTPUT_FORMAT_DEFAULT, files, tdp, agents[0].TLSSkipVerify) | |||
| err = s.a.StartMySQLExplainAction(ctx, res.ID, res.PMMAgentID, req.ServiceId, dsn, req.Query, req.QueryId, req.Values, agentpb.MysqlExplainOutputFormat_MYSQL_EXPLAIN_OUTPUT_FORMAT_DEFAULT, files, tdp, agents[0].TLSSkipVerify) | |||
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
SA1019: req.Query is deprecated: should not be used. (staticcheck)
| @@ -174,7 +174,7 @@ | |||
| return nil, status.Errorf(codes.FailedPrecondition, "Cannot find right agent") | |||
| } | |||
|
|
|||
| err = s.a.StartMySQLExplainAction(ctx, res.ID, res.PMMAgentID, req.ServiceId, dsn, req.Query, req.QueryId, req.Placeholders, agentpb.MysqlExplainOutputFormat_MYSQL_EXPLAIN_OUTPUT_FORMAT_JSON, files, tdp, agents[0].TLSSkipVerify) | |||
| err = s.a.StartMySQLExplainAction(ctx, res.ID, res.PMMAgentID, req.ServiceId, dsn, req.Query, req.QueryId, req.Values, agentpb.MysqlExplainOutputFormat_MYSQL_EXPLAIN_OUTPUT_FORMAT_JSON, files, tdp, agents[0].TLSSkipVerify) | |||
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
SA1019: req.Query is deprecated: should not be used. (staticcheck)
| @@ -202,7 +202,7 @@ | |||
| return nil, status.Errorf(codes.FailedPrecondition, "Cannot find right agent") | |||
| } | |||
|
|
|||
| err = s.a.StartMySQLExplainAction(ctx, res.ID, res.PMMAgentID, req.ServiceId, dsn, req.Query, req.QueryId, req.Placeholders, agentpb.MysqlExplainOutputFormat_MYSQL_EXPLAIN_OUTPUT_FORMAT_TRADITIONAL_JSON, files, tdp, agents[0].TLSSkipVerify) | |||
| err = s.a.StartMySQLExplainAction(ctx, res.ID, res.PMMAgentID, req.ServiceId, dsn, req.Query, req.QueryId, req.Values, agentpb.MysqlExplainOutputFormat_MYSQL_EXPLAIN_OUTPUT_FORMAT_TRADITIONAL_JSON, files, tdp, agents[0].TLSSkipVerify) | |||
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
SA1019: req.Query is deprecated: should not be used. (staticcheck)
| @@ -127,7 +125,12 @@ func (a *mysqlExplainAction) Run(ctx context.Context) ([]byte, error) { | |||
| func (a *mysqlExplainAction) sealed() {} | |||
|
|
|||
| func (a *mysqlExplainAction) explainDefault(ctx context.Context, tx *sql.Tx) ([]byte, error) { | |||
| rows, err := tx.QueryContext(ctx, fmt.Sprintf("EXPLAIN /* pmm-agent */ %s", a.query)) | |||
| inter := []any{} | |||
| for _, p := range a.params.Values { | |||
There was a problem hiding this comment.
Maybe you can use copy here
There was a problem hiding this comment.
https://go.dev/play/p/9xfjslBdmv9
See example. Its not possible in this case.
percona-csalguero
approved these changes
Dec 12, 2022
rishat-ishbulatov
approved these changes
Dec 12, 2022
BupycHuk
approved these changes
Dec 12, 2022
| "github.com/pkg/errors" | ||
| "vitess.io/vitess/go/vt/proto/query" | ||
| "vitess.io/vitess/go/vt/sqlparser" | ||
| ) | ||
|
|
||
| var ( | ||
| pgRegexp *regexp.Regexp | ||
| pgRegexpErr error |
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
the variable name pgRegexpErr should conform to the errXxx format (errname)
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.
PMM-10891
Build: Percona-Lab/pmm-submodules#2921
Contains also some changes/improvements for MySQL implementation of this.