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

Show anywhere plan fix to consider default keyspace #7531

Merged
merged 2 commits into from
Feb 22, 2021
Merged

Show anywhere plan fix to consider default keyspace #7531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b2fab5
show planner to use any keyspace over first sorted keyspace. First So…
harshit-gangal Feb 22, 2021
0b20eb9
fix show executor unit test
harshit-gangal Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion go/vt/vtgate/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ func TestExecutorShowColumns(t *testing.T) {

func TestExecutorShow(t *testing.T) {
executor, _, _, sbclookup := createLegacyExecutorEnv()
session := NewSafeSession(&vtgatepb.Session{TargetString: "@master"})
session := NewSafeSession(&vtgatepb.Session{TargetString: "TestExecutor"})

for _, query := range []string{"show vitess_keyspaces", "show keyspaces"} {
qr, err := executor.Execute(ctx, "TestExecute", session, query, nil)
Expand All @@ -459,6 +459,8 @@ func TestExecutorShow(t *testing.T) {
_, err = executor.Execute(ctx, "TestExecute", session, "show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'", nil)
require.NoError(t, err)

_, err = executor.Execute(ctx, "TestExecute", session, "use @master", nil)
require.NoError(t, err)
_, err = executor.Execute(ctx, "TestExecute", session, "show tables", nil)
assert.EqualError(t, err, "keyspace not specified", "'show tables' should fail without a keyspace")
assert.Empty(t, sbclookup.Queries, "sbclookup unexpectedly has queries already")
Expand Down
2 changes: 1 addition & 1 deletion go/vt/vtgate/planbuilder/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func buildCharsetPlan(show *sqlparser.ShowBasic) (engine.Primitive, error) {
}

func buildSendAnywherePlan(show *sqlparser.ShowBasic, vschema ContextVSchema) (engine.Primitive, error) {
ks, err := vschema.FirstSortedKeyspace()
ks, err := vschema.AnyKeyspace()
if err != nil {
return nil, err
}
Expand Down
2 changes: 0 additions & 2 deletions go/vt/vtgate/planbuilder/testdata/show_cases.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
}
}


# show variables
"show variables"
{
Expand All @@ -233,7 +232,6 @@
}
}


# show databases
"show databases"
{
Expand Down
18 changes: 18 additions & 0 deletions go/vt/vtgate/planbuilder/testdata/show_cases_no_default_keyspace.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,21 @@
"SingleShardOnly": true
}
}

# show variables
"show variables"
{
"QueryType": "SHOW",
"Original": "show variables",
"Instructions": {
"OperatorType": "Send",
"Keyspace": {
"Name": "main",
"Sharded": false
},
"TargetDestination": "AnyShard()",
"IsDML": false,
"Query": "show variables",
"SingleShardOnly": true
}
}