Self review part deux

Signed-off-by: Matt Lord <[email protected]>

go/cmd/vtctldclient/command/vreplication/movetables/movetables.go

@@ -49,7 +49,7 @@ func registerCommands(root *cobra.Command) {
 	create.Flags().BoolVar(&createOptions.AtomicCopy, "atomic-copy", false, "(EXPERIMENTAL) A single copy phase is run for all tables from the source. Use this, for example, if your source keyspace has tables which use foreign key constraints.")
 	create.Flags().StringVar(&createOptions.WorkflowOptions.TenantId, "tenant-id", "", "(EXPERIMENTAL) The tenant ID to use for the MoveTables workflow into a multi-tenant keyspace.")
 	create.Flags().StringVar(&createOptions.WorkflowOptions.SourceKeyspaceAlias, "source-keyspace-alias", "", "(EXPERIMENTAL) Used currently only for multi-tenant migrations. This value will be used instead of the source keyspace name in the keyspace routing rules.")
-	create.Flags().BoolVar(&createOptions.WorkflowOptions.StripAutoIncrement, "strip-auto-increment", true, "If moving the table(s) to a sharded keyspace, remove any auto_increment clauses when copying the schema to the target as sharded keyspaces should rely on either user/application generated keys or Vitess sequences to ensure uniqueness.")
+	create.Flags().BoolVar(&createOptions.WorkflowOptions.StripShardedAutoIncrement, "remove-sharded-auto-increment", true, "If moving the table(s) to a sharded keyspace, remove any auto_increment clauses when copying the schema to the target as sharded keyspaces should rely on either user/application generated keys or Vitess sequences to ensure uniqueness.")
 	base.AddCommand(create)
 
 	opts := &common.SubCommandsOpts{

go/vt/vtctl/workflow/materializer.go

@@ -267,7 +267,7 @@ func (mz *materializer) deploySchema() error {
 	removeAutoInc := false
 	if mz.workflowType == binlogdatapb.VReplicationWorkflowType_MoveTables &&
 		(mz.targetVSchema != nil && mz.targetVSchema.Keyspace != nil && mz.targetVSchema.Keyspace.Sharded) &&
-		(mz.ms != nil && mz.ms.GetWorkflowOptions().GetStripAutoIncrement()) {
+		(mz.ms != nil && mz.ms.GetWorkflowOptions().GetStripShardedAutoIncrement()) {
 		removeAutoInc = true
 	}
 

proto/vtctldata.proto

@@ -209,7 +209,9 @@ message Shard {
 message WorkflowOptions {
   string tenant_id = 1;
   string source_keyspace_alias = 2;
-  bool strip_auto_increment = 3;
+  // Remove auto_increment clauses on tables when moving them to a sharded
+  // keyspace.
+  bool strip_sharded_auto_increment = 3;
 }
 
 // TODO: comment the hell out of this.