Skip to content

vtctl: Allow ALTER VITESS_MIGRATION commands in sharded environment #9458

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
deepthi merged 2 commits into from
Jan 5, 2022
Merged

vtctl: Allow ALTER VITESS_MIGRATION commands in sharded environment #9458

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8fb41b
vtctl: Allow ALTER VITESS_MIGRATION commands in sharded environment
shlomi-noach Jan 4, 2022
e2cce1d
test 'vtctlclient ApplySchema -sql "ALTER VITESS_MIGRATION..."' query…
shlomi-noach Jan 5, 2022
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
13 changes: 8 additions & 5 deletions go/vt/schemamanager/tablet_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (exec *TabletExecutor) Validate(ctx context.Context, sqls []string) error {

// We ignore DATABASE-level DDLs here because detectBigSchemaChanges doesn't
// look at them anyway.
parsedDDLs, _, _, err := exec.parseDDLs(sqls)
parsedDDLs, _, _, _, err := exec.parseDDLs(sqls)
if err != nil {
return err
}
Expand All @@ -162,14 +162,15 @@ func (exec *TabletExecutor) Validate(ctx context.Context, sqls []string) error {
return err
}

func (exec *TabletExecutor) parseDDLs(sqls []string) ([]sqlparser.DDLStatement, []sqlparser.DBDDLStatement, [](*sqlparser.RevertMigration), error) {
func (exec *TabletExecutor) parseDDLs(sqls []string) ([]sqlparser.DDLStatement, []sqlparser.DBDDLStatement, [](*sqlparser.RevertMigration), [](*sqlparser.AlterMigration), error) {
parsedDDLs := make([]sqlparser.DDLStatement, 0)
parsedDBDDLs := make([]sqlparser.DBDDLStatement, 0)
revertStatements := make([](*sqlparser.RevertMigration), 0)
alterMigrationStatements := make([](*sqlparser.AlterMigration), 0)
for _, sql := range sqls {
stmt, err := sqlparser.Parse(sql)
if err != nil {
return nil, nil, nil, fmt.Errorf("failed to parse sql: %s, got error: %v", sql, err)
return nil, nil, nil, nil, fmt.Errorf("failed to parse sql: %s, got error: %v", sql, err)
}
switch stmt := stmt.(type) {
case sqlparser.DDLStatement:
Expand All @@ -178,13 +179,15 @@ func (exec *TabletExecutor) parseDDLs(sqls []string) ([]sqlparser.DDLStatement,
parsedDBDDLs = append(parsedDBDDLs, stmt)
case *sqlparser.RevertMigration:
revertStatements = append(revertStatements, stmt)
case *sqlparser.AlterMigration:
alterMigrationStatements = append(alterMigrationStatements, stmt)
default:
if len(exec.tablets) != 1 {
return nil, nil, nil, fmt.Errorf("non-ddl statements can only be executed for single shard keyspaces: %s", sql)
return nil, nil, nil, nil, fmt.Errorf("non-ddl statements can only be executed for single shard keyspaces: %s", sql)
}
}
}
return parsedDDLs, parsedDBDDLs, revertStatements, nil
return parsedDDLs, parsedDBDDLs, revertStatements, alterMigrationStatements, nil
}

// IsOnlineSchemaDDL returns true if we expect to run a online schema change DDL
Expand Down