Skip to content

Commit 3def712

Browse files
bghalbghal
committed
sql/schemachanger: rename sequence option mutation
This operation covers a single option not multiple. Part of: #142914 Epic: CRDB-31283 Release note: None
1 parent ae0b3d7 commit 3def712

File tree

15 files changed

+200
-90
lines changed

15 files changed

+200
-90
lines changed

‎pkg/sql/schemachanger/scexec/scmutationexec/sequence.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ func (i *immediateVisitor) CreateSequenceDescriptor(
4848
return nil
4949
}
5050

51-
func (i *immediateVisitor) SetSequenceOptions(
52-
ctx context.Context, op scop.SetSequenceOptions,
53-
) error {
51+
func (i *immediateVisitor) SetSequenceOption(ctx context.Context, op scop.SetSequenceOption) error {
5452
sc, err := i.checkOutTable(ctx, op.SequenceID)
5553
if err != nil {
5654
return err

‎pkg/sql/schemachanger/scop/immediate_mutation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ type CreateSequenceDescriptor struct {
10851085
Temporary bool
10861086
}
10871087

1088-
type SetSequenceOptions struct {
1088+
type SetSequenceOption struct {
10891089
immediateMutationOp
10901090
SequenceID descpb.ID
10911091
Key string

‎pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go‎

Lines changed: 171 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence_option.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ func init() {
1515
toPublic(
1616
scpb.Status_ABSENT,
1717
to(scpb.Status_PUBLIC,
18-
emit(func(this *scpb.SequenceOption) *scop.SetSequenceOptions {
19-
return &scop.SetSequenceOptions{
18+
emit(func(this *scpb.SequenceOption) *scop.SetSequenceOption {
19+
return &scop.SetSequenceOption{
2020
SequenceID: this.SequenceID,
2121
Key: this.Key,
2222
Value: this.Value,

‎pkg/sql/schemachanger/scplan/testdata/create_sequence‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ StatementPhase stage 1 of 1 with 24 MutationType ops
3434
ObjParent:
3535
ChildObjectID: 104
3636
SchemaID: 101
37-
*scop.SetSequenceOptions
37+
*scop.SetSequenceOption
3838
Key: START
3939
SequenceID: 104
4040
Value: "32"
@@ -172,7 +172,7 @@ PreCommitPhase stage 2 of 2 with 25 MutationType ops
172172
ObjParent:
173173
ChildObjectID: 104
174174
SchemaID: 101
175-
*scop.SetSequenceOptions
175+
*scop.SetSequenceOption
176176
Key: START
177177
SequenceID: 104
178178
Value: "32"

‎pkg/sql/schemachanger/testdata/end_to_end/add_column_generated/add_column_generated.explain‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
4848
│ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."}
4949
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
5050
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
51-
│ ├── SetSequenceOptions {"Key":"INCREMENT","SequenceID":107,"Value":"32"}
52-
│ ├── SetSequenceOptions {"Key":"MINVALUE","SequenceID":107,"Value":"0"}
53-
│ ├── SetSequenceOptions {"Key":"START","SequenceID":107,"Value":"0"}
51+
│ ├── SetSequenceOption {"Key":"INCREMENT","SequenceID":107,"Value":"32"}
52+
│ ├── SetSequenceOption {"Key":"MINVALUE","SequenceID":107,"Value":"0"}
53+
│ ├── SetSequenceOption {"Key":"START","SequenceID":107,"Value":"0"}
5454
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
5555
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
5656
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}
@@ -164,9 +164,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
164164
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
165165
│ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107}
166166
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
167-
│ ├── SetSequenceOptions {"Key":"INCREMENT","SequenceID":107,"Value":"32"}
168-
│ ├── SetSequenceOptions {"Key":"MINVALUE","SequenceID":107,"Value":"0"}
169-
│ ├── SetSequenceOptions {"Key":"START","SequenceID":107,"Value":"0"}
167+
│ ├── SetSequenceOption {"Key":"INCREMENT","SequenceID":107,"Value":"32"}
168+
│ ├── SetSequenceOption {"Key":"MINVALUE","SequenceID":107,"Value":"0"}
169+
│ ├── SetSequenceOption {"Key":"START","SequenceID":107,"Value":"0"}
170170
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
171171
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
172172
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}

‎pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached/add_column_serial_simple_sequence_cached.explain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
4646
│ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."}
4747
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
4848
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
49-
│ ├── SetSequenceOptions {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"}
49+
│ ├── SetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"}
5050
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
5151
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
5252
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}
@@ -153,7 +153,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
153153
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
154154
│ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107}
155155
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
156-
│ ├── SetSequenceOptions {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"}
156+
│ ├── SetSequenceOption {"Key":"PER SESSION CACH...","SequenceID":107,"Value":"256"}
157157
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
158158
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
159159
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}

‎pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_cached_node/add_column_serial_simple_sequence_cached_node.explain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
4646
│ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."}
4747
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
4848
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
49-
│ ├── SetSequenceOptions {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"}
49+
│ ├── SetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"}
5050
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
5151
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
5252
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}
@@ -153,7 +153,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
153153
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
154154
│ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107}
155155
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
156-
│ ├── SetSequenceOptions {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"}
156+
│ ├── SetSequenceOption {"Key":"PER NODE CACHE","SequenceID":107,"Value":"256"}
157157
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
158158
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
159159
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}

‎pkg/sql/schemachanger/testdata/end_to_end/add_column_serial_simple_sequence_virtual/add_column_serial_simple_sequence_virtual.explain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
4646
│ ├── SetNameInDescriptor {"DescriptorID":107,"Name":"tbl_serial_id_se..."}
4747
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
4848
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
49-
│ ├── SetSequenceOptions {"Key":"VIRTUAL","SequenceID":107,"Value":"true"}
49+
│ ├── SetSequenceOption {"Key":"VIRTUAL","SequenceID":107,"Value":"true"}
5050
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
5151
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
5252
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}
@@ -153,7 +153,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN
153153
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"tbl_serial_id_se...","SchemaID":105}}
154154
│ ├── UpdateTTLScheduleMetadata {"NewName":"tbl_serial_id_se...","TableID":107}
155155
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":107,"SchemaID":105}}
156-
│ ├── SetSequenceOptions {"Key":"VIRTUAL","SequenceID":107,"Value":"true"}
156+
│ ├── SetSequenceOption {"Key":"VIRTUAL","SequenceID":107,"Value":"true"}
157157
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":107}}
158158
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":107}}
159159
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":107}

‎pkg/sql/schemachanger/testdata/end_to_end/create_complex/create_complex__statement_4_of_4.explain‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA
3434
│ ├── SetNameInDescriptor {"DescriptorID":108,"Name":"sq1"}
3535
│ ├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"sq1","SchemaID":106}}
3636
│ ├── SetObjectParentID {"ObjParent":{"ChildObjectID":108,"SchemaID":106}}
37-
│ ├── SetSequenceOptions {"Key":"START","SequenceID":108,"Value":"32"}
37+
│ ├── SetSequenceOption {"Key":"START","SequenceID":108,"Value":"32"}
3838
│ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":108}}
3939
│ ├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":108}}
4040
│ ├── SetColumnName {"ColumnID":1,"Name":"value","TableID":108}
@@ -161,7 +161,7 @@ Schema change plan for CREATE SEQUENCE ‹db›.‹sc›.‹sq1› MINVALUE 1 MA
161161
├── AddDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"sq1","SchemaID":106}}
162162
├── UpdateTTLScheduleMetadata {"NewName":"sq1","TableID":108}
163163
├── SetObjectParentID {"ObjParent":{"ChildObjectID":108,"SchemaID":106}}
164-
├── SetSequenceOptions {"Key":"START","SequenceID":108,"Value":"32"}
164+
├── SetSequenceOption {"Key":"START","SequenceID":108,"Value":"32"}
165165
├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":1,"TableID":108}}
166166
├── UpsertColumnType {"ColumnType":{"ColumnID":1,"TableID":108}}
167167
├── SetColumnName {"ColumnID":1,"Name":"value","TableID":108}

0 commit comments

Comments
 (0)