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

Add support for SHOW (DATABASES|VITESS_SHARDS|VITESS_TABLETS) LIKE #6750

Merged
merged 15 commits into from
Sep 28, 2020
Merged

Add support for SHOW (DATABASES|VITESS_SHARDS|VITESS_TABLETS) LIKE #6750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
74400ca
Update parser to support `SHOW DATABASES LIKE '%nnn%'
ajm188 Sep 19, 2020
49229f4
Add VITESS_KEYSPACES and KEYSPACES to keyword variables
ajm188 Sep 19, 2020
835e391
Use sqlparser types instead of raw strings
ajm188 Sep 19, 2020
32aa372
Add parser support for showing filtered tablets/shards
ajm188 Sep 19, 2020
2df54d6
Include filters
ajm188 Sep 19, 2020
4e20e01
Add support in the executor for `SHOW VITESS_SHARDS LIKE '...'`
ajm188 Sep 19, 2020
4f60721
Add support for filtering tablets by hostname
ajm188 Sep 19, 2020
935819e
Add log line to avoid deadbranch check, remove unused function
ajm188 Sep 19, 2020
7ff93ea
Update formatting for SHOW, add test cases
ajm188 Sep 21, 2020
72816d3
Add tests cases, ensure `rows` is never nil from showTablets
ajm188 Sep 21, 2020
ff51d90
Use `KeywordString`
ajm188 Sep 23, 2020
804d00c
Remove debug log lines, standardize actual log lines
ajm188 Sep 23, 2020
f2b437b
Update tests
ajm188 Sep 24, 2020
fe5986f
Update the rest of TestExecutorShow to use require/assert
ajm188 Sep 24, 2020
d1c5b4c
Merge remote-tracking branch 'upstream/master' into am_show_filtered_…
systay Sep 25, 2020
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
3 changes: 2 additions & 1 deletion go/vt/sqlparser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,8 @@ func (f *ForeignKeyDefinition) Format(buf *TrackedBuffer) {
// Format formats the node.
func (node *Show) Format(buf *TrackedBuffer) {
nodeType := strings.ToLower(node.Type)
if (nodeType == "tables" || nodeType == "columns" || nodeType == "fields" || nodeType == "index" || nodeType == "keys" || nodeType == "indexes") && node.ShowTablesOpt != nil {
if (nodeType == "tables" || nodeType == "columns" || nodeType == "fields" || nodeType == "index" || nodeType == "keys" || nodeType == "indexes" ||
nodeType == "databases" || nodeType == "keyspaces" || nodeType == "vitess_keyspaces" || nodeType == "vitess_shards" || nodeType == "vitess_tablets") && node.ShowTablesOpt != nil {
opt := node.ShowTablesOpt
if node.Extended != "" {
buf.astPrintf(node, "show %s%s", node.Extended, nodeType)
Expand Down
8 changes: 8 additions & 0 deletions go/vt/sqlparser/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,10 +1378,18 @@ var (
output: "show session variables",
}, {
input: "show vitess_keyspaces",
}, {
input: "show vitess_keyspaces like '%'",
}, {
input: "show vitess_shards",
}, {
input: "show vitess_shards like '%'",
}, {
input: "show vitess_tablets",
}, {
input: "show vitess_tablets like '%'",
}, {
input: "show vitess_tablets where hostname = 'some-tablet'",
}, {
input: "show vschema tables",
}, {
Expand Down
Loading