Skip to content

Allow enumeration in set system variables #6493

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

Merged
harshit-gangal merged 1 commit into from
Jul 29, 2020
Merged

Allow enumeration in set system variables #6493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions go/test/endtoend/vtgate/setstatement/sysvar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ func TestSetSysVar(t *testing.T) {
name: "default_storage_engine",
expr: "INNODB",
expected: `[[VARCHAR("InnoDB")]]`,
}, {
name: "character_set_client",
expr: "utf8",
expected: `[[VARCHAR("utf8")]]`,
}, {
name: "character_set_client", // ignored so will keep the actual value
expr: "@charvar",
expected: `[[VARCHAR("utf8")]]`,
}, {
name: "sql_mode",
expr: "''",
Expand Down
39 changes: 21 additions & 18 deletions go/vt/vtgate/executor_set_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,24 +179,6 @@ func TestExecutorSet(t *testing.T) {
}, {
in: "set autocommit = 1+1",
err: "invalid syntax: 1 + 1",
}, {
in: "set character_set_results=null",
out: &vtgatepb.Session{Autocommit: true},
}, {
in: "set character_set_results='binary'",
out: &vtgatepb.Session{Autocommit: true},
}, {
in: "set character_set_results='utf8'",
out: &vtgatepb.Session{Autocommit: true},
}, {
in: "set character_set_results='utf8mb4'",
out: &vtgatepb.Session{Autocommit: true},
}, {
in: "set character_set_results='latin1'",
out: &vtgatepb.Session{Autocommit: true},
}, {
in: "set character_set_results='abcd'",
err: "disallowed value for character_set_results: abcd",
}, {
in: "set foo = 1",
err: "unsupported construct: set foo = 1",
Expand Down Expand Up @@ -278,6 +260,13 @@ func TestExecutorSetOp(t *testing.T) {
sqltypes.MakeTestResult(sqltypes.MakeTestFields("unique_checks", "int64"), "0"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("net_write_timeout", "int64"), "600"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("net_read_timeout", "int64"), "300"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_client", "varchar"), "utf8"),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_results", "varchar")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_results", "varchar")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_results", "varchar")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_results", "varchar")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_results", "varchar")),
sqltypes.MakeTestResult(sqltypes.MakeTestFields("character_set_results", "varchar")),
})

testcases := []struct {
Expand Down Expand Up @@ -307,6 +296,20 @@ func TestExecutorSetOp(t *testing.T) {
in: "set net_write_timeout = 600",
}, {
in: "set net_read_timeout = 600",
}, {
in: "set character_set_client = utf8",
}, {
in: "set character_set_results=null",
}, {
in: "set character_set_results='binary'",
}, {
in: "set character_set_results='utf8'",
}, {
in: "set character_set_results=utf8mb4",
}, {
in: "set character_set_results='latin1'",
}, {
in: "set character_set_results='abcd'",
}}
for _, tcase := range testcases {
t.Run(tcase.in, func(t *testing.T) {
Expand Down
21 changes: 15 additions & 6 deletions go/vt/vtgate/planbuilder/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ var checkAndIgnore = []string{
"character_set_connection",
"character_set_database",
"character_set_filesystem",
"character_set_results",
"character_set_server",
"collation_connection",
"collation_database",
Expand Down Expand Up @@ -310,12 +311,9 @@ func buildNotSupported(e *sqlparser.SetExpr, _ ContextVSchema) (engine.SetOp, er
}

func buildSetOpIgnore(expr *sqlparser.SetExpr, _ ContextVSchema) (engine.SetOp, error) {
buf := sqlparser.NewTrackedBuffer(nil)
buf.Myprintf("%v", expr.Expr)

return &engine.SysVarIgnore{
Name: expr.Name.Lowered(),
Expr: buf.String(),
Expr: extractValue(expr),
}, nil
}

Expand All @@ -329,7 +327,7 @@ func buildSetOpCheckAndIgnore(expr *sqlparser.SetExpr, vschema ContextVSchema) (
Name: expr.Name.Lowered(),
Keyspace: keyspace,
TargetDestination: dest,
Expr: sqlparser.String(expr.Expr),
Expr: extractValue(expr),
}, nil
}

Expand Down Expand Up @@ -360,7 +358,7 @@ func buildSetOpVarSet(expr *sqlparser.SetExpr, vschema ContextVSchema) (engine.S
Name: expr.Name.Lowered(),
Keyspace: ks,
TargetDestination: vschema.Destination(),
Expr: sqlparser.String(expr.Expr),
Expr: extractValue(expr),
}, nil
}

Expand All @@ -377,6 +375,17 @@ func resolveDestination(vschema ContextVSchema) (*vindexes.Keyspace, key.Destina
return keyspace, dest, nil
}

func extractValue(expr *sqlparser.SetExpr) string {
value := sqlparser.String(expr.Expr)
switch colname := expr.Expr.(type) {
case *sqlparser.ColName:
if colname.Name.AtCount() == sqlparser.NoAt {
value = fmt.Sprintf("'%s'", value)
}
}
return value
}

// whitelist of functions knows to be safe to pass through to mysql for evaluation
// this list tries to not include functions that might return different results on different tablets
var validFuncs = map[string]interface{}{
Expand Down