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

Remove deprecated IsSkipTopo() function #11377

Merged
merged 1 commit into from
Sep 28, 2022
Merged

Remove deprecated IsSkipTopo() function #11377

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
6 changes: 0 additions & 6 deletions go/vt/schema/ddl_strategy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,6 @@ func (setting *DDLStrategySetting) IsVreplicationTestSuite() bool {
return setting.hasFlag(vreplicationTestSuite)
}

// IsSkipTopoFlag returns 'true' if strategy options include `-skip-topo`. This flag is deprecated,
// and this function is temporary in v14 so that we can print a deprecation message.
func (setting *DDLStrategySetting) IsSkipTopoFlag() bool {
return setting.hasFlag(skipTopoFlag)
}

// RuntimeOptions returns the options used as runtime flags for given strategy, removing any internal hint options
func (setting *DDLStrategySetting) RuntimeOptions() []string {
opts, _ := shlex.Split(setting.Options)
Expand Down
6 changes: 0 additions & 6 deletions go/vt/vtctl/vtctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3081,12 +3081,6 @@ func commandApplySchema(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl
return fmt.Errorf("the <keyspace> argument is required for the commandApplySchema command")
}

// v14 deprecates `--skip-topo` flag. This check will be removed in v15
if settings, _ := schema.ParseDDLStrategy(*ddlStrategy); settings != nil && settings.IsSkipTopoFlag() {
deprecationMessage := `--skip-topo flag is deprecated and will be removed in v15`
log.Warningf(deprecationMessage)
}

keyspace := subFlags.Arg(0)
change, err := getFileParam(*sql, *sqlFile, "sql")
if err != nil {
Expand Down