parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST #36285

lyzx2001 · 2022-07-18T13:20:11Z

What problem does this PR solve?

Issue Number: ref #36198

Problem Summary:
https://docs.pingcap.com/tidb/stable/sql-statement-admin-show-ddl#examples
Now the 'ADMIN SHOW DDL JOB QUERIES JOB_ID' command can only use JOB_ID to retrieve the last ten rows of DDL commands' content. Just like described in the website: 'You can only search the running DDL job corresponding to job_id within the last ten results in the DDL history job queue.'

Now I am adding a feature that the users can use commands like 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' to retrieve DDL commands' content within a certain range (n+1, n+m) that the users can assign themselves instead of only the last ten results.

This PR is the first step toward solving this issue. The details can refer to the following sections.

What is changed and how it works?

Now the function can support 3 types of SQL commands transferred to AST:

"admin show ddl job queries limit m" -> "ADMIN SHOW DDL JOB QUERIES LIMIT 0, m"
"admin show ddl job queries limit n, m" -> "ADMIN SHOW DDL JOB QUERIES LIMIT n, m"
"admin show ddl job queries limit m offset n" -> "ADMIN SHOW DDL JOB QUERIES LIMIT n, m"

where n and m are integers greater or equal to 0.

I wrote these syntaxes strictly according to MySQL's behavior, which can refer to https://dev.mysql.com/doc/refman/8.0/en/select.html

To support these three syntaxes, I constructed SelectStmtLimitSimple to implement corresponding restore functions. I also created a new struct LimitSimple to store Offset and Count (limit in SQL command).
SelectStmtLimitSimple and LimitSimple are just imitating SelectStmtLimit and Limit struct whose codes are right before them. The difference is I removed the forth option '"FETCH" FirstOrNext FetchFirstOpt RowOrRows "ONLY"' in SelectStmtLimitSimple, and changed the type LimitOption to Int64Num. I also initialized Offset to be 0, so that when an SQL command does not specify offset, the default output of offset would 0.
Then restore the commands to their corresponding forms. Pay attention to the order of offset and limit, which should conform to MySQL's syntax, and can be found in the link provided previously.

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No code

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

None

ti-chi-bot · 2022-07-18T13:20:13Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

bb7133
xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

sre-bot · 2022-07-18T13:20:20Z

All committers have signed the CLA.

sre-bot · 2022-07-18T13:20:52Z

Please follow PR Title Format:

pkg [, pkg2, pkg3]: what is changed

Or if the count of mainly changed packages are more than 3, use

*: what is changed

After you have format title, you can leave a comment /run-check_title to recheck it

lyzx2001 · 2022-07-18T13:24:50Z

/run-check_title

lance6716 · 2022-07-19T04:03:31Z

/cc @bb7133

Master was merged into branch issue36198, and issue36198 needs to be updated.

sre-bot · 2022-07-19T07:35:31Z

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/a856fda07b8c6ec50ac7be95c78555271080f876

lance6716

rest lgtm

parser/ast/misc.go

parser/parser.y

parser/ast/dml.go

parser/parser.y

parser/ast/dml.go

bb7133

LGTM

merge new changes in origin

lance6716 · 2022-07-22T06:17:55Z

/merge

ti-chi-bot · 2022-07-22T06:17:58Z

This pull request has been accepted and is ready to merge.

Commit hash: 6fdb317

sre-bot · 2022-07-22T09:21:43Z

TiDB MergeCI notify

🔴 Bad News! [1] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name	Result	Duration	Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test	🔴 failed 1, success 10, total 11	1 hr 3 min	Existing failure
idc-jenkins-ci/integration-cdc-test	🟢 all 36 tests passed	30 min	Existing passed
idc-jenkins-ci-tidb/common-test	🟢 all 12 tests passed	19 min	Existing passed
idc-jenkins-ci-tidb/tics-test	🟢 all 1 tests passed	7 min 53 sec	Existing passed
idc-jenkins-ci-tidb/integration-ddl-test	🟢 all 6 tests passed	6 min 53 sec	Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test	🟢 all 1 tests passed	6 min 36 sec	Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2	🟢 all 28 tests passed	5 min 48 sec	Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1	🟢 all 26 tests passed	5 min 29 sec	Existing passed
idc-jenkins-ci-tidb/mybatis-test	🟢 all 1 tests passed	3 min 32 sec	Existing passed
idc-jenkins-ci-tidb/plugin-test	🟢 build success, plugin test success	4min	Existing passed

…ip-init * upstream/master: (125 commits) infoschema: fix PromQL for `tidb_distsql_copr_cache` (pingcap#36450) test: stabilize TestTopSQLCPUProfile (pingcap#36468) parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST (pingcap#36285) *: enable flaky test for all test (pingcap#36385) expression: fix return type of agg func `bit_or` when handling varbinary column (pingcap#36415) executor: fix aggregating enum zero value gets different results from mysql (pingcap#36208) server: skip check tiflash version (pingcap#36451) *: Minor update to SECURITY.md to improved clarity (pingcap#36346) table partition: add telemetry for partition table (pingcap#36204) ddl: invalid multiple MAXVALUE partitions (pingcap#36329) (pingcap#36345) planner: Fixed `Merge` hint in nested CTE (pingcap#36432) metric: impove concurrency ddl metrics (pingcap#36405) planner: add more test cases for leading outer join (pingcap#36409) ddl: only set concurrent variable if no error (pingcap#36437) ddl: fix update panic in the middle of multi-schema change (pingcap#36421) session: Mising OptimizeWithPlanAndThenWarmUp in prepare-execute path (pingcap#36347) executor,metrics: add a metric for observing execution phases (pingcap#35906) br: unified docker image align with tidb (pingcap#36016) ddl: skip to close nil sessPool (pingcap#36425) log-backup: remove the timezone from log-date (pingcap#36369) ...

* upstream/master: (280 commits) infoschema: fix PromQL for `tidb_distsql_copr_cache` (pingcap#36450) test: stabilize TestTopSQLCPUProfile (pingcap#36468) parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST (pingcap#36285) *: enable flaky test for all test (pingcap#36385) expression: fix return type of agg func `bit_or` when handling varbinary column (pingcap#36415) executor: fix aggregating enum zero value gets different results from mysql (pingcap#36208) server: skip check tiflash version (pingcap#36451) *: Minor update to SECURITY.md to improved clarity (pingcap#36346) table partition: add telemetry for partition table (pingcap#36204) ddl: invalid multiple MAXVALUE partitions (pingcap#36329) (pingcap#36345) planner: Fixed `Merge` hint in nested CTE (pingcap#36432) metric: impove concurrency ddl metrics (pingcap#36405) planner: add more test cases for leading outer join (pingcap#36409) ddl: only set concurrent variable if no error (pingcap#36437) ddl: fix update panic in the middle of multi-schema change (pingcap#36421) session: Mising OptimizeWithPlanAndThenWarmUp in prepare-execute path (pingcap#36347) executor,metrics: add a metric for observing execution phases (pingcap#35906) br: unified docker image align with tidb (pingcap#36016) ddl: skip to close nil sessPool (pingcap#36425) log-backup: remove the timezone from log-date (pingcap#36369) ...

…rimary-key * upstream/master: (104 commits) br: fix compatibility issue with concurrent ddl (pingcap#36474) infoschema: fix PromQL for `tidb_distsql_copr_cache` (pingcap#36450) test: stabilize TestTopSQLCPUProfile (pingcap#36468) parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST (pingcap#36285) *: enable flaky test for all test (pingcap#36385) expression: fix return type of agg func `bit_or` when handling varbinary column (pingcap#36415) executor: fix aggregating enum zero value gets different results from mysql (pingcap#36208) server: skip check tiflash version (pingcap#36451) *: Minor update to SECURITY.md to improved clarity (pingcap#36346) table partition: add telemetry for partition table (pingcap#36204) ddl: invalid multiple MAXVALUE partitions (pingcap#36329) (pingcap#36345) planner: Fixed `Merge` hint in nested CTE (pingcap#36432) metric: impove concurrency ddl metrics (pingcap#36405) planner: add more test cases for leading outer join (pingcap#36409) ddl: only set concurrent variable if no error (pingcap#36437) ddl: fix update panic in the middle of multi-schema change (pingcap#36421) session: Mising OptimizeWithPlanAndThenWarmUp in prepare-execute path (pingcap#36347) executor,metrics: add a metric for observing execution phases (pingcap#35906) br: unified docker image align with tidb (pingcap#36016) ddl: skip to close nil sessPool (pingcap#36425) ...

transfer SQL commands to AST

cf57f7e

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 18, 2022

lyzx2001 changed the title ~~Add function that supports 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferred to AST~~ parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST Jul 18, 2022

Merge branch 'master' into issue36198

54cbdc2

ti-chi-bot requested a review from bb7133 July 19, 2022 04:03

lyzx2001 added 2 commits July 19, 2022 14:39

add changes in parser/parser.go

99e244e

Merge branch 'issue36198' of github.com:lyzx2001/tidb into issue36198

0238930

Master was merged into branch issue36198, and issue36198 needs to be updated.

ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 19, 2022

lance6716 reviewed Jul 19, 2022

View reviewed changes

parser/ast/misc.go Outdated Show resolved Hide resolved

Defined2014 reviewed Jul 19, 2022

View reviewed changes

parser/parser.y Outdated Show resolved Hide resolved

xhebox reviewed Jul 19, 2022

View reviewed changes

parser/ast/dml.go Outdated Show resolved Hide resolved

parser/parser.y Outdated Show resolved Hide resolved

parser/parser.y Outdated Show resolved Hide resolved

modified

2bf1739

xhebox approved these changes Jul 19, 2022

View reviewed changes

parser/ast/dml.go Outdated Show resolved Hide resolved

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 19, 2022

lyzx2001 added 2 commits July 19, 2022 17:49

changed LimitSimple position

78db95b

Merge branch 'master' into issue36198

a1c408c

ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 21, 2022

bb7133 approved these changes Jul 22, 2022

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 22, 2022

lyzx2001 added 2 commits July 22, 2022 14:02

solve merge conflict

1e583b4

Merge branch 'issue36198' of github.com:lyzx2001/tidb into issue36198

6fdb317

merge new changes in origin

ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2022

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 22, 2022

ti-chi-bot added 3 commits July 22, 2022 14:18

Merge branch 'master' into issue36198

8717bdb

Merge branch 'master' into issue36198

4699264

Merge branch 'master' into issue36198

a856fda

ti-chi-bot merged commit eaead02 into pingcap:master Jul 22, 2022

lyzx2001 mentioned this pull request Jul 22, 2022

executor: add syntax 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' to retrieve DDL commands within a certain range #36480

Merged

12 tasks

This was referenced Jul 26, 2022

Add new syntax 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' pingcap/docs-cn#10680

Merged

Add new syntax 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' pingcap/docs#9719

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST #36285

parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST #36285

lyzx2001 commented Jul 18, 2022

ti-chi-bot commented Jul 18, 2022 •

edited

Loading

sre-bot commented Jul 18, 2022 •

edited

Loading

sre-bot commented Jul 18, 2022

lyzx2001 commented Jul 18, 2022

lance6716 commented Jul 19, 2022

sre-bot commented Jul 19, 2022 •

edited

Loading

lance6716 left a comment

bb7133 left a comment

lance6716 commented Jul 22, 2022

ti-chi-bot commented Jul 22, 2022

sre-bot commented Jul 22, 2022

parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST #36285

parser: add support of 'ADMIN SHOW DDL JOB QUERIES LIMIT m OFFSET n' transferring to AST #36285

Conversation

lyzx2001 commented Jul 18, 2022

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Jul 18, 2022 • edited Loading

sre-bot commented Jul 18, 2022 • edited Loading

sre-bot commented Jul 18, 2022

lyzx2001 commented Jul 18, 2022

lance6716 commented Jul 19, 2022

sre-bot commented Jul 19, 2022 • edited Loading

lance6716 left a comment

Choose a reason for hiding this comment

bb7133 left a comment

Choose a reason for hiding this comment

lance6716 commented Jul 22, 2022

ti-chi-bot commented Jul 22, 2022

sre-bot commented Jul 22, 2022

TiDB MergeCI notify

ti-chi-bot commented Jul 18, 2022 •

edited

Loading

sre-bot commented Jul 18, 2022 •

edited

Loading

sre-bot commented Jul 19, 2022 •

edited

Loading