diff --git a/pkg/sql/alter_sequence.go b/pkg/sql/alter_sequence.go index b64646044c71..321561e19507 100644 --- a/pkg/sql/alter_sequence.go +++ b/pkg/sql/alter_sequence.go @@ -148,7 +148,7 @@ func alterSequenceImpl( // // The code below handles the second case. - if opts.Increment < 0 && (oldIncrement != seqDesc.SequenceOpts.Increment || oldMinValue != seqDesc.SequenceOpts.MinValue) { + if opts.Increment < 0 && (oldIncrement != seqDesc.SequenceOpts.Increment || seqDesc.SequenceOpts.MinValue < oldMinValue) { // Only get the sequence value from KV if it's needed. sequenceVal, err := getSequenceValue() if err != nil { @@ -209,13 +209,13 @@ func alterSequenceImpl( } } if restartVal != nil { - // Using RESTART on a sequence should always cause the operation to run - // in the current transaction. This is achieved by treating the sequence - // as if it were just created. - if err := params.p.createdSequences.addCreatedSequence(seqDesc.ID); err != nil { - return err + var err error + if opts.Increment != 0 { + err = setSequenceVal(*restartVal - opts.Increment) + } else { + err = setSequenceVal(*restartVal - oldIncrement) } - if err := params.p.SetSequenceValueByID(params.ctx, uint32(seqDesc.ID), *restartVal, false); err != nil { + if err != nil { return err } } diff --git a/pkg/sql/alter_table.go b/pkg/sql/alter_table.go index 6b1a000a55a9..0a10a23ab989 100644 --- a/pkg/sql/alter_table.go +++ b/pkg/sql/alter_table.go @@ -11,6 +11,7 @@ import ( gojson "encoding/json" "fmt" "sort" + "strings" "time" "github.com/cockroachdb/cockroach/pkg/build" @@ -1267,7 +1268,7 @@ func applyColumnMutation( return err } - // Alter referenced sequence for identity with sepcified option. + // Alter referenced sequence for identity with specified option. // Does not override existing values if not specified. if err := alterSequenceImpl(params, seqDesc, t.SeqOptions, t); err != nil { return err @@ -1288,7 +1289,7 @@ func applyColumnMutation( if opts.Virtual { optsNode = append(optsNode, tree.SequenceOption{Name: tree.SeqOptVirtual}) } - s := tree.Serialize(&optsNode) + s := strings.TrimSpace(tree.Serialize(&optsNode)) col.ColumnDesc().GeneratedAsIdentitySequenceOption = &s case *tree.AlterTableDropIdentity: diff --git a/pkg/sql/catalog/schemaexpr/sequence_options.go b/pkg/sql/catalog/schemaexpr/sequence_options.go index ab4ca882e5d4..6a597cf79b9a 100644 --- a/pkg/sql/catalog/schemaexpr/sequence_options.go +++ b/pkg/sql/catalog/schemaexpr/sequence_options.go @@ -274,3 +274,21 @@ func AssignSequenceOptions( } return nil } + +// DefaultSequenceOptions is a helper that returns the default sequence options. +// It panics on error. +func DefaultSequenceOptions() descpb.TableDescriptor_SequenceOpts { + defaultOpts := descpb.TableDescriptor_SequenceOpts{ + Increment: 1, + } + if err := AssignSequenceOptions(&defaultOpts, + nil, /* optsNode */ + 64, + true, /* setDefaults */ + nil, /* existingTypes */ + ); err != nil { + panic(err) + } + + return defaultOpts +} diff --git a/pkg/sql/logictest/testdata/logic_test/alter_table b/pkg/sql/logictest/testdata/logic_test/alter_table index 19d073772603..4640ee5f3f60 100644 --- a/pkg/sql/logictest/testdata/logic_test/alter_table +++ b/pkg/sql/logictest/testdata/logic_test/alter_table @@ -4401,7 +4401,7 @@ statement ok INSERT INTO t_alter_identity DEFAULT VALUES; statement ok -ALTER TABLE t_alter_identity ALTER COLUMN b SET MAXVALUE 40 RESTART WITH 20 SET CACHE 5 SET INCREMENT BY 2 +ALTER TABLE t_alter_identity ALTER COLUMN b SET MAXVALUE 40 RESTART WITH 20 SET CACHE 5 SET INCREMENT BY 2; statement ok INSERT INTO t_alter_identity DEFAULT VALUES; @@ -4415,8 +4415,76 @@ SELECT b from t_alter_identity ORDER BY b; 1 5 9 -18 20 +22 + +# TODO(21564): Enable this test when `ALTER COLUMN` on options updates the value of a sequence +# subtest issue-52552 +# +# statement ok +# CREATE TABLE test_52552_asc (c1 int GENERATED ALWAYS AS IDENTITY); +# ALTER TABLE test_52552_asc ALTER COLUMN c1 SET INCREMENT 3 SET MINVALUE 1 SET MAXVALUE 12; +# ALTER TABLE test_52552_asc ALTER COLUMN c1 SET INCREMENT 8 SET MINVALUE 1 SET MAXVALUE 12; +# INSERT INTO test_52552_asc DEFAULT VALUES; +# +# query I +# SELECT c1 FROM test_52552_asc +# ---- +# 8 +# +# statement error pq: reached maximum value of sequence "test_52552_asc_c1_seq" \(12\) +# INSERT INTO test_52552_asc DEFAULT VALUES; +# +# statement error pq: reached maximum value of sequence "test_52552_asc_c1_seq" \(12\) +# INSERT INTO test_52552_asc DEFAULT VALUES; +# +# statement ok +# ALTER TABLE test_52552_asc ALTER COLUMN c1 SET NO MAXVALUE; +# INSERT INTO test_52552_asc DEFAULT VALUES; +# +# query I nosort +# SELECT c1 FROM test_52552_asc +# ---- +# 8 +# 32 +# +# statement ok +# CREATE TABLE test_52552_desc (c1 int GENERATED ALWAYS AS IDENTITY); +# ALTER TABLE test_52552_desc ALTER COLUMN c1 SET INCREMENT -5 SET MINVALUE 1 SET MAXVALUE 12; +# ALTER TABLE test_52552_desc ALTER COLUMN c1 SET INCREMENT -8 SET MINVALUE 1 SET MAXVALUE 12; +# INSERT INTO test_52552_desc DEFAULT VALUES; +# +# query I +# SELECT c1 FROM test_52552_desc +# ---- +# 8 +# +# statement error pq: reached minimum value of sequence "test_52552_desc_seq" \(1\) +# INSERT INTO test_52552_desc DEFAULT VALUES; +# +# statement error pq: reached minimum value of sequence "test_52552_desc_seq" \(1\) +# INSERT INTO test_52552_desc DEFAULT VALUES; +# +# statement ok +# ALTER TABLE test_52552_desc ALTER COLUMN c1 SET NO MINVALUE; +# INSERT INTO test_52552_desc DEFAULT VALUES; +# +# query I nosort +# SELECT c1 FROM test_52552_desc +# ---- +# -4 +# +# statement ok +# CREATE TABLE test_52552_start INCREMENT BY 3 MINVALUE 1 MAXVALUE 100 START 50; +# ALTER SEQUENCE test_52552_start INCREMENT BY 8; +# INSERT INTO test_52552_desc DEFAULT VALUES; +# +# query I +# SELECT nextval('test_52552_start'); +# ---- +# 50 +# +# subtest end statement ok CREATE TABLE t_identity_drop (a int GENERATED ALWAYS AS IDENTITY (START WITH 10), b int GENERATED BY DEFAULT AS IDENTITY); diff --git a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/BUILD.bazel b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/BUILD.bazel index 6be8e9b2fee7..af321b0fa0a6 100644 --- a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/BUILD.bazel +++ b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/BUILD.bazel @@ -10,6 +10,7 @@ go_library( "alter_table_alter_column_add_identity.go", "alter_table_alter_column_drop_not_null.go", "alter_table_alter_column_drop_stored.go", + "alter_table_alter_column_identity.go", "alter_table_alter_column_set_default.go", "alter_table_alter_column_set_identity.go", "alter_table_alter_column_set_not_null.go", diff --git a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table.go b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table.go index 9074f7098d4f..bd24a597ccc6 100644 --- a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table.go +++ b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table.go @@ -47,6 +47,7 @@ var supportedAlterTableStatements = map[reflect.Type]supportedAlterTableCommand{ reflect.TypeOf((*tree.AlterTableRenameConstraint)(nil)): {fn: alterTableRenameConstraint, on: true, checks: isV261Active}, reflect.TypeOf((*tree.AlterTableSetIdentity)(nil)): {fn: alterTableSetIdentity, on: true, checks: isV261Active}, reflect.TypeOf((*tree.AlterTableAddIdentity)(nil)): {fn: alterTableAddIdentity, on: true, checks: isV261Active}, + reflect.TypeOf((*tree.AlterTableIdentity)(nil)): {fn: alterTableAlterColumnIdentity, on: true, checks: isV261Active}, } func init() { diff --git a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_add_column.go b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_add_column.go index 702af73b2545..d14fab46385c 100644 --- a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_add_column.go +++ b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_add_column.go @@ -293,7 +293,7 @@ func alterTableAddColumn( seqOptions = *ptr } // Versions from 26.1 GeneratedAsIdentity will have a separate element for - // GeneratedAsIdentity. Older versios store it in the column element. + // GeneratedAsIdentity. Older versions store it in the column element. if spec.colType.ElementCreationMetadata.In_26_1OrLater { spec.generatedAsID = &scpb.ColumnGeneratedAsIdentity{ TableID: tbl.TableID, diff --git a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_identity.go b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_identity.go new file mode 100644 index 000000000000..336b56f8e739 --- /dev/null +++ b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_identity.go @@ -0,0 +1,226 @@ +// Copyright 2025 The Cockroach Authors. +// +// Use of this software is governed by the CockroachDB Software License +// included in the /LICENSE file. + +package scbuildstmt + +import ( + "fmt" + "reflect" + "strconv" + "strings" + + "github.com/cockroachdb/cockroach/pkg/sql/catalog/schemaexpr" + "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" + "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" + "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" +) + +func alterTableAlterColumnIdentity( + b BuildCtx, tn *tree.TableName, tbl *scpb.Table, stmt tree.Statement, t *tree.AlterTableIdentity, +) { + alterColumnPreChecks(b, tn, tbl, t.Column) + + columnID := getColumnIDFromColumnName(b, tbl.TableID, t.Column, true /* required */) + // Block alters on system columns. + column := mustRetrieveColumnElem(b, tbl.TableID, columnID) + panicIfSystemColumn(column, t.Column) + + sequenceOwner := b.QueryByID(tbl.TableID).FilterSequenceOwner().Filter(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.SequenceOwner) bool { + return e.TableID == tbl.TableID && e.ColumnID == columnID + }).MustGetZeroOrOneElement() + if sequenceOwner == nil { + panic(pgerror.Newf( + pgcode.ObjectNotInPrerequisiteState, + "column %q of relation %q is not an identity column", tree.ErrString(&t.Column), tree.ErrString(&tn.ObjectName), + )) + } + + // Get the current sequence options from elements and defaults. + currentOpts := schemaexpr.DefaultSequenceOptions() + b.QueryByID(sequenceOwner.SequenceID).FilterSequenceOption().ForEach(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.SequenceOption) { + var err error + switch name := e.Key; name { + case tree.SeqOptAs: + currentOpts.AsIntegerType = e.Value + case tree.SeqOptCacheNode: + currentOpts.NodeCacheSize, err = strconv.ParseInt(e.Value, 10, 64) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + case tree.SeqOptCacheSession: + currentOpts.SessionCacheSize, err = strconv.ParseInt(e.Value, 10, 64) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + case tree.SeqOptIncrement: + currentOpts.Increment, err = strconv.ParseInt(e.Value, 10, 64) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + case tree.SeqOptMinValue: + currentOpts.MinValue, err = strconv.ParseInt(e.Value, 10, 64) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + case tree.SeqOptMaxValue: + currentOpts.MaxValue, err = strconv.ParseInt(e.Value, 10, 64) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + case tree.SeqOptStart: + currentOpts.Start, err = strconv.ParseInt(e.Value, 10, 64) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + case tree.SeqOptVirtual: + currentOpts.Virtual, err = strconv.ParseBool(e.Value) + if err != nil { + panic(pgerror.Wrapf(err, pgcode.Internal, "invalid sequence option value for %q", name)) + } + default: + panic(pgerror.Newf(pgcode.Internal, "unexpected sequence option %q", name)) + } + }) + + // And the final state for the sequence options. + updatedOpts := currentOpts + if err := schemaexpr.AssignSequenceOptions(&updatedOpts, + t.SeqOptions, + 64, + false, /* setDefaults */ + nil, /* existingTypes */ + ); err != nil { + panic(pgerror.Wrap( + err, + pgcode.FeatureNotSupported, + "", /* message */ + )) + } + + defaultOpts := schemaexpr.DefaultSequenceOptions() + + updateElement := func(key string, defaultValue, value interface{}) { + newSeqOption := scpb.SequenceOption{ + SequenceID: sequenceOwner.SequenceID, + Key: key, + Value: fmt.Sprintf("%v", value), + } + + oldSeqOption := b.QueryByID(sequenceOwner.SequenceID).FilterSequenceOption().Filter(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.SequenceOption) bool { + return e.Key == key + }).MustGetZeroOrOneElement() + if oldSeqOption != nil { + // Skip a noop update. + if oldSeqOption.Value == newSeqOption.Value { + return + } + b.Drop(oldSeqOption) + } + + // Skip setting to default values. + if reflect.DeepEqual(defaultValue, value) { + return + } + + b.Add(&newSeqOption) + } + + var updateSequenceValue bool + var restartWith int64 + var useRestartWith bool + for _, opt := range t.SeqOptions { + switch name := opt.Name; name { + case tree.SeqOptAs: + updateElement(name, defaultOpts.AsIntegerType, updatedOpts.AsIntegerType) + case tree.SeqOptCacheNode: + updateElement(name, defaultOpts.NodeCacheSize, updatedOpts.NodeCacheSize) + case tree.SeqOptCacheSession: + updateElement(name, defaultOpts.SessionCacheSize, updatedOpts.SessionCacheSize) + case tree.SeqOptIncrement: + updateElement(name, defaultOpts.Increment, updatedOpts.Increment) + updateSequenceValue = true + case tree.SeqOptMinValue: + updateElement(name, defaultOpts.MinValue, updatedOpts.MinValue) + updateSequenceValue = true + case tree.SeqOptMaxValue: + updateElement(name, defaultOpts.MaxValue, updatedOpts.MaxValue) + updateSequenceValue = true + case tree.SeqOptStart: + updateElement(name, defaultOpts.Start, updatedOpts.Start) + updateSequenceValue = true + case tree.SeqOptVirtual: + updateElement(name, defaultOpts.Virtual, updatedOpts.Virtual) + case tree.SeqOptRestart: + useRestartWith = true + if opt.IntVal != nil { + restartWith = *opt.IntVal + } else { + restartWith = updatedOpts.Start + } + default: + panic(fmt.Sprintf("unexpected sequence option: %q", name)) + } + } + + if useRestartWith { + restartSeqOption := scpb.SequenceOption{ + SequenceID: sequenceOwner.SequenceID, + Key: tree.SeqOptRestart, + Value: fmt.Sprintf("%v", restartWith-updatedOpts.Increment), + } + b.AddTransient(&restartSeqOption) + } else if updateSequenceValue { + // TODO(21564): Update the sequence value when changes in options expose implementation. + } + + var seqOptions tree.SequenceOptions + if updatedOpts.SessionCacheSize != defaultOpts.SessionCacheSize { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptCacheSession, IntVal: &updatedOpts.SessionCacheSize}) + } + if updatedOpts.NodeCacheSize != defaultOpts.NodeCacheSize { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptCacheNode, IntVal: &updatedOpts.NodeCacheSize}) + } + if updatedOpts.MinValue != defaultOpts.MinValue { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptMinValue, IntVal: &updatedOpts.MinValue}) + } + if updatedOpts.MaxValue != defaultOpts.MaxValue { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptMaxValue, IntVal: &updatedOpts.MaxValue}) + } + if updatedOpts.Increment != defaultOpts.Increment { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptIncrement, IntVal: &updatedOpts.Increment}) + } + if updatedOpts.Start != defaultOpts.Start { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptStart, IntVal: &updatedOpts.Start}) + } + if updatedOpts.Virtual != defaultOpts.Virtual { + seqOptions = append(seqOptions, tree.SequenceOption{Name: tree.SeqOptVirtual}) + } + seqOptionsString := strings.TrimSpace(tree.Serialize(&seqOptions)) + + columnType := b.QueryByID(tbl.TableID).FilterColumnType().Filter(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.ColumnType) bool { + return e.ColumnID == sequenceOwner.ColumnID + }).MustGetOneElement() + + if columnType.ElementCreationMetadata.In_26_1OrLater { + oldColumnGeneratedAsIdentity := b.QueryByID(tbl.TableID).FilterColumnGeneratedAsIdentity().Filter(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.ColumnGeneratedAsIdentity) bool { + return e.ColumnID == sequenceOwner.ColumnID + }).MustGetOneElement() + + if oldColumnGeneratedAsIdentity.SequenceOption != seqOptionsString { + b.Drop(oldColumnGeneratedAsIdentity) + newColumnGeneratedAsIdentity := *oldColumnGeneratedAsIdentity + newColumnGeneratedAsIdentity.SequenceOption = seqOptionsString + b.Add(&newColumnGeneratedAsIdentity) + } + } else { + if column.GeneratedAsIdentitySequenceOption != seqOptionsString { + b.Drop(column) + newColumn := *column + newColumn.GeneratedAsIdentitySequenceOption = seqOptionsString + b.Add(&newColumn) + } + } +} diff --git a/pkg/sql/schemachanger/scbuild/testdata/alter_table_add_column b/pkg/sql/schemachanger/scbuild/testdata/alter_table_add_column index b9a259104008..732c78f44297 100644 --- a/pkg/sql/schemachanger/scbuild/testdata/alter_table_add_column +++ b/pkg/sql/schemachanger/scbuild/testdata/alter_table_add_column @@ -361,7 +361,7 @@ ALTER TABLE defaultdb.foo ADD COLUMN j INT GENERATED ALWAYS AS IDENTITY {columnId: 2, elementCreationMetadata: {in243OrLater: true, in261OrLater: true}, tableId: 104, type: {family: IntFamily, oid: 20, width: 64}, typeName: INT8} - [[ColumnDefaultExpression:{DescID: 104, ColumnID: 2, ReferencedSequenceIDs: [107], Expr: nextval(107:::REGCLASS)}, PUBLIC], ABSENT] {columnId: 2, expr: 'nextval(107:::REGCLASS)', tableId: 104, usesSequenceIds: [107]} -- [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, GeneratedAsIdentityType: GENERATED_ALWAYS, Value: }, PUBLIC], ABSENT] +- [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, Value: , GeneratedAsIdentityType: GENERATED_ALWAYS}, PUBLIC], ABSENT] {columnId: 2, tableId: 104, type: 1} - [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], ABSENT] {constraintId: 2, indexId: 2, isUnique: true, sourceIndexId: 1, tableId: 104, temporaryIndexId: 3} @@ -405,7 +405,7 @@ ALTER TABLE defaultdb.foo ADD COLUMN j SERIAL GENERATED ALWAYS AS IDENTITY {columnId: 2, elementCreationMetadata: {in243OrLater: true, in261OrLater: true}, tableId: 104, type: {family: IntFamily, oid: 20, width: 64}, typeName: INT8} - [[ColumnDefaultExpression:{DescID: 104, ColumnID: 2, Expr: unique_rowid()}, PUBLIC], ABSENT] {columnId: 2, expr: unique_rowid(), tableId: 104} -- [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, GeneratedAsIdentityType: GENERATED_ALWAYS, Value: }, PUBLIC], ABSENT] +- [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, Value: , GeneratedAsIdentityType: GENERATED_ALWAYS}, PUBLIC], ABSENT] {columnId: 2, tableId: 104, type: 1} - [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], ABSENT] {constraintId: 2, indexId: 2, isUnique: true, sourceIndexId: 1, tableId: 104, temporaryIndexId: 3} diff --git a/pkg/sql/schemachanger/scbuild/testdata/create_sequence b/pkg/sql/schemachanger/scbuild/testdata/create_sequence index 4d27705d8f9c..ee11a9d4a1b3 100644 --- a/pkg/sql/schemachanger/scbuild/testdata/create_sequence +++ b/pkg/sql/schemachanger/scbuild/testdata/create_sequence @@ -14,7 +14,7 @@ CREATE SEQUENCE db.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT {childObjectId: 107, schemaId: 105} - [[TableData:{DescID: 107, ReferencedDescID: 104}, PUBLIC], ABSENT] {databaseId: 104, tableId: 107} -- [[SequenceOption:{DescID: 107, Name: START}, PUBLIC], ABSENT] +- [[SequenceOption:{DescID: 107, Name: START, Value: 32}, PUBLIC], ABSENT] {key: START, sequenceId: 107, value: "32"} - [[IndexData:{DescID: 106, IndexID: 1}, PUBLIC], PUBLIC] {indexId: 1, tableId: 106} diff --git a/pkg/sql/schemachanger/scdecomp/decomp.go b/pkg/sql/schemachanger/scdecomp/decomp.go index 81433e884581..ebb30aa0e675 100644 --- a/pkg/sql/schemachanger/scdecomp/decomp.go +++ b/pkg/sql/schemachanger/scdecomp/decomp.go @@ -238,18 +238,7 @@ func GetSequenceOptions( sequenceID descpb.ID, opts *descpb.TableDescriptor_SequenceOpts, ) []*scpb.SequenceOption { // Compute the default sequence options. - defaultOpts := descpb.TableDescriptor_SequenceOpts{ - Increment: 1, - } - err := schemaexpr.AssignSequenceOptions(&defaultOpts, - nil, - 64, - true, - nil, - ) - if err != nil { - panic(err) - } + defaultOpts := schemaexpr.DefaultSequenceOptions() var sequenceOptions []*scpb.SequenceOption addSequenceOption := func(key string, defaultValue, value interface{}) { // Nil or empty values can be skipped. Or values which diff --git a/pkg/sql/schemachanger/scdeps/exec_deps.go b/pkg/sql/schemachanger/scdeps/exec_deps.go index 2e04d37aa1d9..053cddb1b914 100644 --- a/pkg/sql/schemachanger/scdeps/exec_deps.go +++ b/pkg/sql/schemachanger/scdeps/exec_deps.go @@ -412,7 +412,7 @@ func (d *txnDeps) Run(ctx context.Context) error { return nil } -// InitializeSequence implements the scexec.Caatalog interface. +// InitializeSequence implements the scexec.Catalog interface. func (d *txnDeps) InitializeSequence(ctx context.Context, id descpb.ID, startVal int64) error { batch, err := d.getOrCreateBatch(ctx) if err != nil { @@ -423,6 +423,17 @@ func (d *txnDeps) InitializeSequence(ctx context.Context, id descpb.ID, startVal return nil } +// SetSequence implements the scexec.Catalog interface. +func (d *txnDeps) SetSequence(ctx context.Context, seq *scexec.SequenceToSet) error { + batch, err := d.getOrCreateBatch(ctx) + if err != nil { + return err + } + sequenceKey := d.codec.SequenceKey(uint32(seq.ID)) + batch.PutMustAcquireExclusiveLock(sequenceKey, seq.Value) + return nil +} + // CheckMaxSchemaObjects implements the scexec.Catalog interface. func (d *txnDeps) CheckMaxSchemaObjects(ctx context.Context, numNewObjects int) error { return schemaobjectlimit.CheckMaxSchemaObjects( @@ -445,14 +456,23 @@ func (d *txnDeps) Reset(ctx context.Context) error { // maybeFlushBatch flushes the current batch if it exceeds the maximum size. func (d *txnDeps) maybeFlushBatch(ctx context.Context) error { if int64(d.batch.ApproximateMutationBytes()) > batchFlushThresholdSize.Get(&d.settings.SV) { - if err := d.Run(ctx); err != nil { + err := d.flushBatch(ctx) + if err != nil { return err } - d.batch = d.txn.KV().NewBatch() } return nil } +// flushBatch flushes the current batch. +func (d *txnDeps) flushBatch(ctx context.Context) error { + if err := d.Run(ctx); err != nil { + return err + } + d.batch = d.txn.KV().NewBatch() + return nil +} + func (d *txnDeps) getOrCreateBatch(ctx context.Context) (*kv.Batch, error) { if d.batch == nil { d.batch = d.txn.KV().NewBatch() diff --git a/pkg/sql/schemachanger/scdeps/sctestdeps/test_deps.go b/pkg/sql/schemachanger/scdeps/sctestdeps/test_deps.go index 17f921943253..edbb9528f335 100644 --- a/pkg/sql/schemachanger/scdeps/sctestdeps/test_deps.go +++ b/pkg/sql/schemachanger/scdeps/sctestdeps/test_deps.go @@ -1548,6 +1548,11 @@ func (s *TestState) InitializeSequence(ctx context.Context, id descpb.ID, startV return nil } +func (s *TestState) SetSequence(ctx context.Context, seq *scexec.SequenceToSet) error { + s.LogSideEffectf("sequence %d value to %d", seq.ID, seq.Value) + return nil +} + // CheckMaxSchemaObjects is part of the scexec.Catalog interface. func (s *TestState) CheckMaxSchemaObjects(ctx context.Context, numNewObjects int) error { // In tests, we don't enforce the limit. diff --git a/pkg/sql/schemachanger/scexec/dependencies.go b/pkg/sql/schemachanger/scexec/dependencies.go index ea7453f98622..7dc056a0be14 100644 --- a/pkg/sql/schemachanger/scexec/dependencies.go +++ b/pkg/sql/schemachanger/scexec/dependencies.go @@ -120,6 +120,9 @@ type Catalog interface { // InitializeSequence initializes the initial value for a sequence. InitializeSequence(ctx context.Context, id descpb.ID, startVal int64) error + // SetSequence sets a sequence to the given value. + SetSequence(ctx context.Context, seq *SequenceToSet) error + // CheckMaxSchemaObjects checks if the number of schema objects in the // cluster plus the new objects being created would exceed the configured // limit. Returns an error if the limit would be exceeded. diff --git a/pkg/sql/schemachanger/scexec/exec_immediate_mutation.go b/pkg/sql/schemachanger/scexec/exec_immediate_mutation.go index 5a814578544f..6c6a38ca31a5 100644 --- a/pkg/sql/schemachanger/scexec/exec_immediate_mutation.go +++ b/pkg/sql/schemachanger/scexec/exec_immediate_mutation.go @@ -27,6 +27,7 @@ type immediateState struct { addedNames map[descpb.ID]descpb.NameInfo withReset bool sequencesToInit []sequenceToInit + sequencesToSet []SequenceToSet temporarySchemasToRegister map[descpb.ID]*temporarySchemaToRegister modifiedZoneConfigs []zoneConfigToUpsert modifiedSubzoneConfigs map[descpb.ID][]subzoneConfigToUpsert @@ -51,6 +52,11 @@ type sequenceToInit struct { startVal int64 } +type SequenceToSet struct { + ID descpb.ID + Value int64 +} + // zoneConfigToUpsert is a struct that holds the information needed to update a // zone config. This does not include subzone configs -- which are handled in // subzoneConfigToUpsert. @@ -150,6 +156,13 @@ func (s *immediateState) InitSequence(id descpb.ID, startVal int64) { }) } +func (s *immediateState) SetSequence(id descpb.ID, value int64) { + s.sequencesToSet = append(s.sequencesToSet, SequenceToSet{ + ID: id, + Value: value, + }) +} + func (s *immediateState) UpdateZoneConfig(id descpb.ID, zc *zonepb.ZoneConfig) { s.modifiedZoneConfigs = append(s.modifiedZoneConfigs, zoneConfigToUpsert{ @@ -276,6 +289,11 @@ func (s *immediateState) exec(ctx context.Context, c Catalog) error { return err } } + for _, seq := range s.sequencesToSet { + if err := c.SetSequence(ctx, &seq); err != nil { + return err + } + } for tempIdxId, tempIdxToRegister := range s.temporarySchemasToRegister { c.InsertTemporarySchema(tempIdxToRegister.schemaName, tempIdxToRegister.parentID, tempIdxId) } diff --git a/pkg/sql/schemachanger/scexec/mocks_generated_test.go b/pkg/sql/schemachanger/scexec/mocks_generated_test.go index e0ce2aee7fa0..63684316d786 100644 --- a/pkg/sql/schemachanger/scexec/mocks_generated_test.go +++ b/pkg/sql/schemachanger/scexec/mocks_generated_test.go @@ -275,6 +275,20 @@ func (mr *MockCatalogMockRecorder) Run(arg0 interface{}) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockCatalog)(nil).Run), arg0) } +// SetSequence mocks base method. +func (m *MockCatalog) SetSequence(arg0 context.Context, arg1 *scexec.SequenceToSet) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SetSequence", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetSequence indicates an expected call of SetSequence. +func (mr *MockCatalogMockRecorder) SetSequence(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSequence", reflect.TypeOf((*MockCatalog)(nil).SetSequence), arg0, arg1) +} + // UpdateComment mocks base method. func (m *MockCatalog) UpdateComment(arg0 context.Context, arg1 catalogkeys.CommentKey, arg2 string) error { m.ctrl.T.Helper() diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/dependencies.go b/pkg/sql/schemachanger/scexec/scmutationexec/dependencies.go index bfa766a389cb..b3f3f360f337 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/dependencies.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/dependencies.go @@ -79,6 +79,9 @@ type ImmediateMutationStateUpdater interface { // InitSequence initializes a sequence. InitSequence(id descpb.ID, startVal int64) + // SetSequence sets a sequence to the provided value. + SetSequence(id descpb.ID, val int64) + // UpdateZoneConfig upserts a zone config. UpdateZoneConfig(id descpb.ID, zc *zonepb.ZoneConfig) diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/sequence.go b/pkg/sql/schemachanger/scexec/scmutationexec/sequence.go index 8141d5ee2a76..f094bb833097 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/sequence.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/sequence.go @@ -7,6 +7,7 @@ package scmutationexec import ( "context" + "fmt" "strconv" "github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb" @@ -48,9 +49,9 @@ func (i *immediateVisitor) CreateSequenceDescriptor( return nil } -func (i *immediateVisitor) SetSequenceOptions( - ctx context.Context, op scop.SetSequenceOptions, -) error { +// SetSequenceOption sets a sequence option to the provided value. It updates +// the current value of the sequences when appropriate. +func (i *immediateVisitor) SetSequenceOption(ctx context.Context, op scop.SetSequenceOption) error { sc, err := i.checkOutTable(ctx, op.SequenceID) if err != nil { return err @@ -85,9 +86,59 @@ func (i *immediateVisitor) SetSequenceOptions( return nil }}, } + + switch key := op.Key; key { + case tree.SeqOptRestart: + restartWith, err := strconv.ParseInt(op.Value, 10, 64) + if err != nil { + return err + } + i.ImmediateMutationStateUpdater.SetSequence(op.SequenceID, restartWith) + return nil + } + return sequenceOptionMeta[op.Key].SetFunc(op.Value) } +// UnsetSequenceOption sets a sequence option to its default. It updates the +// current value of the sequences when appropriate. +func (i *immediateVisitor) UnsetSequenceOption( + ctx context.Context, op scop.UnsetSequenceOption, +) error { + defaultOpts := schemaexpr.DefaultSequenceOptions() + + setOp := scop.SetSequenceOption{ + SequenceID: op.SequenceID, + Key: op.Key, + } + + switch op.Key { + case tree.SeqOptIncrement: + setOp.Value = fmt.Sprintf("%d", defaultOpts.Increment) + case tree.SeqOptMinValue: + setOp.Value = fmt.Sprintf("%d", defaultOpts.MinValue) + case tree.SeqOptMaxValue: + setOp.Value = fmt.Sprintf("%d", defaultOpts.MaxValue) + case tree.SeqOptStart: + setOp.Value = fmt.Sprintf("%d", defaultOpts.Start) + case tree.SeqOptCacheSession: + setOp.Value = fmt.Sprintf("%d", defaultOpts.SessionCacheSize) + case tree.SeqOptCacheNode: + setOp.Value = fmt.Sprintf("%d", defaultOpts.NodeCacheSize) + case tree.SeqOptVirtual: + setOp.Value = fmt.Sprintf("%t", defaultOpts.Virtual) + case tree.SeqOptAs: + setOp.Value = defaultOpts.AsIntegerType + case tree.SeqOptRestart: + // Noop on unsetting a transient element. + return nil + default: + panic(fmt.Sprintf("unexpected sequence option: %s", op.Key)) + } + + return i.SetSequenceOption(ctx, setOp) +} + func (i *immediateVisitor) InitSequence(ctx context.Context, op scop.InitSequence) error { sc, err := i.checkOutTable(ctx, op.SequenceID) if err != nil { diff --git a/pkg/sql/schemachanger/scop/immediate_mutation.go b/pkg/sql/schemachanger/scop/immediate_mutation.go index 8c352b48af2d..c47ab31baf53 100644 --- a/pkg/sql/schemachanger/scop/immediate_mutation.go +++ b/pkg/sql/schemachanger/scop/immediate_mutation.go @@ -1085,13 +1085,19 @@ type CreateSequenceDescriptor struct { Temporary bool } -type SetSequenceOptions struct { +type SetSequenceOption struct { immediateMutationOp SequenceID descpb.ID Key string Value string } +type UnsetSequenceOption struct { + immediateMutationOp + SequenceID descpb.ID + Key string +} + type InitSequence struct { immediateMutationOp SequenceID descpb.ID diff --git a/pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go b/pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go index dac80f51f5fd..b12d98ee8980 100644 --- a/pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go +++ b/pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go @@ -156,7 +156,8 @@ type ImmediateMutationVisitor interface { UpdateOwner(context.Context, UpdateOwner) error CreateSchemaDescriptor(context.Context, CreateSchemaDescriptor) error CreateSequenceDescriptor(context.Context, CreateSequenceDescriptor) error - SetSequenceOptions(context.Context, SetSequenceOptions) error + SetSequenceOption(context.Context, SetSequenceOption) error + UnsetSequenceOption(context.Context, UnsetSequenceOption) error InitSequence(context.Context, InitSequence) error CreateDatabaseDescriptor(context.Context, CreateDatabaseDescriptor) error AddNamedRangeZoneConfig(context.Context, AddNamedRangeZoneConfig) error @@ -872,8 +873,13 @@ func (op CreateSequenceDescriptor) Visit(ctx context.Context, v ImmediateMutatio } // Visit is part of the ImmediateMutationOp interface. -func (op SetSequenceOptions) Visit(ctx context.Context, v ImmediateMutationVisitor) error { - return v.SetSequenceOptions(ctx, op) +func (op SetSequenceOption) Visit(ctx context.Context, v ImmediateMutationVisitor) error { + return v.SetSequenceOption(ctx, op) +} + +// Visit is part of the ImmediateMutationOp interface. +func (op UnsetSequenceOption) Visit(ctx context.Context, v ImmediateMutationVisitor) error { + return v.UnsetSequenceOption(ctx, op) } // Visit is part of the ImmediateMutationOp interface. diff --git a/pkg/sql/schemachanger/scpb/elements.proto b/pkg/sql/schemachanger/scpb/elements.proto index e38830ad10fd..91b030877904 100644 --- a/pkg/sql/schemachanger/scpb/elements.proto +++ b/pkg/sql/schemachanger/scpb/elements.proto @@ -458,7 +458,6 @@ message SequenceOption { string value = 3; } - message SequenceOwner { uint32 sequence_id = 1 [(gogoproto.customname) = "SequenceID", (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/sql/sem/catid.DescID"]; uint32 table_id = 2 [(gogoproto.customname) = "TableID", (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/sql/sem/catid.DescID"]; diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence_option.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence_option.go index 32b8c14a8e7c..6865db8a999c 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence_option.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence_option.go @@ -15,8 +15,8 @@ func init() { toPublic( scpb.Status_ABSENT, to(scpb.Status_PUBLIC, - emit(func(this *scpb.SequenceOption) *scop.SetSequenceOptions { - return &scop.SetSequenceOptions{ + emit(func(this *scpb.SequenceOption) *scop.SetSequenceOption { + return &scop.SetSequenceOption{ SequenceID: this.SequenceID, Key: this.Key, Value: this.Value, @@ -24,11 +24,15 @@ func init() { }), ), ), + toTransientAbsentLikePublic(), toAbsent( scpb.Status_PUBLIC, to(scpb.Status_ABSENT, - emit(func(this *scpb.SequenceOption) *scop.NotImplementedForPublicObjects { - return notImplementedForPublicObjects(this) + emit(func(this *scpb.SequenceOption) *scop.UnsetSequenceOption { + return &scop.UnsetSequenceOption{ + SequenceID: this.SequenceID, + Key: this.Key, + } }), ), ), diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column_generated b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column_generated index fd8d6a7e7fe3..778313add8c8 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column_generated +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column_generated @@ -26,7 +26,7 @@ StatementPhase stage 1 of 1 with 37 MutationType ops [[ColumnName:{DescID: 104, Name: j, ColumnID: 2}, PUBLIC], ABSENT] -> PUBLIC [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2, TypeName: INT8}, PUBLIC], ABSENT] -> PUBLIC [[ColumnDefaultExpression:{DescID: 104, ColumnID: 2, ReferencedSequenceIDs: [105], Expr: nextval(105:::REGCLASS)}, PUBLIC], ABSENT] -> PUBLIC - [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, GeneratedAsIdentityType: GENERATED_ALWAYS, Value: }, PUBLIC], ABSENT] -> PUBLIC + [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, Value: , GeneratedAsIdentityType: GENERATED_ALWAYS}, PUBLIC], ABSENT] -> PUBLIC [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], ABSENT] -> BACKFILL_ONLY [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2}, PUBLIC], ABSENT] -> PUBLIC [[IndexData:{DescID: 104, IndexID: 2}, PUBLIC], ABSENT] -> PUBLIC @@ -229,7 +229,7 @@ PreCommitPhase stage 1 of 2 with 1 MutationType op [[ColumnName:{DescID: 104, Name: j, ColumnID: 2}, PUBLIC], PUBLIC] -> ABSENT [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2, TypeName: INT8}, PUBLIC], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 104, ColumnID: 2, ReferencedSequenceIDs: [105], Expr: nextval(105:::REGCLASS)}, PUBLIC], PUBLIC] -> ABSENT - [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, GeneratedAsIdentityType: GENERATED_ALWAYS, Value: }, PUBLIC], PUBLIC] -> ABSENT + [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, Value: , GeneratedAsIdentityType: GENERATED_ALWAYS}, PUBLIC], PUBLIC] -> ABSENT [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], BACKFILL_ONLY] -> ABSENT [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2}, PUBLIC], PUBLIC] -> ABSENT [[IndexData:{DescID: 104, IndexID: 2}, PUBLIC], PUBLIC] -> ABSENT @@ -261,7 +261,7 @@ PreCommitPhase stage 2 of 2 with 43 MutationType ops [[ColumnName:{DescID: 104, Name: j, ColumnID: 2}, PUBLIC], ABSENT] -> PUBLIC [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2, TypeName: INT8}, PUBLIC], ABSENT] -> PUBLIC [[ColumnDefaultExpression:{DescID: 104, ColumnID: 2, ReferencedSequenceIDs: [105], Expr: nextval(105:::REGCLASS)}, PUBLIC], ABSENT] -> PUBLIC - [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, GeneratedAsIdentityType: GENERATED_ALWAYS, Value: }, PUBLIC], ABSENT] -> PUBLIC + [[ColumnGeneratedAsIdentity:{DescID: 104, ColumnID: 2, Value: , GeneratedAsIdentityType: GENERATED_ALWAYS}, PUBLIC], ABSENT] -> PUBLIC [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], ABSENT] -> BACKFILL_ONLY [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2}, PUBLIC], ABSENT] -> PUBLIC [[IndexData:{DescID: 104, IndexID: 2}, PUBLIC], ABSENT] -> PUBLIC diff --git a/pkg/sql/schemachanger/scplan/testdata/create_sequence b/pkg/sql/schemachanger/scplan/testdata/create_sequence index 4c846ace7fc7..277c7f7348b4 100644 --- a/pkg/sql/schemachanger/scplan/testdata/create_sequence +++ b/pkg/sql/schemachanger/scplan/testdata/create_sequence @@ -7,7 +7,7 @@ StatementPhase stage 1 of 1 with 24 MutationType ops [[Namespace:{DescID: 104, Name: sq1, ReferencedDescID: 100}, PUBLIC], ABSENT] -> PUBLIC [[SchemaChild:{DescID: 104, ReferencedDescID: 101}, PUBLIC], ABSENT] -> PUBLIC [[TableData:{DescID: 104, ReferencedDescID: 100}, PUBLIC], ABSENT] -> PUBLIC - [[SequenceOption:{DescID: 104, Name: START}, PUBLIC], ABSENT] -> PUBLIC + [[SequenceOption:{DescID: 104, Name: START, Value: 32}, PUBLIC], ABSENT] -> PUBLIC [[Column:{DescID: 104, ColumnID: 1}, PUBLIC], ABSENT] -> PUBLIC [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 1, TypeName: INT8}, PUBLIC], ABSENT] -> PUBLIC [[ColumnNotNull:{DescID: 104, ColumnID: 1, IndexID: 0}, PUBLIC], ABSENT] -> PUBLIC @@ -34,7 +34,7 @@ StatementPhase stage 1 of 1 with 24 MutationType ops ObjParent: ChildObjectID: 104 SchemaID: 101 - *scop.SetSequenceOptions + *scop.SetSequenceOption Key: START SequenceID: 104 Value: "32" @@ -122,7 +122,7 @@ PreCommitPhase stage 1 of 2 with 1 MutationType op [[Namespace:{DescID: 104, Name: sq1, ReferencedDescID: 100}, PUBLIC], PUBLIC] -> ABSENT [[SchemaChild:{DescID: 104, ReferencedDescID: 101}, PUBLIC], PUBLIC] -> ABSENT [[TableData:{DescID: 104, ReferencedDescID: 100}, PUBLIC], PUBLIC] -> ABSENT - [[SequenceOption:{DescID: 104, Name: START}, PUBLIC], PUBLIC] -> ABSENT + [[SequenceOption:{DescID: 104, Name: START, Value: 32}, PUBLIC], PUBLIC] -> ABSENT [[Column:{DescID: 104, ColumnID: 1}, PUBLIC], PUBLIC] -> ABSENT [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 1, TypeName: INT8}, PUBLIC], PUBLIC] -> ABSENT [[ColumnNotNull:{DescID: 104, ColumnID: 1, IndexID: 0}, PUBLIC], PUBLIC] -> ABSENT @@ -142,7 +142,7 @@ PreCommitPhase stage 2 of 2 with 25 MutationType ops [[Namespace:{DescID: 104, Name: sq1, ReferencedDescID: 100}, PUBLIC], ABSENT] -> PUBLIC [[SchemaChild:{DescID: 104, ReferencedDescID: 101}, PUBLIC], ABSENT] -> PUBLIC [[TableData:{DescID: 104, ReferencedDescID: 100}, PUBLIC], ABSENT] -> PUBLIC - [[SequenceOption:{DescID: 104, Name: START}, PUBLIC], ABSENT] -> PUBLIC + [[SequenceOption:{DescID: 104, Name: START, Value: 32}, PUBLIC], ABSENT] -> PUBLIC [[Column:{DescID: 104, ColumnID: 1}, PUBLIC], ABSENT] -> PUBLIC [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 1, TypeName: INT8}, PUBLIC], ABSENT] -> PUBLIC [[ColumnNotNull:{DescID: 104, ColumnID: 1, IndexID: 0}, PUBLIC], ABSENT] -> PUBLIC @@ -172,7 +172,7 @@ PreCommitPhase stage 2 of 2 with 25 MutationType ops ObjParent: ChildObjectID: 104 SchemaID: 101 - *scop.SetSequenceOptions + *scop.SetSequenceOption Key: START SequenceID: 104 Value: "32" @@ -400,7 +400,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 3 kind: Precedence rule: descriptor existence precedes dependents - from: [Sequence:{DescID: 105}, DESCRIPTOR_ADDED] - to: [SequenceOption:{DescID: 105, Name: START}, PUBLIC] + to: [SequenceOption:{DescID: 105, Name: START, Value: 32}, PUBLIC] kind: Precedence rule: descriptor existence precedes dependents - from: [Sequence:{DescID: 105}, DESCRIPTOR_ADDED] @@ -419,7 +419,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 3 to: [TableData:{DescID: 105, ReferencedDescID: 100}, PUBLIC] kind: Precedence rule: table added right before data element -- from: [SequenceOption:{DescID: 105, Name: START}, PUBLIC] +- from: [SequenceOption:{DescID: 105, Name: START, Value: 32}, PUBLIC] to: [Sequence:{DescID: 105}, PUBLIC] kind: Precedence rule: dependents exist before descriptor becomes public diff --git a/pkg/sql/schemachanger/screl/attr.go b/pkg/sql/schemachanger/screl/attr.go index d08103037d33..514adf331642 100644 --- a/pkg/sql/schemachanger/screl/attr.go +++ b/pkg/sql/schemachanger/screl/attr.go @@ -119,7 +119,6 @@ const ( // PolicyID is an attribute for row-level security policies to uniquely // identify a policy within a table. PolicyID - // GeneratedAsIdentityType is the type for a generated as identity column. // It's value must be in catpb.GeneratedAsIdentityType. GeneratedAsIdentityType @@ -295,6 +294,7 @@ var elementSchemaOptions = []rel.SchemaOption{ rel.EntityMapping(t((*scpb.SequenceOption)(nil)), rel.EntityAttr(DescID, "SequenceID"), rel.EntityAttr(Name, "Key"), + rel.EntityAttr(Value, "Value"), ), rel.EntityMapping(t((*scpb.SequenceOwner)(nil)), rel.EntityAttr(DescID, "TableID"), diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated.explain index f270020834c9..795f63c835e2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated.explain @@ -13,9 +13,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "INCREMENT"} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "MINVALUE"} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "INCREMENT", Value: "32"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "MINVALUE", Value: "0"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "START", Value: "0"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -31,7 +31,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), ReferencedSequenceIDs: [107 (tbl_serial_id_seq+)], Expr: nextval(107:::REGCLASS)} - │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── ABSENT → BACKFILL_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey-)} │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey+)} │ │ ├── ABSENT → PUBLIC IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+)} @@ -48,9 +48,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"INCREMENT","SequenceID":107,"Value":"32"} - │ ├── SetSequenceOptions {"Key":"MINVALUE","SequenceID":107,"Value":"0"} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":107,"Value":"0"} + │ ├── SetSequenceOption {"Key":"INCREMENT","SequenceID":107,"Value":"32"} + │ ├── SetSequenceOption {"Key":"MINVALUE","SequenceID":107,"Value":"0"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":107,"Value":"0"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} @@ -91,9 +91,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ │ ├── PUBLIC → ABSENT TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "INCREMENT"} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "MINVALUE"} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "START"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "INCREMENT", Value: "32"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "MINVALUE", Value: "0"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "START", Value: "0"} │ │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -109,7 +109,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id+)} │ │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id+), TypeName: "INT8"} │ │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), ReferencedSequenceIDs: [107 (tbl_serial_id_seq+)], Expr: nextval(107:::REGCLASS)} - │ │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey-)} │ │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey+)} │ │ │ ├── PUBLIC → ABSENT IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+)} @@ -128,9 +128,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "INCREMENT"} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "MINVALUE"} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "INCREMENT", Value: "32"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "MINVALUE", Value: "0"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "START", Value: "0"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -146,7 +146,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), ReferencedSequenceIDs: [107 (tbl_serial_id_seq+)], Expr: nextval(107:::REGCLASS)} - │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── ABSENT → BACKFILL_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey-)} │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey+)} │ │ ├── ABSENT → PUBLIC IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+)} @@ -164,9 +164,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"INCREMENT","SequenceID":107,"Value":"32"} - │ ├── SetSequenceOptions {"Key":"MINVALUE","SequenceID":107,"Value":"0"} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":107,"Value":"0"} + │ ├── SetSequenceOption {"Key":"INCREMENT","SequenceID":107,"Value":"32"} + │ ├── SetSequenceOption {"Key":"MINVALUE","SequenceID":107,"Value":"0"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":107,"Value":"0"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_1_of_7.explain index 03d6d632fd43..973849ea2728 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_1_of_7.explain @@ -13,9 +13,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-), IndexID: 0} @@ -31,7 +31,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), ReferencedSequenceIDs: [107 (tbl_serial_id_seq-)], Expr: nextval(107:::REGCLASS)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── PUBLIC → ABSENT IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-)} @@ -51,9 +51,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── RemoveColumnNotNull {"ColumnID":1,"TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.Owner"} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_2_of_7.explain index 8e16f2809a3b..113708f75ed8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_2_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DELETE_ONLY PrimaryIndex:{DescID: 107 (tbl_serial_id_seq-), IndexID: 1 (primary-)} │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} @@ -45,9 +45,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -68,9 +68,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_3_of_7.explain index e2b75b1a5333..78dc4f2f0ce2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_3_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DELETE_ONLY PrimaryIndex:{DescID: 107 (tbl_serial_id_seq-), IndexID: 1 (primary-)} │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} @@ -45,9 +45,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -68,9 +68,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_4_of_7.explain index 9ec19c106f4f..ac327d482e48 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_4_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DELETE_ONLY PrimaryIndex:{DescID: 107 (tbl_serial_id_seq-), IndexID: 1 (primary-)} │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} @@ -45,9 +45,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -68,9 +68,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_5_of_7.explain index 02e10ff1b8b1..a79622f32e6d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_5_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DELETE_ONLY PrimaryIndex:{DescID: 107 (tbl_serial_id_seq-), IndexID: 1 (primary-)} │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── MERGE_ONLY → DELETE_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} @@ -45,9 +45,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -69,9 +69,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_6_of_7.explain index f449e116e0a3..e7b8bab16f14 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_6_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DELETE_ONLY PrimaryIndex:{DescID: 107 (tbl_serial_id_seq-), IndexID: 1 (primary-)} │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── MERGE_ONLY → DELETE_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} @@ -45,9 +45,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -69,9 +69,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_7_of_7.explain index 73ee8dd7d959..5e96e3bff4d5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated__rollback_7_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DELETE_ONLY PrimaryIndex:{DescID: 107 (tbl_serial_id_seq-), IndexID: 1 (primary-)} │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── WRITE_ONLY → DELETE_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── TRANSIENT_DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} @@ -45,9 +45,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE"} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "INCREMENT", Value: "32"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "MINVALUE", Value: "0"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "START", Value: "0"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -68,9 +68,9 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"INCREMENT","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"MINVALUE","SequenceID":107} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial.explain index 7797eb13a0c5..c53fdba2d998 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial.explain @@ -13,7 +13,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Expr: unique_rowid()} - │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── ABSENT → BACKFILL_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey-)} │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey+)} │ │ ├── ABSENT → PUBLIC IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+)} @@ -44,7 +44,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id+)} │ │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id+), TypeName: "INT8"} │ │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Expr: unique_rowid()} - │ │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey-)} │ │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey+)} │ │ │ ├── PUBLIC → ABSENT IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+)} @@ -63,7 +63,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Expr: unique_rowid()} - │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id+), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── ABSENT → BACKFILL_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey-)} │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey+)} │ │ ├── ABSENT → PUBLIC IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_1_of_7.explain index e22ec47a3672..28ee7d04ddc5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_1_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 106 (tbl), ColumnFamilyID: 0 (primary), ColumnID: 2 (serial_id-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Expr: unique_rowid()} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── PUBLIC → ABSENT IndexData:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_2_of_7.explain index b5334dedd710..b76a8827044c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_2_of_7.explain @@ -12,7 +12,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── 10 elements transitioning toward ABSENT │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_3_of_7.explain index 99120f879f2a..8c6719fd01ed 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_3_of_7.explain @@ -12,7 +12,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── 10 elements transitioning toward ABSENT │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── BACKFILL_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_4_of_7.explain index 4259cd3fa38b..c765328ee408 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_4_of_7.explain @@ -12,7 +12,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── 10 elements transitioning toward ABSENT │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_5_of_7.explain index 3d2fb2709f46..2f7404abbd95 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_5_of_7.explain @@ -12,7 +12,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── 10 elements transitioning toward ABSENT │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── MERGE_ONLY → DELETE_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_6_of_7.explain index 956be729a7ab..220722333dfe 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_6_of_7.explain @@ -12,7 +12,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── 10 elements transitioning toward ABSENT │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── MERGE_ONLY → DELETE_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── WRITE_ONLY → DELETE_ONLY TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_7_of_7.explain index 8393793f7ad8..e05c6c678cfd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_generated_serial/add_column_generated_serial__rollback_7_of_7.explain @@ -12,7 +12,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── 10 elements transitioning toward ABSENT │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 106 (tbl), ColumnID: 2 (serial_id-)} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106 (tbl), Name: "serial_id", ColumnID: 2 (serial_id-)} - │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: " INCREMENT 32 MINVALUE 0 START 0"} + │ │ ├── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 106 (tbl), ColumnID: 2 (serial_id-), Value: " INCREMENT 32 MINVALUE 0 START 0", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── WRITE_ONLY → DELETE_ONLY PrimaryIndex:{DescID: 106 (tbl), IndexID: 2 (tbl_pkey-), ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1 (tbl_pkey+)} │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106 (tbl), ColumnID: 1 (i), IndexID: 2 (tbl_pkey-)} │ │ ├── TRANSIENT_DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106 (tbl), IndexID: 3, ConstraintID: 3, SourceIndexID: 1 (tbl_pkey+)} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached.explain index bb57c98b9d9a..2d14b6de1a7c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached.explain @@ -14,7 +14,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER SESSION CACHE"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -46,7 +46,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"} + │ ├── SetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} @@ -86,7 +86,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ │ ├── PUBLIC → ABSENT TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER SESSION CACHE"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER SESSION CACHE", Value: "256"} │ │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -120,7 +120,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER SESSION CACHE"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -153,7 +153,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"} + │ ├── SetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_1_of_7.explain index 5ba5a31870c0..501d8caee674 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_1_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-), IndexID: 0} @@ -48,7 +48,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── RemoveColumnNotNull {"ColumnID":1,"TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.Owner"} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_2_of_7.explain index 1700b2215f55..4571ad39a3a4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_2_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_3_of_7.explain index 542301639c0d..06669327968e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_3_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_4_of_7.explain index 508e7e14c838..29fa1615c404 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_4_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_5_of_7.explain index a7d79a75e451..ae60047ec2c8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_5_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -66,7 +66,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_6_of_7.explain index 1ca129226849..17a183f7db2b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_6_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -66,7 +66,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_7_of_7.explain index e59c9fe14059..56b23ab9338c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached__rollback_7_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER SESSION CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node.explain index e711a6575338..01bfeda7c8ce 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node.explain @@ -14,7 +14,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER NODE CACHE"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER NODE CACHE", Value: "256"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -46,7 +46,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"} + │ ├── SetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} @@ -86,7 +86,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ │ ├── PUBLIC → ABSENT TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER NODE CACHE"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER NODE CACHE", Value: "256"} │ │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -120,7 +120,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER NODE CACHE"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "PER NODE CACHE", Value: "256"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -153,7 +153,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"} + │ ├── SetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_1_of_7.explain index b89c70f0b92e..cabc06062551 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_1_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-), IndexID: 0} @@ -48,7 +48,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── RemoveColumnNotNull {"ColumnID":1,"TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.Owner"} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_2_of_7.explain index dd6714c59168..200e4f3c8659 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_2_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_3_of_7.explain index e987407a79c6..187db65986be 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_3_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_4_of_7.explain index 386d3c8b6719..bdd3012b99dd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_4_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_5_of_7.explain index 3311ad943b5a..cfe86e521ddf 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_5_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -66,7 +66,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_6_of_7.explain index 73da4b95ff2e..bc5cb7fc3576 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_6_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -66,7 +66,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_7_of_7.explain index c724c8e9f53a..a9218d9a3c08 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node__rollback_7_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "PER NODE CACHE", Value: "256"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual.explain index 43128f6ccae8..b3fbb27a75cf 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual.explain @@ -14,7 +14,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "VIRTUAL"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "VIRTUAL", Value: "true"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -46,7 +46,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"VIRTUAL","SequenceID":107,"Value":"true"} + │ ├── SetSequenceOption {"Key":"VIRTUAL","SequenceID":107,"Value":"true"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} @@ -86,7 +86,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ │ ├── PUBLIC → ABSENT TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "VIRTUAL"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "VIRTUAL", Value: "true"} │ │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -120,7 +120,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 107 (tbl_serial_id_seq+), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (db)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 105 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 107 (tbl_serial_id_seq+), ReferencedDescID: 104 (db)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "VIRTUAL"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 107 (tbl_serial_id_seq+), Name: "VIRTUAL", Value: "true"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 107 (tbl_serial_id_seq+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 107 (tbl_serial_id_seq+), ColumnID: 1 (value+), IndexID: 0} @@ -153,7 +153,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}} - │ ├── SetSequenceOptions {"Key":"VIRTUAL","SequenceID":107,"Value":"true"} + │ ├── SetSequenceOption {"Key":"VIRTUAL","SequenceID":107,"Value":"true"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_1_of_7.explain index 737e341cda5f..2952b12188f4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_1_of_7.explain @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-), IndexID: 0} @@ -48,7 +48,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── RemoveColumnNotNull {"ColumnID":1,"TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.Owner"} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_2_of_7.explain index 021b5262206c..e4f888a01352 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_2_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_3_of_7.explain index dfda3b3026e2..f2ce06457e7f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_3_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_4_of_7.explain index 59458192c444..23f8ec28f5bc 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_4_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_5_of_7.explain index 541c5cbdd1bb..9075b4d2da59 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_5_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -66,7 +66,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_6_of_7.explain index 9f51e5460a39..e6e56323a2b6 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_6_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -66,7 +66,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_7_of_7.explain index 8ee7575460fd..93c4f068e1b9 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual__rollback_7_of_7.explain @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 107 (tbl_serial_id_seq-)} │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107 (tbl_serial_id_seq-), Name: "tbl_serial_id_seq", ReferencedDescID: 104 (#104)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 107 (tbl_serial_id_seq-), ReferencedDescID: 105 (#105)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 107 (tbl_serial_id_seq-), Name: "VIRTUAL", Value: "true"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 107 (tbl_serial_id_seq-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107 (tbl_serial_id_seq-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107 (tbl_serial_id_seq-), Name: "value", ColumnID: 1 (value-)} @@ -65,7 +65,7 @@ Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN serial_ │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}} │ ├── RemoveObjectParent {"ObjectID":107,"ParentSchemaID":105} - │ ├── NotImplementedForPublicObjects {"DescID":107,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"VIRTUAL","SequenceID":107} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":107} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":107} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":107} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity.explain index 60263aabc023..304b2e9f63db 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity.explain @@ -27,7 +27,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER CO │ │ ├── ABSENT → PUBLIC UserPrivileges:{DescID: 105 (t_j_seq+), Name: "root"} │ │ ├── ABSENT → PUBLIC SequenceOwner:{DescID: 104 (t), ColumnID: 2 (j), ReferencedDescID: 105 (t_j_seq+)} │ │ ├── ABSENT → PUBLIC ColumnDefaultExpression:{DescID: 104 (t), ColumnID: 2 (j), ReferencedSequenceIDs: [105 (t_j_seq+)], Expr: nextval(105:::REGCLASS)} - │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: ""} + │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "", GeneratedAsIdentityType: GENERATED_ALWAYS} │ ├── 1 element transitioning toward TRANSIENT_PUBLIC │ │ └── PUBLIC → ABSENT TableSchemaLocked:{DescID: 104 (t)} │ └── 29 Mutation operations @@ -79,7 +79,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER CO │ │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (t_j_seq+), Name: "root"} │ │ │ ├── PUBLIC → ABSENT SequenceOwner:{DescID: 104 (t), ColumnID: 2 (j), ReferencedDescID: 105 (t_j_seq+)} │ │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 104 (t), ColumnID: 2 (j), ReferencedSequenceIDs: [105 (t_j_seq+)], Expr: nextval(105:::REGCLASS)} - │ │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: ""} + │ │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "", GeneratedAsIdentityType: GENERATED_ALWAYS} │ │ ├── 1 element transitioning toward TRANSIENT_PUBLIC │ │ │ └── ABSENT → PUBLIC TableSchemaLocked:{DescID: 104 (t)} │ │ └── 1 Mutation operation @@ -102,7 +102,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER CO │ │ ├── ABSENT → PUBLIC UserPrivileges:{DescID: 105 (t_j_seq+), Name: "root"} │ │ ├── ABSENT → PUBLIC SequenceOwner:{DescID: 104 (t), ColumnID: 2 (j), ReferencedDescID: 105 (t_j_seq+)} │ │ ├── ABSENT → PUBLIC ColumnDefaultExpression:{DescID: 104 (t), ColumnID: 2 (j), ReferencedSequenceIDs: [105 (t_j_seq+)], Expr: nextval(105:::REGCLASS)} - │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: ""} + │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "", GeneratedAsIdentityType: GENERATED_ALWAYS} │ ├── 1 element transitioning toward TRANSIENT_PUBLIC │ │ └── PUBLIC → ABSENT TableSchemaLocked:{DescID: 104 (t)} │ └── 33 Mutation operations diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity__rollback_1_of_1.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity__rollback_1_of_1.explain index 5c6593ce05b8..150f15bd6f67 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity__rollback_1_of_1.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_add_identity/alter_table_alter_column_add_identity__rollback_1_of_1.explain @@ -27,7 +27,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER COLUMN │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (t_j_seq-), Name: "root"} │ │ ├── PUBLIC → ABSENT SequenceOwner:{DescID: 104 (t), ColumnID: 2 (j), ReferencedDescID: 105 (t_j_seq-)} │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 104 (t), ColumnID: 2 (j), ReferencedSequenceIDs: [105 (t_j_seq-)], Expr: nextval(105:::REGCLASS)} - │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: ""} + │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "", GeneratedAsIdentityType: GENERATED_ALWAYS} │ └── 25 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":105,"Name":"t_j_seq","SchemaID":101}} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity.explain index 65e2b22996fc..a760d3421039 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity.explain @@ -11,11 +11,11 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER CO ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward PUBLIC - │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: "START WITH 2 INCREMENT 3"} + │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ ├── 1 element transitioning toward TRANSIENT_PUBLIC │ │ └── PUBLIC → ABSENT TableSchemaLocked:{DescID: 104 (t)} │ ├── 1 element transitioning toward ABSENT - │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: "START WITH 2 INCREMENT 3"} + │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_ALWAYS} │ └── 3 Mutation operations │ ├── SetTableSchemaLocked {"TableID":104} │ ├── RemoveColumnGeneratedAsIdentity {"ColumnID":2,"TableID":104} @@ -23,20 +23,20 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER CO ├── PreCommitPhase │ ├── Stage 1 of 2 in PreCommitPhase │ │ ├── 1 element transitioning toward PUBLIC - │ │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: "START WITH 2 INCREMENT 3"} + │ │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ │ ├── 1 element transitioning toward TRANSIENT_PUBLIC │ │ │ └── ABSENT → PUBLIC TableSchemaLocked:{DescID: 104 (t)} │ │ ├── 1 element transitioning toward ABSENT - │ │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: "START WITH 2 INCREMENT 3"} + │ │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_ALWAYS} │ │ └── 1 Mutation operation │ │ └── UndoAllInTxnImmediateMutationOpSideEffects │ └── Stage 2 of 2 in PreCommitPhase │ ├── 1 element transitioning toward PUBLIC - │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: "START WITH 2 INCREMENT 3"} + │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ ├── 1 element transitioning toward TRANSIENT_PUBLIC │ │ └── PUBLIC → ABSENT TableSchemaLocked:{DescID: 104 (t)} │ ├── 1 element transitioning toward ABSENT - │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: "START WITH 2 INCREMENT 3"} + │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_ALWAYS} │ └── 5 Mutation operations │ ├── SetTableSchemaLocked {"TableID":104} │ ├── RemoveColumnGeneratedAsIdentity {"ColumnID":2,"TableID":104} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity__rollback_1_of_1.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity__rollback_1_of_1.explain index ac7ad0ad4b87..b795a7995246 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity__rollback_1_of_1.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_identity/alter_table_alter_column_set_identity__rollback_1_of_1.explain @@ -12,9 +12,9 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER COLUMN └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC - │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_ALWAYS, Value: "START WITH 2 INCREMENT 3"} + │ │ └── ABSENT → PUBLIC ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_ALWAYS} │ ├── 1 element transitioning toward ABSENT - │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), GeneratedAsIdentityType: GENERATED_BY_DEFAULT, Value: "START WITH 2 INCREMENT 3"} + │ │ └── PUBLIC → ABSENT ColumnGeneratedAsIdentity:{DescID: 104 (t), ColumnID: 2 (j), Value: "START WITH 2 INCREMENT 3", GeneratedAsIdentityType: GENERATED_BY_DEFAULT} │ └── 4 Mutation operations │ ├── RemoveColumnGeneratedAsIdentity {"ColumnID":2,"TableID":104} │ ├── AddColumnGeneratedAsIdentity {"GeneratedAsIdentity":{"ColumnID":2,"SequenceOption":"START WITH 2 INC...","TableID":104,"Type":1}} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_complex/create_complex__statement_4_of_4.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_complex/create_complex__statement_4_of_4.explain index fbd4e8231123..867961767a42 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_complex/create_complex__statement_4_of_4.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_complex/create_complex__statement_4_of_4.explain @@ -18,7 +18,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 108 (sq1+), Name: "sq1", ReferencedDescID: 104 (db+)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 108 (sq1+), ReferencedDescID: 106 (sc+)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 108 (sq1+), ReferencedDescID: 104 (db+)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 108 (sq1+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 108 (sq1+), Name: "START", Value: "32"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 108 (sq1+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 108 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 108 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -34,7 +34,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA │ ├── SetNameInDescriptor {"DescriptorID":108,"Name":"sq1"} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"sq1","SchemaID":106}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":108,"SchemaID":106}} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":108,"Value":"32"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":108,"Value":"32"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":108}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":108}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":108} @@ -89,7 +89,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108 (sq1+), Name: "sq1", ReferencedDescID: 104 (db+)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 108 (sq1+), ReferencedDescID: 106 (sc+)} │ │ ├── PUBLIC → ABSENT TableData:{DescID: 108 (sq1+), ReferencedDescID: 104 (db+)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 108 (sq1+), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 108 (sq1+), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 108 (sq1+), ColumnID: 1 (value+)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 108 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -136,7 +136,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA │ ├── ABSENT → PUBLIC Namespace:{DescID: 108 (sq1+), Name: "sq1", ReferencedDescID: 104 (db+)} │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 108 (sq1+), ReferencedDescID: 106 (sc+)} │ ├── ABSENT → PUBLIC TableData:{DescID: 108 (sq1+), ReferencedDescID: 104 (db+)} - │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 108 (sq1+), Name: "START"} + │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 108 (sq1+), Name: "START", Value: "32"} │ ├── ABSENT → PUBLIC Column:{DescID: 108 (sq1+), ColumnID: 1 (value+)} │ ├── ABSENT → PUBLIC ColumnType:{DescID: 108 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 108 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -161,7 +161,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"sq1","SchemaID":106}} ├── UpdateTTLScheduleMetadata {"NewName":"sq1","TableID":108} ├── SetObjectParentID {"ObjParent":{"ChildObjectID":108,"SchemaID":106}} - ├── SetSequenceOptions {"Key":"START","SequenceID":108,"Value":"32"} + ├── SetSequenceOption {"Key":"START","SequenceID":108,"Value":"32"} ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":108}} ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":108}} ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":108} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence/create_sequence.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence/create_sequence.explain index f7c52ae86967..2cf099b6f76f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence/create_sequence.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence/create_sequence.explain @@ -11,7 +11,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 104 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 104 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 104 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START", Value: "32"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 104 (sq1+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 104 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 104 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -27,7 +27,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ ├── SetNameInDescriptor {"DescriptorID":104,"Name":"sq1"} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":104,"Name":"sq1","SchemaID":101}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":104,"SchemaID":101}} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":104,"Value":"32"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":104,"Value":"32"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":104}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":104}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":104} @@ -54,7 +54,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 104 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 104 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── PUBLIC → ABSENT TableData:{DescID: 104 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 104 (sq1+), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 104 (sq1+), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 104 (sq1+), ColumnID: 1 (value+)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 104 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -73,7 +73,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ ├── ABSENT → PUBLIC Namespace:{DescID: 104 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 104 (sq1+), ReferencedDescID: 101 (public)} │ ├── ABSENT → PUBLIC TableData:{DescID: 104 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START"} + │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START", Value: "32"} │ ├── ABSENT → PUBLIC Column:{DescID: 104 (sq1+), ColumnID: 1 (value+)} │ ├── ABSENT → PUBLIC ColumnType:{DescID: 104 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 104 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -90,7 +90,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":104,"Name":"sq1","SchemaID":101}} ├── UpdateTTLScheduleMetadata {"NewName":"sq1","TableID":104} ├── SetObjectParentID {"ObjParent":{"ChildObjectID":104,"SchemaID":101}} - ├── SetSequenceOptions {"Key":"START","SequenceID":104,"Value":"32"} + ├── SetSequenceOption {"Key":"START","SequenceID":104,"Value":"32"} ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":104}} ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":104}} ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":104} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain index bfbb63376b58..41f501abf1af 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain @@ -15,7 +15,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ ├── RemoveColumnFromIndex {"ColumnID":2,"IndexID":2,"Kind":2,"TableID":104} │ ├── RemoveColumnFromIndex {"ColumnID":2,"IndexID":3,"Kind":2,"TableID":104} │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── RemoveColumnNotNull {"ColumnID":1,"TableID":105} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain index 0c32818fb5d1..fad82855cf62 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain @@ -43,7 +43,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -59,7 +59,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ └── PUBLIC → ABSENT IndexData:{DescID: 104 (t), IndexID: 3} │ └── 23 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":105} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain index b231fc130436..867839877e0a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain @@ -43,7 +43,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -59,7 +59,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ └── PUBLIC → ABSENT IndexData:{DescID: 104 (t), IndexID: 3} │ └── 23 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":105} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain index f3b025416633..bb9cd01ad62a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain @@ -43,7 +43,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -59,7 +59,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ └── PUBLIC → ABSENT IndexData:{DescID: 104 (t), IndexID: 3} │ └── 23 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":105} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain index 6498a90ac41a..e3a28087adc4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain @@ -43,7 +43,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -60,7 +60,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ └── PUBLIC → ABSENT IndexData:{DescID: 104 (t), IndexID: 3} │ └── 24 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":105} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain index 31ad9387f23a..6118fd9ed56b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain @@ -43,7 +43,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -60,7 +60,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ └── PUBLIC → ABSENT IndexData:{DescID: 104 (t), IndexID: 3} │ └── 24 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":105} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain index 79e7f1212514..1faa1fb0fb36 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain @@ -43,7 +43,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 105 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1-), ReferencedDescID: 101 (#101)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -59,7 +59,7 @@ Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j │ │ └── PUBLIC → ABSENT IndexData:{DescID: 104 (t), IndexID: 3} │ └── 23 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":105} - │ ├── NotImplementedForPublicObjects {"DescID":105,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":105} │ ├── RemoveObjectParent {"ObjectID":105,"ParentSchemaID":101} │ ├── MakePublicColumnWriteOnly {"ColumnID":1,"TableID":105} │ ├── SetColumnName {"ColumnID":1,"Name":"crdb_internal_co...","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_1_of_2.explain index d0ceb2c00e01..d02973bba52c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_1_of_2.explain @@ -12,7 +12,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 105 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 105 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 105 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -28,7 +28,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ ├── SetNameInDescriptor {"DescriptorID":105,"Name":"sq1"} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":105,"Name":"sq1","SchemaID":101}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":105,"SchemaID":101}} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":105,"Value":"32"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":105,"Value":"32"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":105}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":105}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":105} @@ -55,7 +55,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 105 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── PUBLIC → ABSENT TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 105 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -74,7 +74,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ ├── ABSENT → PUBLIC Namespace:{DescID: 105 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 101 (public)} │ ├── ABSENT → PUBLIC TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ ├── ABSENT → PUBLIC Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} │ ├── ABSENT → PUBLIC ColumnType:{DescID: 105 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 105 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -91,7 +91,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":105,"Name":"sq1","SchemaID":101}} ├── UpdateTTLScheduleMetadata {"NewName":"sq1","TableID":105} ├── SetObjectParentID {"ObjParent":{"ChildObjectID":105,"SchemaID":101}} - ├── SetSequenceOptions {"Key":"START","SequenceID":105,"Value":"32"} + ├── SetSequenceOption {"Key":"START","SequenceID":105,"Value":"32"} ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":105}} ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":105}} ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":105} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_2_of_2.explain index c772e2492d0a..9f634e900270 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__statement_2_of_2.explain @@ -44,7 +44,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD COLU │ │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1+), Name: "admin"} │ │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105 (sq1+), Name: "root"} │ │ │ ├── PUBLIC → ABSENT Sequence:{DescID: 105 (sq1+)} - │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 101 (public)} │ │ │ ├── PUBLIC → ABSENT TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} │ │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} @@ -77,7 +77,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD COLU │ │ ├── ABSENT → PUBLIC UserPrivileges:{DescID: 105 (sq1+), Name: "admin"} │ │ ├── ABSENT → PUBLIC UserPrivileges:{DescID: 105 (sq1+), Name: "root"} │ │ ├── ABSENT → PUBLIC Sequence:{DescID: 105 (sq1+)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} │ │ ├── ABSENT → PUBLIC Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} @@ -103,7 +103,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD COLU │ │ └── PUBLIC → ABSENT TableSchemaLocked:{DescID: 104 (t)} │ └── 42 Mutation operations │ ├── CreateSequenceDescriptor {"SequenceID":105} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":105,"Value":"32"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":105,"Value":"32"} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":105,"SchemaID":101}} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":105}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":105}} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence.side_effects b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence.side_effects index c3b32b64fbdd..89d08ebc0b8d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence.side_effects +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence.side_effects @@ -94,8 +94,10 @@ write *eventpb.DropSequence to event log: delete object namespace entry {100 101 sq1} -> 104 upsert descriptor #104 ... + sequenceOwner: {} sessionCacheSize: "1" - start: "32" + - start: "32" + + start: "1" + state: DROP unexposedParentSchemaId: 101 version: "1" diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_1_of_2.explain index f7c52ae86967..2cf099b6f76f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_1_of_2.explain @@ -11,7 +11,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 104 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 104 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 104 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START", Value: "32"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 104 (sq1+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 104 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 104 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -27,7 +27,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ ├── SetNameInDescriptor {"DescriptorID":104,"Name":"sq1"} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":104,"Name":"sq1","SchemaID":101}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":104,"SchemaID":101}} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":104,"Value":"32"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":104,"Value":"32"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":104}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":104}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":104} @@ -54,7 +54,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 104 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 104 (sq1+), ReferencedDescID: 101 (public)} │ │ ├── PUBLIC → ABSENT TableData:{DescID: 104 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 104 (sq1+), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 104 (sq1+), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 104 (sq1+), ColumnID: 1 (value+)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 104 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -73,7 +73,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI │ ├── ABSENT → PUBLIC Namespace:{DescID: 104 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 104 (sq1+), ReferencedDescID: 101 (public)} │ ├── ABSENT → PUBLIC TableData:{DescID: 104 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START"} + │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 104 (sq1+), Name: "START", Value: "32"} │ ├── ABSENT → PUBLIC Column:{DescID: 104 (sq1+), ColumnID: 1 (value+)} │ ├── ABSENT → PUBLIC ColumnType:{DescID: 104 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 104 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -90,7 +90,7 @@ Schema change plan for CREATE SEQUENCE ‹defaultdb›.‹public›.‹sq1› MI ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":104,"Name":"sq1","SchemaID":101}} ├── UpdateTTLScheduleMetadata {"NewName":"sq1","TableID":104} ├── SetObjectParentID {"ObjParent":{"ChildObjectID":104,"SchemaID":101}} - ├── SetSequenceOptions {"Key":"START","SequenceID":104,"Value":"32"} + ├── SetSequenceOption {"Key":"START","SequenceID":104,"Value":"32"} ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":104}} ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":104}} ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":104} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_2_of_2.explain index 25dc04dd092e..081b82e1269c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_drop_sequence/create_sequence_drop_sequence__statement_2_of_2.explain @@ -13,7 +13,7 @@ Schema change plan for DROP SEQUENCE ‹defaultdb›.‹public›.‹sq1›; fol │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104 (sq1-), Name: "admin"} │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104 (sq1-), Name: "root"} │ │ ├── PUBLIC → DROPPED Sequence:{DescID: 104 (sq1-)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 104 (sq1-), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 104 (sq1-), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 104 (sq1-), ReferencedDescID: 101 (public)} │ │ ├── PUBLIC → ABSENT Column:{DescID: 104 (sq1-), ColumnID: 1 (value-)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104 (sq1-), ColumnFamilyID: 0, ColumnID: 1 (value-), TypeName: "INT8"} @@ -24,7 +24,7 @@ Schema change plan for DROP SEQUENCE ‹defaultdb›.‹public›.‹sq1›; fol │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104 (sq1-), ColumnID: 1 (value-), IndexID: 1 (primary-)} │ └── 18 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":104} - │ ├── NotImplementedForPublicObjects {"DescID":104,"ElementType":"scpb.SequenceOpt..."} + │ ├── UnsetSequenceOption {"Key":"START","SequenceID":104} │ ├── RemoveObjectParent {"ObjectID":104,"ParentSchemaID":101} │ ├── MakePublicColumnNotNullValidated {"ColumnID":1,"TableID":104} │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_temp_sequence/create_temp_sequence.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_temp_sequence/create_temp_sequence.explain index 3b290b98f692..d0e4d27940a6 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_temp_sequence/create_temp_sequence.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_temp_sequence/create_temp_sequence.explain @@ -15,7 +15,7 @@ Schema change plan for CREATE TEMPORARY SEQUENCE ‹defaultdb›.‹pg_temp_123_ │ │ ├── ABSENT → PUBLIC Namespace:{DescID: 105 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 104 (pg_temp_123_456+)} │ │ ├── ABSENT → PUBLIC TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ │ ├── ABSENT → PUBLIC Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 105 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 105 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -33,7 +33,7 @@ Schema change plan for CREATE TEMPORARY SEQUENCE ‹defaultdb›.‹pg_temp_123_ │ ├── SetNameInDescriptor {"DescriptorID":105,"Name":"sq1"} │ ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":105,"Name":"sq1","SchemaID":104}} │ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":105,"SchemaID":104}} - │ ├── SetSequenceOptions {"Key":"START","SequenceID":105,"Value":"32"} + │ ├── SetSequenceOption {"Key":"START","SequenceID":105,"Value":"32"} │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":105}} │ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":105}} │ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":105} @@ -64,7 +64,7 @@ Schema change plan for CREATE TEMPORARY SEQUENCE ‹defaultdb›.‹pg_temp_123_ │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 105 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ │ ├── PUBLIC → ABSENT SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 104 (pg_temp_123_456+)} │ │ ├── PUBLIC → ABSENT TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ │ ├── PUBLIC → ABSENT SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ │ ├── PUBLIC → ABSENT Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 105 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ │ ├── PUBLIC → ABSENT ColumnNotNull:{DescID: 105 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -86,7 +86,7 @@ Schema change plan for CREATE TEMPORARY SEQUENCE ‹defaultdb›.‹pg_temp_123_ │ ├── ABSENT → PUBLIC Namespace:{DescID: 105 (sq1+), Name: "sq1", ReferencedDescID: 100 (defaultdb)} │ ├── ABSENT → PUBLIC SchemaChild:{DescID: 105 (sq1+), ReferencedDescID: 104 (pg_temp_123_456+)} │ ├── ABSENT → PUBLIC TableData:{DescID: 105 (sq1+), ReferencedDescID: 100 (defaultdb)} - │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START"} + │ ├── ABSENT → PUBLIC SequenceOption:{DescID: 105 (sq1+), Name: "START", Value: "32"} │ ├── ABSENT → PUBLIC Column:{DescID: 105 (sq1+), ColumnID: 1 (value+)} │ ├── ABSENT → PUBLIC ColumnType:{DescID: 105 (sq1+), ColumnFamilyID: 0, ColumnID: 1 (value+), TypeName: "INT8"} │ ├── ABSENT → PUBLIC ColumnNotNull:{DescID: 105 (sq1+), ColumnID: 1 (value+), IndexID: 0} @@ -105,7 +105,7 @@ Schema change plan for CREATE TEMPORARY SEQUENCE ‹defaultdb›.‹pg_temp_123_ ├── AddDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":105,"Name":"sq1","SchemaID":104}} ├── UpdateTTLScheduleMetadata {"NewName":"sq1","TableID":105} ├── SetObjectParentID {"ObjParent":{"ChildObjectID":105,"SchemaID":104}} - ├── SetSequenceOptions {"Key":"START","SequenceID":105,"Value":"32"} + ├── SetSequenceOption {"Key":"START","SequenceID":105,"Value":"32"} ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":105}} ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":105}} ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":105} diff --git a/pkg/sql/sem/tree/alter_table.go b/pkg/sql/sem/tree/alter_table.go index 36294b09e81d..f84900fe231d 100644 --- a/pkg/sql/sem/tree/alter_table.go +++ b/pkg/sql/sem/tree/alter_table.go @@ -527,7 +527,7 @@ type AlterTableDropStored struct { Column Name } -// GetColumn implemnets the ColumnMutationCmd interface. +// GetColumn implements the ColumnMutationCmd interface. func (node *AlterTableDropStored) GetColumn() Name { return node.Column } @@ -778,7 +778,7 @@ type AlterTableAddIdentity struct { Qualification ColumnQualification } -// GetColumn implemnets the ColumnMutationCmd interface. +// GetColumn implements the ColumnMutationCmd interface. func (node *AlterTableAddIdentity) GetColumn() Name { return node.Column } @@ -814,7 +814,7 @@ type AlterTableSetIdentity struct { GeneratedAsIdentityType GeneratedIdentityType } -// GetColumn implemnets the ColumnMutationCmd interface. +// GetColumn implements the ColumnMutationCmd interface. func (node *AlterTableSetIdentity) GetColumn() Name { return node.Column } @@ -843,7 +843,7 @@ type AlterTableIdentity struct { SeqOptions SequenceOptions } -// GetColumn implemnets the ColumnMutationCmd interface. +// GetColumn implements the ColumnMutationCmd interface. func (node *AlterTableIdentity) GetColumn() Name { return node.Column } @@ -873,7 +873,7 @@ type AlterTableDropIdentity struct { IfExists bool } -// GetColumn implemnets the ColumnMutationCmd interface. +// GetColumn implements the ColumnMutationCmd interface. func (node *AlterTableDropIdentity) GetColumn() Name { return node.Column }