From 9c01a38ec4291235370086ddf9c9dc665611cd21 Mon Sep 17 00:00:00 2001 From: Mark Sirek Date: Mon, 12 Sep 2022 00:22:27 -0700 Subject: [PATCH 1/7] norm: do not fold floor division with unit denominator The floor division operator `//` is like division but drops the fractional portion of the result. Normalization rule FoldDivOne rewrites `(column // 1)` as `(column)` which is incorrect if the data in `column` has fractional digits, as those digits should be dropped. The solution is to only fold `(column // 1)` when `column` is one of the integer types. Release note (bug fix): This patch fixes incorrect results from the floor division operator, `//`, when the numerator is non-constant and the denominator is the constant 1. --- pkg/sql/logictest/testdata/logic_test/float | 14 +++++++++++ pkg/sql/opt/norm/general_funcs.go | 6 +++++ pkg/sql/opt/norm/rules/numeric.opt | 8 ++++++- .../opt/norm/testdata/rules/fold_constants | 21 ++++++++++++++++ pkg/sql/opt/norm/testdata/rules/numeric | 24 +++++++++++++++++++ 5 files changed, 72 insertions(+), 1 deletion(-) diff --git a/pkg/sql/logictest/testdata/logic_test/float b/pkg/sql/logictest/testdata/logic_test/float index d5466b5d0bcd..90ff52ee4f99 100644 --- a/pkg/sql/logictest/testdata/logic_test/float +++ b/pkg/sql/logictest/testdata/logic_test/float @@ -174,3 +174,17 @@ query BB SELECT 'nan'::decimal IS NAN, 'nan'::decimal IS NOT NAN ---- true false + +statement ok +CREATE TABLE t87605 (col2 FLOAT8 NULL) + +statement ok +insert into t87605 values (1.234567890123456e+13), (1.234567890123456e+6) + +# Regression test for issue #87605. +# The floor division operator `//` should not be folded away. +query F +SELECT ((col2::FLOAT8 // 1.0:::FLOAT8::FLOAT8)::FLOAT8) FROM t87605@[0] ORDER BY 1 +---- +1.234567e+06 +1.2345678901234e+13 diff --git a/pkg/sql/opt/norm/general_funcs.go b/pkg/sql/opt/norm/general_funcs.go index 9566bff90363..e24dc0b14678 100644 --- a/pkg/sql/opt/norm/general_funcs.go +++ b/pkg/sql/opt/norm/general_funcs.go @@ -70,6 +70,12 @@ func (c *CustomFuncs) IsJSON(scalar opt.ScalarExpr) bool { return scalar.DataType().Family() == types.JsonFamily } +// IsInt returns true if the given scalar expression is of one of the +// integer types. +func (c *CustomFuncs) IsInt(scalar opt.ScalarExpr) bool { + return scalar.DataType().Family() == types.IntFamily +} + // BoolType returns the boolean SQL type. func (c *CustomFuncs) BoolType() *types.T { return types.Bool diff --git a/pkg/sql/opt/norm/rules/numeric.opt b/pkg/sql/opt/norm/rules/numeric.opt index c7ebfb332320..a2605b14a941 100644 --- a/pkg/sql/opt/norm/rules/numeric.opt +++ b/pkg/sql/opt/norm/rules/numeric.opt @@ -44,7 +44,13 @@ # FoldDivOne folds $left / 1 for numeric types. [FoldDivOne, Normalize] -(Div | FloorDiv $left:* $right:(Const 1)) +(Div $left:* $right:(Const 1)) +=> +(Cast $left (BinaryType (OpName) $left $right)) + +# FoldFloorDivOne folds $left // 1 for integer types. +[FoldFloorDivOne, Normalize] +(FloorDiv $left:* $right:(Const 1) & (IsInt $left)) => (Cast $left (BinaryType (OpName) $left $right)) diff --git a/pkg/sql/opt/norm/testdata/rules/fold_constants b/pkg/sql/opt/norm/testdata/rules/fold_constants index bbe5ac8a0f79..a2715f66249e 100644 --- a/pkg/sql/opt/norm/testdata/rules/fold_constants +++ b/pkg/sql/opt/norm/testdata/rules/fold_constants @@ -441,6 +441,27 @@ values ├── fd: ()-->(1) └── (NULL,) +# Regression test for issue #87605. +norm expect=FoldBinary +SELECT 1.333 // 1.0 +---- +values + ├── columns: "?column?":1!null + ├── cardinality: [1 - 1] + ├── key: () + ├── fd: ()-->(1) + └── (1,) + +norm expect=FoldBinary +SELECT 2::INT // 1.0 +---- +values + ├── columns: "?column?":1!null + ├── cardinality: [1 - 1] + ├── key: () + ├── fd: ()-->(1) + └── (2,) + # -------------------------------------------------- # FoldUnary # -------------------------------------------------- diff --git a/pkg/sql/opt/norm/testdata/rules/numeric b/pkg/sql/opt/norm/testdata/rules/numeric index 45f033725a44..19718afa467e 100644 --- a/pkg/sql/opt/norm/testdata/rules/numeric +++ b/pkg/sql/opt/norm/testdata/rules/numeric @@ -188,6 +188,30 @@ project └── projections └── i:2::DECIMAL [as="?column?":8, outer=(2), immutable] +# -------------------------------------------------- +# FoldFloorDivOne +# -------------------------------------------------- + +# Regression test for issue #87605. +# The floor division operator `//` should only be folded when the numerator is +# an integer. +norm expect=FoldFloorDivOne +SELECT + a.i // 1 AS r, + a.f // 1 AS s, + a.d // 1 AS t +FROM a +---- +project + ├── columns: r:8 s:9 t:10 + ├── immutable + ├── scan a + │ └── columns: i:2 f:3 d:4 + └── projections + ├── i:2 [as=r:8, outer=(2)] + ├── f:3 // 1.0 [as=s:9, outer=(3), immutable] + └── d:4 // 1 [as=t:10, outer=(4), immutable] + # -------------------------------------------------- # InvertMinus # -------------------------------------------------- From 7aee9dac1e20e6088d613f6babd7889cd4c145d7 Mon Sep 17 00:00:00 2001 From: Nathan VanBenschoten Date: Thu, 22 Sep 2022 10:51:41 -0400 Subject: [PATCH 2/7] kv: fix spelling of "interceptor" in file name All other file names and code objects have the correct spelling. Release justification: None. Release note: None. --- pkg/kv/kvclient/kvcoord/BUILD.bazel | 2 +- ..._client_test.go => txn_interceptor_pipeliner_client_test.go} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkg/kv/kvclient/kvcoord/{txn_intercepter_pipeliner_client_test.go => txn_interceptor_pipeliner_client_test.go} (100%) diff --git a/pkg/kv/kvclient/kvcoord/BUILD.bazel b/pkg/kv/kvclient/kvcoord/BUILD.bazel index da1f5bfb569f..dd48ff36832d 100644 --- a/pkg/kv/kvclient/kvcoord/BUILD.bazel +++ b/pkg/kv/kvclient/kvcoord/BUILD.bazel @@ -134,9 +134,9 @@ go_test( "txn_coord_sender_server_test.go", "txn_coord_sender_test.go", "txn_correctness_test.go", - "txn_intercepter_pipeliner_client_test.go", "txn_interceptor_committer_test.go", "txn_interceptor_heartbeater_test.go", + "txn_interceptor_pipeliner_client_test.go", "txn_interceptor_pipeliner_test.go", "txn_interceptor_seq_num_allocator_test.go", "txn_interceptor_span_refresher_test.go", diff --git a/pkg/kv/kvclient/kvcoord/txn_intercepter_pipeliner_client_test.go b/pkg/kv/kvclient/kvcoord/txn_interceptor_pipeliner_client_test.go similarity index 100% rename from pkg/kv/kvclient/kvcoord/txn_intercepter_pipeliner_client_test.go rename to pkg/kv/kvclient/kvcoord/txn_interceptor_pipeliner_client_test.go From d91e4f48c3e61a5ccd6a128b2e411fa308fd36e9 Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Thu, 22 Sep 2022 11:22:48 -0400 Subject: [PATCH 3/7] kvserver/batcheval: ignore UseRangeTombstonesForPointDeletes knob sometimes We want to ignore the point deletion knob for cases where we're deleting data from system tables watched by rangefeeds. Not doing so can lead to missed updates. This is particularly critical for cluster settings. Fixes #87575 Fixes #87479 Release note: None --- pkg/storage/mvcc.go | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/pkg/storage/mvcc.go b/pkg/storage/mvcc.go index 1acb1a3cc680..71aeafccac98 100644 --- a/pkg/storage/mvcc.go +++ b/pkg/storage/mvcc.go @@ -6269,8 +6269,9 @@ func ReplacePointTombstonesWithRangeTombstones( key := iter.UnsafeKey() - // Skip intents and inline values. - if key.Timestamp.IsEmpty() { + // Skip intents and inline values, and system table keys which + // might be watched by rangefeeds. + if key.Timestamp.IsEmpty() || isWatchedSystemTable(key.Key) { iter.NextKey() continue } @@ -6362,3 +6363,29 @@ func ReplacePointTombstonesWithRangeTombstones( return nil } + +// In order to test the correctness of range deletion tombstones, we added a +// testing knob to replace point deletions with range deletion tombstones in +// some tests. Unfortuantely, doing so affects the correctness of rangefeeds. +// The tests in question do not use rangefeeds, but some system functionality +// does use rangefeeds internally. The primary impact is that catch-up scans +// will miss deletes. That makes these issues rare and hard to detect. In order +// to deflake these tests, we avoid rewriting deletes on relevant system +// tables. +func isWatchedSystemTable(key roachpb.Key) bool { + rem, _, err := keys.DecodeTenantPrefix(key) + if err != nil { // allow unprefixed keys to pass through + return false + } + _, tableID, _, err := keys.DecodeTableIDIndexID(rem) + if err != nil { // allow keys which do not correspond to sql tables + return false + } + switch tableID { + case keys.SettingsTableID, keys.SpanConfigurationsTableID, + keys.SQLInstancesTableID, keys.DescriptorTableID, keys.ZonesTableID: + return true + default: + return false + } +} From 3410251a04fe87be9cebe1bfaa8f5fdae0f5d960 Mon Sep 17 00:00:00 2001 From: Faizan Qazi Date: Thu, 22 Sep 2022 11:29:52 -0400 Subject: [PATCH 4/7] workload/schemachange/mixed-version: avoid index visibility Fixes: #87768 Previously, we were generating statements with invisible indexes in mixed version environments, which could lead to statements generated not supported on older versions. To address this, this patch will prevent the generation of create table/ create index statements with invisible indexes. Release note: None --- .../schemachange/operation_generator.go | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkg/workload/schemachange/operation_generator.go b/pkg/workload/schemachange/operation_generator.go index 5a94ccecc7c7..b6aee0a68605 100644 --- a/pkg/workload/schemachange/operation_generator.go +++ b/pkg/workload/schemachange/operation_generator.go @@ -934,13 +934,22 @@ func (og *operationGenerator) createIndex(ctx context.Context, tx pgx.Tx) (*opSt return nil, err } + // Only generate invisible indexes when they are supported. + invisibleIndexesIsNotSupported, err := isClusterVersionLessThan( + ctx, + tx, + clusterversion.ByKey(clusterversion.Start22_2)) + if err != nil { + return nil, err + } + def := &tree.CreateIndex{ Name: tree.Name(indexName), Table: *tableName, - Unique: og.randIntn(4) == 0, // 25% UNIQUE - Inverted: og.randIntn(10) == 0, // 10% INVERTED - IfNotExists: og.randIntn(2) == 0, // 50% IF NOT EXISTS - NotVisible: og.randIntn(20) == 0, // 5% NOT VISIBLE + Unique: og.randIntn(4) == 0, // 25% UNIQUE + Inverted: og.randIntn(10) == 0, // 10% INVERTED + IfNotExists: og.randIntn(2) == 0, // 50% IF NOT EXISTS + NotVisible: og.randIntn(20) == 0 && !invisibleIndexesIsNotSupported, // 5% NOT VISIBLE } regionColumn := "" @@ -1207,6 +1216,26 @@ func (og *operationGenerator) createTable(ctx context.Context, tx pgx.Tx) (*opSt return false }() + invisibleIndexesIsNotSupported, err := isClusterVersionLessThan( + ctx, + tx, + clusterversion.ByKey(clusterversion.Start22_2)) + if err != nil { + return nil, err + } + hasInvisibleIndexesUnsupported := func() bool { + if !invisibleIndexesIsNotSupported { + return false + } + // Check if any of the indexes have trigrams involved. + for _, def := range stmt.Defs { + if idx, ok := def.(*tree.IndexTableDef); ok && idx.NotVisible { + return true + } + } + return false + }() + tableExists, err := og.tableExists(ctx, tx, tableName) if err != nil { return nil, err @@ -1224,6 +1253,7 @@ func (og *operationGenerator) createTable(ctx context.Context, tx pgx.Tx) (*opSt // fully transaction aware. codesWithConditions{ {code: pgcode.FeatureNotSupported, condition: hasTrigramIdxUnsupported}, + {code: pgcode.Syntax, condition: hasInvisibleIndexesUnsupported}, }.add(opStmt.potentialExecErrors) opStmt.sql = tree.Serialize(stmt) return opStmt, nil From 29934cda2bc1112c0e957a8b0dae6b44fcb5cb67 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Thu, 22 Sep 2022 12:38:29 -0400 Subject: [PATCH 5/7] multitenant: add TestTenants() helper to TestServer This patch adds a helper method for accessing information about the tenant(s) that were probabilistically created with the TestServer. Release note: None --- pkg/server/testserver.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go index 30cc223ab7fc..38e60ad50e3d 100644 --- a/pkg/server/testserver.go +++ b/pkg/server/testserver.go @@ -501,6 +501,11 @@ func (ts *TestServer) TenantStatusServer() interface{} { return ts.status } +// TestTenants provides information to tenant(s) that _may_ have been created +func (ts *TestServer) TestTenants() []serverutils.TestTenantInterface { + return ts.testTenants +} + // maybeStartDefaultTestTenant might start a test tenant. This can then be used // for multi-tenant testing, where the default SQL connection will be made to // this tenant instead of to the system tenant. Note that we will From 88774f800ec0abae16beec13891f972485705d57 Mon Sep 17 00:00:00 2001 From: Raphael 'kena' Poss Date: Thu, 22 Sep 2022 19:07:37 +0200 Subject: [PATCH 6/7] cli/sql: increase maxHistEntries In light of PR #88272, we don't need the limit to be as low as 1000. This commit increases it back to 10000, which is the common default in unix shells and the screen/tmux utilities. Release note: None --- pkg/cli/clisqlshell/sql.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cli/clisqlshell/sql.go b/pkg/cli/clisqlshell/sql.go index f3735355984c..cd98b1feb94f 100644 --- a/pkg/cli/clisqlshell/sql.go +++ b/pkg/cli/clisqlshell/sql.go @@ -2164,7 +2164,7 @@ func (c *cliState) configurePreShellDefaults( // anyone. We do prefer a limit however (as opposed to no limit at // all), to prevent abnormal situation where a history runs into // megabytes and starts slowing down the shell. - const maxHistEntries = 1000 + const maxHistEntries = 10000 c.ins.SetCompleter(c) if err := c.ins.UseHistory(maxHistEntries, true /*dedup*/); err != nil { From b31d532a24db70efb496f7c3fc34cbef5e475bb4 Mon Sep 17 00:00:00 2001 From: Xiang Gu Date: Fri, 16 Sep 2022 19:30:17 -0400 Subject: [PATCH 7/7] *: audit operation names in new schema changer This PR made non-functional changes related to new schema changer ops: 1. Rename all status changing operation on Index and Column to comform to the pattern: `Make[StatusA][Index/Column][StatusB]` 2. Rename a few constant/field/function names to be consistent with the principle of "being explicit": 2.1. Rename operation name `XxxGcXxx` to `XxxGCXxx`; 2.2. Rename field name in operations `DescID` to `DescriptorID`; 2.3. Rename descpb.DELETE_AND_WRITE_ONLY to descpb.WRITE_ONLY; 2.4. Rename sql.RunningStatusDeleteAndWriteOnly to sql.RunningStatusWriteOnly 3. Seveal comments enhencement 4. Rename `DELETE_AND_WRITE_ONLY` to `WRITE_ONLY` in some files under docs/. Release note: None --- .../20200909_transactional_schema_changes.md | 14 +- pkg/ccl/backupccl/backup_test.go | 4 +- .../schematestutils/schema_test_utils.go | 10 +- .../testdata/end_to_end/create_index | 8 +- .../testdata/explain/create_index | 14 +- .../explain/create_index.rollback_1_of_7 | 4 +- .../explain/create_index.rollback_2_of_7 | 6 +- .../explain/create_index.rollback_3_of_7 | 6 +- .../explain/create_index.rollback_4_of_7 | 6 +- .../explain/create_index.rollback_5_of_7 | 8 +- .../explain/create_index.rollback_6_of_7 | 8 +- .../explain/create_index.rollback_7_of_7 | 8 +- .../drop_database_multiregion_primary_region | 32 ++-- .../testdata/explain/drop_table_multiregion | 14 +- .../drop_table_multiregion_primary_region | 14 +- .../testdata/explain_verbose/create_index | 14 +- .../create_index.rollback_1_of_7 | 4 +- .../create_index.rollback_2_of_7 | 6 +- .../create_index.rollback_3_of_7 | 6 +- .../create_index.rollback_4_of_7 | 6 +- .../create_index.rollback_5_of_7 | 8 +- .../create_index.rollback_6_of_7 | 8 +- .../create_index.rollback_7_of_7 | 8 +- .../drop_database_multiregion_primary_region | 32 ++-- .../explain_verbose/drop_table_multiregion | 14 +- .../drop_table_multiregion_primary_region | 14 +- pkg/jobs/registry_test.go | 2 +- pkg/sql/backfill.go | 18 +- pkg/sql/backfill/index_backfiller_cols.go | 4 +- pkg/sql/catalog/descpb/structured.proto | 6 +- pkg/sql/catalog/descriptor.go | 4 +- pkg/sql/catalog/schemaexpr/default_exprs.go | 2 +- pkg/sql/catalog/tabledesc/mutation.go | 2 +- pkg/sql/catalog/tabledesc/safe_format_test.go | 4 +- pkg/sql/catalog/tabledesc/structured.go | 6 +- pkg/sql/delete_preserving_index_test.go | 14 +- pkg/sql/descriptor_mutation_test.go | 34 ++-- pkg/sql/indexbackfiller_test.go | 14 +- .../testdata/logic_test/partial_index | 2 +- .../opt/exec/execbuilder/testdata/show_trace | 2 +- pkg/sql/schema_changer.go | 18 +- pkg/sql/schema_changer_test.go | 6 +- pkg/sql/schemachanger/scdecomp/helpers.go | 2 +- .../scexec/exec_backfill_test.go | 2 +- .../schemachanger/scexec/exec_validation.go | 4 +- .../scexec/executor_external_test.go | 2 +- .../scexec/scmutationexec/column.go | 30 +-- .../scexec/scmutationexec/drop.go | 16 +- .../scexec/scmutationexec/helpers.go | 2 +- .../scexec/scmutationexec/index.go | 40 ++-- .../scexec/scmutationexec/references.go | 2 +- pkg/sql/schemachanger/scop/mutation.go | 101 +++++----- .../scop/mutation_visitor_generated.go | 102 +++++----- pkg/sql/schemachanger/scop/validation.go | 7 +- .../scop/validation_visitor_generated.go | 6 +- .../scplan/internal/opgen/opgen_alias_type.go | 6 +- .../scplan/internal/opgen/opgen_column.go | 24 +-- .../scplan/internal/opgen/opgen_database.go | 10 +- .../scplan/internal/opgen/opgen_enum_type.go | 6 +- .../internal/opgen/opgen_primary_index.go | 24 +-- .../scplan/internal/opgen/opgen_schema.go | 6 +- .../internal/opgen/opgen_secondary_index.go | 26 ++- .../scplan/internal/opgen/opgen_sequence.go | 10 +- .../scplan/internal/opgen/opgen_table.go | 10 +- .../opgen_table_locality_secondary_region.go | 4 +- .../internal/opgen/opgen_temporary_index.go | 16 +- .../internal/opgen/opgen_user_privileges.go | 4 +- .../scplan/internal/opgen/opgen_view.go | 14 +- .../scplan/internal/scgraph/graph_test.go | 4 +- .../scplan/testdata/alter_table_add_column | 176 +++++++++--------- .../testdata/alter_table_alter_primary_key | 46 ++--- .../scplan/testdata/alter_table_drop_column | 96 +++++----- .../scplan/testdata/create_index | 28 +-- .../scplan/testdata/drop_database | 128 ++++++------- .../schemachanger/scplan/testdata/drop_index | 46 ++--- .../scplan/testdata/drop_owned_by | 84 ++++----- .../schemachanger/scplan/testdata/drop_schema | 96 +++++----- .../scplan/testdata/drop_sequence | 12 +- .../schemachanger/scplan/testdata/drop_table | 54 +++--- .../schemachanger/scplan/testdata/drop_type | 8 +- .../schemachanger/scplan/testdata/drop_view | 72 +++---- .../testdata/end_to_end/add_column | 12 +- .../end_to_end/add_column_default_seq | 12 +- .../testdata/end_to_end/add_column_no_default | 4 +- .../alter_table_add_primary_key_drop_rowid | 22 +-- .../alter_table_alter_primary_key_drop_rowid | 22 +-- .../alter_table_alter_primary_key_vanilla | 16 +- .../testdata/end_to_end/create_index | 8 +- .../testdata/end_to_end/drop_column_basic | 12 +- .../end_to_end/drop_column_computed_index | 22 +-- ...op_column_create_index_separate_statements | 36 ++-- .../end_to_end/drop_column_unique_index | 12 +- .../end_to_end/drop_column_with_index | 18 +- .../end_to_end/drop_index_hash_sharded_index | 8 +- .../drop_index_partial_expression_index | 8 +- .../end_to_end/drop_index_vanilla_index | 4 +- .../drop_multiple_columns_separate_statements | 28 +-- .../schemachanger/testdata/explain/add_column | 26 +-- .../explain/add_column.rollback_1_of_7 | 6 +- .../explain/add_column.rollback_2_of_7 | 10 +- .../explain/add_column.rollback_3_of_7 | 10 +- .../explain/add_column.rollback_4_of_7 | 10 +- .../explain/add_column.rollback_5_of_7 | 12 +- .../explain/add_column.rollback_6_of_7 | 12 +- .../explain/add_column.rollback_7_of_7 | 12 +- .../testdata/explain/add_column_default_seq | 26 +-- .../add_column_default_seq.rollback_1_of_7 | 6 +- .../add_column_default_seq.rollback_2_of_7 | 10 +- .../add_column_default_seq.rollback_3_of_7 | 10 +- .../add_column_default_seq.rollback_4_of_7 | 10 +- .../add_column_default_seq.rollback_5_of_7 | 12 +- .../add_column_default_seq.rollback_6_of_7 | 12 +- .../add_column_default_seq.rollback_7_of_7 | 12 +- .../testdata/explain/add_column_no_default | 6 +- .../add_column_no_default.rollback_1_of_2 | 2 +- .../add_column_no_default.rollback_2_of_2 | 4 +- .../alter_table_add_primary_key_drop_rowid | 46 ++--- ...d_primary_key_drop_rowid.rollback_10_of_15 | 20 +- ...d_primary_key_drop_rowid.rollback_11_of_15 | 20 +- ...d_primary_key_drop_rowid.rollback_12_of_15 | 20 +- ...d_primary_key_drop_rowid.rollback_13_of_15 | 22 +-- ...d_primary_key_drop_rowid.rollback_14_of_15 | 22 +-- ...d_primary_key_drop_rowid.rollback_15_of_15 | 22 +-- ...dd_primary_key_drop_rowid.rollback_1_of_15 | 8 +- ...dd_primary_key_drop_rowid.rollback_2_of_15 | 10 +- ...dd_primary_key_drop_rowid.rollback_3_of_15 | 10 +- ...dd_primary_key_drop_rowid.rollback_4_of_15 | 10 +- ...dd_primary_key_drop_rowid.rollback_5_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_6_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_7_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_8_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_9_of_15 | 18 +- .../alter_table_alter_primary_key_drop_rowid | 46 ++--- ...r_primary_key_drop_rowid.rollback_10_of_15 | 20 +- ...r_primary_key_drop_rowid.rollback_11_of_15 | 20 +- ...r_primary_key_drop_rowid.rollback_12_of_15 | 20 +- ...r_primary_key_drop_rowid.rollback_13_of_15 | 22 +-- ...r_primary_key_drop_rowid.rollback_14_of_15 | 22 +-- ...r_primary_key_drop_rowid.rollback_15_of_15 | 22 +-- ...er_primary_key_drop_rowid.rollback_1_of_15 | 8 +- ...er_primary_key_drop_rowid.rollback_2_of_15 | 10 +- ...er_primary_key_drop_rowid.rollback_3_of_15 | 10 +- ...er_primary_key_drop_rowid.rollback_4_of_15 | 10 +- ...er_primary_key_drop_rowid.rollback_5_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_6_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_7_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_8_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_9_of_15 | 18 +- .../alter_table_alter_primary_key_vanilla | 34 ++-- ..._alter_primary_key_vanilla.rollback_1_of_7 | 8 +- ..._alter_primary_key_vanilla.rollback_2_of_7 | 12 +- ..._alter_primary_key_vanilla.rollback_3_of_7 | 12 +- ..._alter_primary_key_vanilla.rollback_4_of_7 | 12 +- ..._alter_primary_key_vanilla.rollback_5_of_7 | 16 +- ..._alter_primary_key_vanilla.rollback_6_of_7 | 16 +- ..._alter_primary_key_vanilla.rollback_7_of_7 | 16 +- .../testdata/explain/create_index | 14 +- .../explain/create_index.rollback_1_of_7 | 4 +- .../explain/create_index.rollback_2_of_7 | 6 +- .../explain/create_index.rollback_3_of_7 | 6 +- .../explain/create_index.rollback_4_of_7 | 6 +- .../explain/create_index.rollback_5_of_7 | 8 +- .../explain/create_index.rollback_6_of_7 | 8 +- .../explain/create_index.rollback_7_of_7 | 8 +- .../testdata/explain/drop_column_basic | 26 +-- .../explain/drop_column_basic.rollback_1_of_7 | 6 +- .../explain/drop_column_basic.rollback_2_of_7 | 8 +- .../explain/drop_column_basic.rollback_3_of_7 | 8 +- .../explain/drop_column_basic.rollback_4_of_7 | 8 +- .../explain/drop_column_basic.rollback_5_of_7 | 10 +- .../explain/drop_column_basic.rollback_6_of_7 | 10 +- .../explain/drop_column_basic.rollback_7_of_7 | 10 +- .../explain/drop_column_computed_index | 38 ++-- ...drop_column_computed_index.rollback_1_of_7 | 10 +- ...drop_column_computed_index.rollback_2_of_7 | 12 +- ...drop_column_computed_index.rollback_3_of_7 | 12 +- ...drop_column_computed_index.rollback_4_of_7 | 12 +- ...drop_column_computed_index.rollback_5_of_7 | 14 +- ...drop_column_computed_index.rollback_6_of_7 | 14 +- ...drop_column_computed_index.rollback_7_of_7 | 14 +- ...ndex_separate_statements.rollback_10_of_15 | 24 +-- ...ndex_separate_statements.rollback_11_of_15 | 24 +-- ...ndex_separate_statements.rollback_12_of_15 | 24 +-- ...ndex_separate_statements.rollback_13_of_15 | 26 +-- ...ndex_separate_statements.rollback_14_of_15 | 26 +-- ...ndex_separate_statements.rollback_15_of_15 | 26 +-- ...index_separate_statements.rollback_1_of_15 | 10 +- ...index_separate_statements.rollback_2_of_15 | 12 +- ...index_separate_statements.rollback_3_of_15 | 12 +- ...index_separate_statements.rollback_4_of_15 | 12 +- ...index_separate_statements.rollback_5_of_15 | 14 +- ...index_separate_statements.rollback_6_of_15 | 14 +- ...index_separate_statements.rollback_7_of_15 | 14 +- ...index_separate_statements.rollback_8_of_15 | 14 +- ...index_separate_statements.rollback_9_of_15 | 22 +-- ...index_separate_statements.statement_1_of_2 | 38 ++-- ...index_separate_statements.statement_2_of_2 | 42 ++--- .../testdata/explain/drop_column_unique_index | 26 +-- .../drop_column_unique_index.rollback_1_of_7 | 6 +- .../drop_column_unique_index.rollback_2_of_7 | 8 +- .../drop_column_unique_index.rollback_3_of_7 | 8 +- .../drop_column_unique_index.rollback_4_of_7 | 8 +- .../drop_column_unique_index.rollback_5_of_7 | 10 +- .../drop_column_unique_index.rollback_6_of_7 | 10 +- .../drop_column_unique_index.rollback_7_of_7 | 10 +- .../testdata/explain/drop_column_with_index | 32 ++-- .../drop_column_with_index.rollback_1_of_7 | 8 +- .../drop_column_with_index.rollback_2_of_7 | 10 +- .../drop_column_with_index.rollback_3_of_7 | 10 +- .../drop_column_with_index.rollback_4_of_7 | 10 +- .../drop_column_with_index.rollback_5_of_7 | 12 +- .../drop_column_with_index.rollback_6_of_7 | 12 +- .../drop_column_with_index.rollback_7_of_7 | 12 +- .../explain/drop_index_hash_sharded_index | 12 +- .../drop_index_partial_expression_index | 12 +- .../testdata/explain/drop_index_vanilla_index | 6 +- ...olumns_separate_statements.rollback_1_of_7 | 12 +- ...olumns_separate_statements.rollback_2_of_7 | 14 +- ...olumns_separate_statements.rollback_3_of_7 | 14 +- ...olumns_separate_statements.rollback_4_of_7 | 14 +- ...olumns_separate_statements.rollback_5_of_7 | 16 +- ...olumns_separate_statements.rollback_6_of_7 | 16 +- ...olumns_separate_statements.rollback_7_of_7 | 16 +- ...lumns_separate_statements.statement_1_of_2 | 38 ++-- ...lumns_separate_statements.statement_2_of_2 | 34 ++-- .../testdata/explain/drop_schema | 4 +- .../schemachanger/testdata/explain/drop_table | 16 +- .../testdata/explain_verbose/add_column | 26 +-- .../add_column.rollback_1_of_7 | 6 +- .../add_column.rollback_2_of_7 | 10 +- .../add_column.rollback_3_of_7 | 10 +- .../add_column.rollback_4_of_7 | 10 +- .../add_column.rollback_5_of_7 | 12 +- .../add_column.rollback_6_of_7 | 12 +- .../add_column.rollback_7_of_7 | 12 +- .../explain_verbose/add_column_default_seq | 26 +-- .../add_column_default_seq.rollback_1_of_7 | 6 +- .../add_column_default_seq.rollback_2_of_7 | 10 +- .../add_column_default_seq.rollback_3_of_7 | 10 +- .../add_column_default_seq.rollback_4_of_7 | 10 +- .../add_column_default_seq.rollback_5_of_7 | 12 +- .../add_column_default_seq.rollback_6_of_7 | 12 +- .../add_column_default_seq.rollback_7_of_7 | 12 +- .../explain_verbose/add_column_no_default | 6 +- .../add_column_no_default.rollback_1_of_2 | 2 +- .../add_column_no_default.rollback_2_of_2 | 4 +- .../alter_table_add_primary_key_drop_rowid | 46 ++--- ...d_primary_key_drop_rowid.rollback_10_of_15 | 20 +- ...d_primary_key_drop_rowid.rollback_11_of_15 | 20 +- ...d_primary_key_drop_rowid.rollback_12_of_15 | 20 +- ...d_primary_key_drop_rowid.rollback_13_of_15 | 22 +-- ...d_primary_key_drop_rowid.rollback_14_of_15 | 22 +-- ...d_primary_key_drop_rowid.rollback_15_of_15 | 22 +-- ...dd_primary_key_drop_rowid.rollback_1_of_15 | 8 +- ...dd_primary_key_drop_rowid.rollback_2_of_15 | 10 +- ...dd_primary_key_drop_rowid.rollback_3_of_15 | 10 +- ...dd_primary_key_drop_rowid.rollback_4_of_15 | 10 +- ...dd_primary_key_drop_rowid.rollback_5_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_6_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_7_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_8_of_15 | 12 +- ...dd_primary_key_drop_rowid.rollback_9_of_15 | 18 +- .../alter_table_alter_primary_key_drop_rowid | 46 ++--- ...r_primary_key_drop_rowid.rollback_10_of_15 | 20 +- ...r_primary_key_drop_rowid.rollback_11_of_15 | 20 +- ...r_primary_key_drop_rowid.rollback_12_of_15 | 20 +- ...r_primary_key_drop_rowid.rollback_13_of_15 | 22 +-- ...r_primary_key_drop_rowid.rollback_14_of_15 | 22 +-- ...r_primary_key_drop_rowid.rollback_15_of_15 | 22 +-- ...er_primary_key_drop_rowid.rollback_1_of_15 | 8 +- ...er_primary_key_drop_rowid.rollback_2_of_15 | 10 +- ...er_primary_key_drop_rowid.rollback_3_of_15 | 10 +- ...er_primary_key_drop_rowid.rollback_4_of_15 | 10 +- ...er_primary_key_drop_rowid.rollback_5_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_6_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_7_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_8_of_15 | 12 +- ...er_primary_key_drop_rowid.rollback_9_of_15 | 18 +- .../alter_table_alter_primary_key_vanilla | 34 ++-- ..._alter_primary_key_vanilla.rollback_1_of_7 | 8 +- ..._alter_primary_key_vanilla.rollback_2_of_7 | 12 +- ..._alter_primary_key_vanilla.rollback_3_of_7 | 12 +- ..._alter_primary_key_vanilla.rollback_4_of_7 | 12 +- ..._alter_primary_key_vanilla.rollback_5_of_7 | 16 +- ..._alter_primary_key_vanilla.rollback_6_of_7 | 16 +- ..._alter_primary_key_vanilla.rollback_7_of_7 | 16 +- .../testdata/explain_verbose/create_index | 14 +- .../create_index.rollback_1_of_7 | 4 +- .../create_index.rollback_2_of_7 | 6 +- .../create_index.rollback_3_of_7 | 6 +- .../create_index.rollback_4_of_7 | 6 +- .../create_index.rollback_5_of_7 | 8 +- .../create_index.rollback_6_of_7 | 8 +- .../create_index.rollback_7_of_7 | 8 +- .../explain_verbose/drop_column_basic | 26 +-- .../drop_column_basic.rollback_1_of_7 | 6 +- .../drop_column_basic.rollback_2_of_7 | 8 +- .../drop_column_basic.rollback_3_of_7 | 8 +- .../drop_column_basic.rollback_4_of_7 | 8 +- .../drop_column_basic.rollback_5_of_7 | 10 +- .../drop_column_basic.rollback_6_of_7 | 10 +- .../drop_column_basic.rollback_7_of_7 | 10 +- .../drop_column_computed_index | 38 ++-- ...drop_column_computed_index.rollback_1_of_7 | 10 +- ...drop_column_computed_index.rollback_2_of_7 | 12 +- ...drop_column_computed_index.rollback_3_of_7 | 12 +- ...drop_column_computed_index.rollback_4_of_7 | 12 +- ...drop_column_computed_index.rollback_5_of_7 | 14 +- ...drop_column_computed_index.rollback_6_of_7 | 14 +- ...drop_column_computed_index.rollback_7_of_7 | 14 +- ...ndex_separate_statements.rollback_10_of_15 | 24 +-- ...ndex_separate_statements.rollback_11_of_15 | 24 +-- ...ndex_separate_statements.rollback_12_of_15 | 24 +-- ...ndex_separate_statements.rollback_13_of_15 | 26 +-- ...ndex_separate_statements.rollback_14_of_15 | 26 +-- ...ndex_separate_statements.rollback_15_of_15 | 26 +-- ...index_separate_statements.rollback_1_of_15 | 10 +- ...index_separate_statements.rollback_2_of_15 | 12 +- ...index_separate_statements.rollback_3_of_15 | 12 +- ...index_separate_statements.rollback_4_of_15 | 12 +- ...index_separate_statements.rollback_5_of_15 | 14 +- ...index_separate_statements.rollback_6_of_15 | 14 +- ...index_separate_statements.rollback_7_of_15 | 14 +- ...index_separate_statements.rollback_8_of_15 | 14 +- ...index_separate_statements.rollback_9_of_15 | 22 +-- ...index_separate_statements.statement_1_of_2 | 38 ++-- ...index_separate_statements.statement_2_of_2 | 42 ++--- .../explain_verbose/drop_column_unique_index | 26 +-- .../drop_column_unique_index.rollback_1_of_7 | 6 +- .../drop_column_unique_index.rollback_2_of_7 | 8 +- .../drop_column_unique_index.rollback_3_of_7 | 8 +- .../drop_column_unique_index.rollback_4_of_7 | 8 +- .../drop_column_unique_index.rollback_5_of_7 | 10 +- .../drop_column_unique_index.rollback_6_of_7 | 10 +- .../drop_column_unique_index.rollback_7_of_7 | 10 +- .../explain_verbose/drop_column_with_index | 32 ++-- .../drop_column_with_index.rollback_1_of_7 | 8 +- .../drop_column_with_index.rollback_2_of_7 | 10 +- .../drop_column_with_index.rollback_3_of_7 | 10 +- .../drop_column_with_index.rollback_4_of_7 | 10 +- .../drop_column_with_index.rollback_5_of_7 | 12 +- .../drop_column_with_index.rollback_6_of_7 | 12 +- .../drop_column_with_index.rollback_7_of_7 | 12 +- .../drop_index_hash_sharded_index | 12 +- .../drop_index_partial_expression_index | 12 +- .../explain_verbose/drop_index_vanilla_index | 6 +- ...olumns_separate_statements.rollback_1_of_7 | 12 +- ...olumns_separate_statements.rollback_2_of_7 | 14 +- ...olumns_separate_statements.rollback_3_of_7 | 14 +- ...olumns_separate_statements.rollback_4_of_7 | 14 +- ...olumns_separate_statements.rollback_5_of_7 | 16 +- ...olumns_separate_statements.rollback_6_of_7 | 16 +- ...olumns_separate_statements.rollback_7_of_7 | 16 +- ...lumns_separate_statements.statement_1_of_2 | 38 ++-- ...lumns_separate_statements.statement_2_of_2 | 34 ++-- .../testdata/explain_verbose/drop_schema | 4 +- .../testdata/explain_verbose/drop_table | 16 +- .../index_mutations/delete_preserving_delete | 10 +- .../delete_preserving_unique_index | 2 +- .../index_mutations/delete_preserving_update | 10 +- .../index_mutations/delete_preserving_upsert | 14 +- pkg/sql/testdata/index_mutations/merging | 2 +- pkg/sql/tests/rename_column_test.go | 6 +- 363 files changed, 2946 insertions(+), 2938 deletions(-) diff --git a/docs/RFCS/20200909_transactional_schema_changes.md b/docs/RFCS/20200909_transactional_schema_changes.md index e9f9a0521d11..d53eb67a1982 100644 --- a/docs/RFCS/20200909_transactional_schema_changes.md +++ b/docs/RFCS/20200909_transactional_schema_changes.md @@ -57,7 +57,7 @@ interesting cases that will get more attention later. When dropping a column, the column is logically dropped immediately when the transaction which is performing the drop commits; the -column goes from `PUBLIC`->`DELETE_AND_WRITE_ONLY`->`DELETE_ONLY`->`DROPPED`. +column goes from `PUBLIC`->`WRITE_ONLY`->`DELETE_ONLY`->`DROPPED`. The important thing to note is that the writing transaction uses its provisional view of the table descriptor. The following is fine: @@ -227,7 +227,7 @@ Ideally, at this point, the ongoing transaction could treat c1 as a `PUBLIC` column and could perform reads and writes against it. Let's say that at the outset `foo` is at version 1 (`foo@v1`). Recall from the [online schema change RFC] and the [F1 schema change paper] that the steps to adding a column are -`DELETE_ONLY`->`DELETE_AND_WRITE_ONLY`->(maybe backfill)->`PUBLIC`. +`DELETE_ONLY`->`WRITE_ONLY`->(maybe backfill)->`PUBLIC`. In this proposal, during the execution of the above statement we'd first perform a single-step schema change in a [child transaction](#child-transactions) @@ -242,7 +242,7 @@ transactions to wait for all leases on the old version to be dropped (see Once the child transaction commits and has evidence that all leases on all nodes are up-to-date, the statement execution can continue. At this point, a new child transaction can write and commit the table descriptor which has the column in -`DELETE_AND_WRITE_ONLY` with a pending mutation to perform a backfill. Once all +`WRITE_ONLY` with a pending mutation to perform a backfill. Once all nodes have adopted this latest version, a backfill of the new index can be performed. So long as the column does not become `PUBLIC` before the user transaction commits, other transactions won't observe its side effects (if there @@ -290,7 +290,7 @@ described by the descriptor which will be committed. The backfill process determines which rows to rewrite based on their MVCC timestamp. Specifically it will only backfill rows which have an MVCC timestamp earlier than the ModificationTime (i.e. commit timestamp as of [#40581]) which moved the newly -added column to `DELETE_AND_WRITE_ONLY`. +added column to `WRITE_ONLY`. ```sql postgres=> COMMIT; @@ -648,7 +648,7 @@ partition "ALTER TABLE Implementation" { #LightBlue:Commit child transaction; #LightBlue:Wait for one version using new child transaction; } - partition "Move column to DELETE_AND_WRITE_ONLY" { + partition "Move column to WRITE_ONLY" { #LightBlue:Read descriptor using new child transaction; note right The version really should not have changed unless the @@ -661,7 +661,7 @@ partition "ALTER TABLE Implementation" { concurrent with transactional schema changes. end note #LightBlue:Write new descriptor version with - `DELETE_AND_WRITE_ONLY` column and index; + `WRITE_ONLY` column and index; #LightBlue:Wait for one version using new child transaction; } partition "Perform backfill" { @@ -677,7 +677,7 @@ partition "ALTER TABLE Implementation" { partition "Prepare user transaction for next statement" { :Push the user transaction to a timestamp above the read timestamp at which all nodes were on a version where the new index and column - are in `DELETE_AND_WRITE_ONLY`; + are in `WRITE_ONLY`; :Acquire new lease on current version of descriptor; :Synthesize a descriptor which has the old primary index in `DELETE_AND_ WRITE_ONLY` and the newly backfilled index as the diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go index 06b3a792796b..0d37b2b3d58b 100644 --- a/pkg/ccl/backupccl/backup_test.go +++ b/pkg/ccl/backupccl/backup_test.go @@ -6003,7 +6003,7 @@ func getMockTableDesc( for _, addingIndex := range addingIndexes { mutationID++ mockTableDescriptor.Mutations = append(mockTableDescriptor.Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_ADD, Descriptor_: &descpb.DescriptorMutation_Index{Index: &addingIndex}, MutationID: mutationID, @@ -6012,7 +6012,7 @@ func getMockTableDesc( for _, droppingIndex := range droppingIndexes { mutationID++ mockTableDescriptor.Mutations = append(mockTableDescriptor.Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_DROP, Descriptor_: &descpb.DescriptorMutation_Index{Index: &droppingIndex}, MutationID: mutationID, diff --git a/pkg/ccl/changefeedccl/schemafeed/schematestutils/schema_test_utils.go b/pkg/ccl/changefeedccl/schemafeed/schematestutils/schema_test_utils.go index 22729093bb0e..b76dd3e22cf1 100644 --- a/pkg/ccl/changefeedccl/schemafeed/schematestutils/schema_test_utils.go +++ b/pkg/ccl/changefeedccl/schemafeed/schematestutils/schema_test_utils.go @@ -72,7 +72,7 @@ func SetLocalityRegionalByRow(desc catalog.TableDescriptor) catalog.TableDescrip // Yes, this does modify an immutable. func AddColumnDropBackfillMutation(desc catalog.TableDescriptor) catalog.TableDescriptor { desc.TableDesc().Mutations = append(desc.TableDesc().Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_DROP, Descriptor_: &descpb.DescriptorMutation_Column{Column: MakeColumnDesc(desc.GetNextColumnID() - 1)}, }) @@ -84,7 +84,7 @@ func AddColumnDropBackfillMutation(desc catalog.TableDescriptor) catalog.TableDe func AddNewColumnBackfillMutation(desc catalog.TableDescriptor) catalog.TableDescriptor { desc.TableDesc().Mutations = append(desc.TableDesc().Mutations, descpb.DescriptorMutation{ Descriptor_: &descpb.DescriptorMutation_Column{Column: MakeColumnDesc(desc.GetNextColumnID())}, - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_ADD, MutationID: 0, Rollback: false, @@ -96,7 +96,7 @@ func AddNewColumnBackfillMutation(desc catalog.TableDescriptor) catalog.TableDes // Yes, this does modify an immutable. func AddPrimaryKeySwapMutation(desc catalog.TableDescriptor) catalog.TableDescriptor { desc.TableDesc().Mutations = append(desc.TableDesc().Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_ADD, Descriptor_: &descpb.DescriptorMutation_PrimaryKeySwap{PrimaryKeySwap: &descpb.PrimaryKeySwap{}}, }) @@ -107,7 +107,7 @@ func AddPrimaryKeySwapMutation(desc catalog.TableDescriptor) catalog.TableDescri // Yes, this does modify an immutable. func AddNewIndexMutation(desc catalog.TableDescriptor) catalog.TableDescriptor { desc.TableDesc().Mutations = append(desc.TableDesc().Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_ADD, Descriptor_: &descpb.DescriptorMutation_Index{Index: &descpb.IndexDescriptor{}}, }) @@ -118,7 +118,7 @@ func AddNewIndexMutation(desc catalog.TableDescriptor) catalog.TableDescriptor { // Yes, this does modify an immutable. func AddDropIndexMutation(desc catalog.TableDescriptor) catalog.TableDescriptor { desc.TableDesc().Mutations = append(desc.TableDesc().Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_DROP, Descriptor_: &descpb.DescriptorMutation_Index{Index: &descpb.IndexDescriptor{}}, }) diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index index 916e5fcdecfa..61826239c3a0 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index @@ -150,7 +150,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t1 nextColumnId: 4 ... @@ -233,7 +233,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -326,7 +326,7 @@ upsert descriptor #104 - - money - version: 4 - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD - index: - createdExplicitly: true @@ -337,7 +337,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t1 nextColumnId: 4 diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index b/pkg/ccl/schemachangerccl/testdata/explain/create_index index 951fc317958c..62d296eb6f22 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index @@ -23,9 +23,9 @@ Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›. │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ └── ABSENT → DELETE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} │ └── 10 Mutation operations - │ ├── MakeAddedIndexBackfilling {"IsSecondaryIndex":true} + │ ├── MakeAbsentIndexBackfilling {"IsSecondaryIndex":true} │ ├── AddIndexPartitionInfo {"Partitioning":{"IndexID":2,"TableID":104}} - │ ├── MakeAddedTempIndexDeleteOnly {"IsSecondaryIndex":true} + │ ├── MakeAbsentTempIndexDeleteOnly {"IsSecondaryIndex":true} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":3,"Ordinal":1,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":3,"Kind":2,"TableID":104} @@ -43,7 +43,7 @@ Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›. │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -81,7 +81,7 @@ Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›. │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":2,"TableID":104} + │ └── ValidateIndex {"IndexID":2,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -91,15 +91,15 @@ Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›. │ │ └── WRITE_ONLY → TRANSIENT_DELETE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} │ └── 5 Mutation operations │ ├── SetIndexName {"IndexID":2,"Name":"id1","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward TRANSIENT_ABSENT │ └── TRANSIENT_DELETE_ONLY → TRANSIENT_ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 index 632fd6ae84b1..ac9061c3ccd0 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 @@ -24,9 +24,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 index 149019011c38..4ce615065742 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 @@ -23,9 +23,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -33,7 +33,7 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 index 28284da5d68e..70a55f62e15b 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 @@ -23,9 +23,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -33,7 +33,7 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 index 309808a4d3e1..7f419717f11f 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 @@ -23,9 +23,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -33,7 +33,7 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 index 28221e63ee10..976c1535ae42 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 @@ -23,8 +23,8 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} │ └── 4 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -33,9 +33,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 index d7cbc34c509e..b2ec1c8df638 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 @@ -23,8 +23,8 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} │ └── 4 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -33,9 +33,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 index cbf8450f56a7..2d02b778c2f6 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 @@ -23,8 +23,8 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexPartitioning:{DescID: 104, IndexID: 3} │ └── 4 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -33,9 +33,9 @@ Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.pu │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region index 2eca937a4be9..436e57aaaffc 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region @@ -21,11 +21,11 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} │ │ └── PUBLIC → VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} │ └── 5 Mutation operations - │ ├── MarkDescriptorAsSyntheticallyDropped {"DescID":104} - │ ├── MarkDescriptorAsSyntheticallyDropped {"DescID":106} - │ ├── MarkDescriptorAsSyntheticallyDropped {"DescID":105} - │ ├── MarkDescriptorAsSyntheticallyDropped {"DescID":107} - │ └── MarkDescriptorAsSyntheticallyDropped {"DescID":108} + │ ├── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":104} + │ ├── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":106} + │ ├── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":105} + │ ├── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":107} + │ └── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":108} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 52 elements transitioning toward ABSENT @@ -82,15 +82,15 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} │ └── 20 Mutation operations - │ ├── MarkDescriptorAsDropped {"DescID":104} + │ ├── MarkDescriptorAsDropped {"DescriptorID":104} │ ├── RemoveDatabaseRoleSettings {"DatabaseID":104} - │ ├── MarkDescriptorAsDropped {"DescID":106} + │ ├── MarkDescriptorAsDropped {"DescriptorID":106} │ ├── RemoveSchemaParent {"Parent":{"ParentDatabaseID":104,"SchemaID":106}} - │ ├── MarkDescriptorAsDropped {"DescID":105} - │ ├── MarkDescriptorAsDropped {"DescID":107} - │ ├── MarkDescriptorAsDropped {"DescID":108} + │ ├── MarkDescriptorAsDropped {"DescriptorID":105} + │ ├── MarkDescriptorAsDropped {"DescriptorID":107} + │ ├── MarkDescriptorAsDropped {"DescriptorID":108} │ ├── RemoveAllTableComments {"TableID":108} - │ ├── RemoveBackReferenceInTypes {"BackReferencedDescID":108} + │ ├── RemoveBackReferenceInTypes {"BackReferencedDescriptorID":108} │ ├── DrainDescriptorName {"Namespace":{"DescriptorID":104,"Name":"multi_region_tes..."}} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":106,"Name":"public"}} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":105,"Name":"crdb_internal_re...","SchemaID":106}} @@ -116,7 +116,7 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} └── 20 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForDatabase {"DatabaseID":104} + ├── CreateGCJobForDatabase {"DatabaseID":104} ├── DeleteDescriptor {"DescriptorID":104} ├── LogEvent {"TargetStatus":1} ├── DeleteDescriptor {"DescriptorID":106} @@ -125,10 +125,10 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; ├── LogEvent {"TargetStatus":1} ├── DeleteDescriptor {"DescriptorID":107} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForTable {"TableID":108} - ├── MakeColumnAbsent {"ColumnID":1,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":4294967295,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":4294967294,"TableID":108} + ├── CreateGCJobForTable {"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":105} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion index aac003b9b5ab..1da56c35644e 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion @@ -18,7 +18,7 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} │ │ └── PUBLIC → VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} │ └── 1 Mutation operation - │ └── MarkDescriptorAsSyntheticallyDropped {"DescID":108} + │ └── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":108} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 26 elements transitioning toward ABSENT @@ -49,7 +49,7 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab │ │ ├── PUBLIC → ABSENT IndexPartitioning:{DescID: 108, IndexID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_row_pkey, IndexID: 1} │ └── 11 Mutation operations - │ ├── MarkDescriptorAsDropped {"DescID":108} + │ ├── MarkDescriptorAsDropped {"DescriptorID":108} │ ├── RemoveAllTableComments {"TableID":108} │ ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":108} │ ├── UpdateTableBackReferencesInTypes {"BackReferencedTableID":108} @@ -71,11 +71,11 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} └── 10 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForTable {"TableID":108} - ├── MakeColumnAbsent {"ColumnID":1,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":4294967295,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":4294967294,"TableID":108} + ├── CreateGCJobForTable {"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} ├── RemoveJobStateFromDescriptor {"DescriptorID":105} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} ├── RemoveJobStateFromDescriptor {"DescriptorID":108} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region index 4fc0eee7ab13..52775432f31a 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region @@ -17,7 +17,7 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} │ │ └── PUBLIC → VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} │ └── 1 Mutation operation - │ └── MarkDescriptorAsSyntheticallyDropped {"DescID":108} + │ └── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":108} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 20 elements transitioning toward ABSENT @@ -42,9 +42,9 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} │ └── 7 Mutation operations - │ ├── MarkDescriptorAsDropped {"DescID":108} + │ ├── MarkDescriptorAsDropped {"DescriptorID":108} │ ├── RemoveAllTableComments {"TableID":108} - │ ├── RemoveBackReferenceInTypes {"BackReferencedDescID":108} + │ ├── RemoveBackReferenceInTypes {"BackReferencedDescriptorID":108} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"table_regional_b...","SchemaID":106}} │ ├── SetJobStateOnDescriptor {"DescriptorID":105,"Initialize":true} │ ├── SetJobStateOnDescriptor {"DescriptorID":108,"Initialize":true} @@ -59,10 +59,10 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} └── 8 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForTable {"TableID":108} - ├── MakeColumnAbsent {"ColumnID":1,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":4294967295,"TableID":108} - ├── MakeColumnAbsent {"ColumnID":4294967294,"TableID":108} + ├── CreateGCJobForTable {"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} ├── RemoveJobStateFromDescriptor {"DescriptorID":105} ├── RemoveJobStateFromDescriptor {"DescriptorID":108} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index index 8c43677a8dc7..115c42766804 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index @@ -79,7 +79,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ │ │ └── • 10 Mutation operations │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ IndexID: 2 │ │ SourceIndexID: 1 @@ -104,7 +104,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ │ NumColumns: 1 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ IndexID: 3 │ │ SourceIndexID: 1 @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 104 │ │ │ @@ -338,7 +338,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 2 │ TableID: 104 │ @@ -391,11 +391,11 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ │ Name: id1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -419,7 +419,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 index bce23826913e..6576e5ae337b 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 @@ -117,7 +117,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 index dd1a49b63db2..255104acb9f6 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 @@ -87,7 +87,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -109,7 +109,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 index 94dbeee0ccc4..32785b7643f6 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 @@ -87,7 +87,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -109,7 +109,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 index e22f9f2c1aed..d14794be4734 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 @@ -87,7 +87,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -109,7 +109,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 index 088cb69162f0..f1803acc34a8 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 @@ -72,11 +72,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -163,7 +163,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 index ad11a3c4d6b5..ce2307df5096 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 @@ -72,11 +72,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -163,7 +163,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 index 0bda5c0c47bd..6740df88e67a 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 @@ -72,11 +72,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -163,7 +163,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region index 89ee7c91a1e8..2e258586dab9 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region @@ -57,19 +57,19 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ └── • 5 Mutation operations │ │ │ ├── • MarkDescriptorAsSyntheticallyDropped -│ │ DescID: 104 +│ │ DescriptorID: 104 │ │ │ ├── • MarkDescriptorAsSyntheticallyDropped -│ │ DescID: 106 +│ │ DescriptorID: 106 │ │ │ ├── • MarkDescriptorAsSyntheticallyDropped -│ │ DescID: 105 +│ │ DescriptorID: 105 │ │ │ ├── • MarkDescriptorAsSyntheticallyDropped -│ │ DescID: 107 +│ │ DescriptorID: 107 │ │ │ └── • MarkDescriptorAsSyntheticallyDropped -│ DescID: 108 +│ DescriptorID: 108 │ ├── • PreCommitPhase │ │ @@ -537,13 +537,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ └── • 20 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 104 +│ │ DescriptorID: 104 │ │ │ ├── • RemoveDatabaseRoleSettings │ │ DatabaseID: 104 │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 106 +│ │ DescriptorID: 106 │ │ │ ├── • RemoveSchemaParent │ │ Parent: @@ -551,19 +551,19 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ SchemaID: 106 │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 105 +│ │ DescriptorID: 105 │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 107 +│ │ DescriptorID: 107 │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 108 +│ │ DescriptorID: 108 │ │ │ ├── • RemoveAllTableComments │ │ TableID: 108 │ │ │ ├── • RemoveBackReferenceInTypes -│ │ BackReferencedDescID: 108 +│ │ BackReferencedDescriptorID: 108 │ │ TypeIDs: │ │ - 105 │ │ @@ -743,7 +743,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForDatabase + ├── • CreateGCJobForDatabase │ DatabaseID: 104 │ StatementForDropJob: │ Statement: DROP DATABASE multi_region_test_db CASCADE @@ -831,12 +831,12 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForTable + ├── • CreateGCJobForTable │ StatementForDropJob: │ Statement: DROP DATABASE multi_region_test_db CASCADE │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 1 │ EventBase: │ Authorization: @@ -848,7 +848,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967295 │ EventBase: │ Authorization: @@ -860,7 +860,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967294 │ EventBase: │ Authorization: diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion index 1bf6c136a867..59d06fd3e386 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion @@ -51,7 +51,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ └── • 1 Mutation operation │ │ │ └── • MarkDescriptorAsSyntheticallyDropped -│ DescID: 108 +│ DescriptorID: 108 │ ├── • PreCommitPhase │ │ @@ -307,7 +307,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ └── • 11 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 108 +│ │ DescriptorID: 108 │ │ │ ├── • RemoveAllTableComments │ │ TableID: 108 @@ -472,12 +472,12 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForTable + ├── • CreateGCJobForTable │ StatementForDropJob: │ Statement: DROP TABLE multi_region_test_db.public.table_regional_by_row │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 1 │ EventBase: │ Authorization: @@ -489,7 +489,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: @@ -501,7 +501,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967295 │ EventBase: │ Authorization: @@ -513,7 +513,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967294 │ EventBase: │ Authorization: diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region index 932e05048a03..db8539dd3e3a 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region @@ -45,7 +45,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ └── • 1 Mutation operation │ │ │ └── • MarkDescriptorAsSyntheticallyDropped -│ DescID: 108 +│ DescriptorID: 108 │ ├── • PreCommitPhase │ │ @@ -234,13 +234,13 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ └── • 7 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 108 +│ │ DescriptorID: 108 │ │ │ ├── • RemoveAllTableComments │ │ TableID: 108 │ │ │ ├── • RemoveBackReferenceInTypes -│ │ BackReferencedDescID: 108 +│ │ BackReferencedDescriptorID: 108 │ │ TypeIDs: │ │ - 105 │ │ @@ -357,12 +357,12 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForTable + ├── • CreateGCJobForTable │ StatementForDropJob: │ Statement: DROP TABLE multi_region_test_db.public.table_regional_by_table CASCADE │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 1 │ EventBase: │ Authorization: @@ -375,7 +375,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967295 │ EventBase: │ Authorization: @@ -388,7 +388,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ SubWorkID: 1 │ TableID: 108 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967294 │ EventBase: │ Authorization: diff --git a/pkg/jobs/registry_test.go b/pkg/jobs/registry_test.go index 4d769b986b7e..acfab16efd1e 100644 --- a/pkg/jobs/registry_test.go +++ b/pkg/jobs/registry_test.go @@ -164,7 +164,7 @@ INSERT INTO t."%s" VALUES('a', 'foo'); } if mutOptions.hasMutation { writeColumnMutation(t, kvDB, tableDesc, "i", descpb.DescriptorMutation{State: descpb. - DescriptorMutation_DELETE_AND_WRITE_ONLY, Direction: descpb.DescriptorMutation_DROP}) + DescriptorMutation_WRITE_ONLY, Direction: descpb.DescriptorMutation_DROP}) } payload, err := protoutil.Marshal(&jobspb.Payload{ Description: name, diff --git a/pkg/sql/backfill.go b/pkg/sql/backfill.go index 424fe02b4fdb..1c806d6e9bc4 100644 --- a/pkg/sql/backfill.go +++ b/pkg/sql/backfill.go @@ -2006,7 +2006,7 @@ func countIndexRowsAndMaybeCheckUniqueness( // to MERGING and then writes and deletes missed during // the backfill are merged from the temporary index. // -// Finally, the new index is brought into the DELETE_AND_WRITE_ONLY +// Finally, the new index is brought into the WRITE_ONLY // state for validation. // // ┌─────────────────┐ ┌─────────────────┐ ┌─────────────────┐ @@ -2019,14 +2019,14 @@ func countIndexRowsAndMaybeCheckUniqueness( // ┌────────▼────────┐ // │ │ // │ TempIndex │ -// t1 │(DELETE_AND_WRITE) │ +// t1 │ (WRITE_ONLY) │ // │ │ │ // └────────┬────────┘ │ // │ │ // ┌─────────────────┐ ┌─────────────────┐ ┌────────▼────────┐ │ TempIndex receiving writes // │ │ │ │ │ │ │ // │ PrimaryIndex ├────────►│ NewIndex │ │ TempIndex │ │ -// t2 │ (PUBLIC) │ Backfill│ (BACKFILLING) │ │(DELETE_AND_WRITE│ │ +// t2 │ (PUBLIC) │ Backfill│ (BACKFILLING) │ │ (WRITE_ONLY) │ │ // │ │ │ │ │ │ │ // └─────────────────┘ └────────┬────────┘ └─────────────────┘ │ // │ │ @@ -2047,14 +2047,14 @@ func countIndexRowsAndMaybeCheckUniqueness( // ┌─────────────────┐ ┌─────────────────┐ │ │ // │ │ │ │ │ │ // │ NewIndex │◄────────────┤ TempIndex │ │ │ -// t5 │ (MERGING) │ BatchMerge │(DELETE_AND_WRITE│ │ │ +// t5 │ (MERGING) │ BatchMerge │ (WRITE_ONLY) │ │ │ // │ │ │ │ │ │ // └────────┬────────┘ └───────┬─────────┘ │ │ // │ │ │ │ // ┌────────▼────────┐ ┌───────▼─────────┐ │ │ // │ │ │ │ │ │ // │ NewIndex │ │ TempIndex │ │ -// t6 │(DELETE_AND_WRITE) │ (DELETE_ONLY) │ │ +// t6 │ (WRITE_ONLY) │ │ (DELETE_ONLY) │ │ // │ │ │ │ │ // └───────┬─────────┘ └───────┬─────────┘ │ // │ │ @@ -2167,9 +2167,9 @@ func (sc *SchemaChanger) mergeFromTemporaryIndex( return nil } -// runStateMachineAfterTempIndexMerge steps any DELETE_AND_WRITE_ONLY +// runStateMachineAfterTempIndexMerge steps any WRITE_ONLY // temporary indexes to DELETE_ONLY and changes their direction to -// DROP and steps any MERGING indexes to DELETE_AND_WRITE_ONLY +// DROP and steps any MERGING indexes to WRITE_ONLY func (sc *SchemaChanger) runStateMachineAfterTempIndexMerge(ctx context.Context) error { var runStatus jobs.RunningStatus return sc.txn(ctx, func( @@ -2199,7 +2199,7 @@ func (sc *SchemaChanger) runStateMachineAfterTempIndexMerge(ctx context.Context) tbl.Mutations[m.MutationOrdinal()].Direction = descpb.DescriptorMutation_DROP runStatus = RunningStatusDeleteOnly } else if m.Merging() { - tbl.Mutations[m.MutationOrdinal()].State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + tbl.Mutations[m.MutationOrdinal()].State = descpb.DescriptorMutation_WRITE_ONLY } } if runStatus == "" || tbl.Dropped() { @@ -2396,7 +2396,7 @@ func runSchemaChangesInTxn( if c.DeleteOnly() { tableDesc.Mutations[i].State = descpb.DescriptorMutation_DELETE_ONLY } else if c.WriteAndDeleteOnly() { - tableDesc.Mutations[i].State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + tableDesc.Mutations[i].State = descpb.DescriptorMutation_WRITE_ONLY } } diff --git a/pkg/sql/backfill/index_backfiller_cols.go b/pkg/sql/backfill/index_backfiller_cols.go index 5308d21866b6..22a975d57f53 100644 --- a/pkg/sql/backfill/index_backfiller_cols.go +++ b/pkg/sql/backfill/index_backfiller_cols.go @@ -24,11 +24,11 @@ type indexBackfillerCols struct { // colIdxMap maps ColumnIDs to indices into desc.Columns and desc.Mutations. colIdxMap catalog.TableColMap - // cols are all writable (PUBLIC and DELETE_AND_WRITE_ONLY) columns in + // cols are all writable (PUBLIC and WRITE_ONLY) columns in // the descriptor. cols []catalog.Column - // addedCols are the columns in DELETE_AND_WRITE_ONLY being added as part of + // addedCols are the columns in WRITE_ONLY being added as part of // this index which are not computed. The definition of being added is that // the index being backfilled is a new primary index and the columns do not // exist in the currently public primary index. Note that this should never diff --git a/pkg/sql/catalog/descpb/structured.proto b/pkg/sql/catalog/descpb/structured.proto index db605e6efc05..8c6cae28cb82 100644 --- a/pkg/sql/catalog/descpb/structured.proto +++ b/pkg/sql/catalog/descpb/structured.proto @@ -667,8 +667,8 @@ message DescriptorMutation { // // When adding a descriptor, all descriptor related data // (column default or index data) can only be backfilled once - // all nodes have transitioned into the DELETE_AND_WRITE_ONLY state. - DELETE_AND_WRITE_ONLY = 2; + // all nodes have transitioned into the WRITE_ONLY state. + WRITE_ONLY = 2; // Operations other than non-transactional backfilling must not // use this descriptor. @@ -690,7 +690,7 @@ message DescriptorMutation { // this state is a programming error. // // Index: INSERT, UPDATE and DELETE treat this index like a - // DELETE_AND_WRITE_ONLY index, but use Put in instead of CPut or + // WRITE_ONLY index, but use Put in instead of CPut or // InitPut, effectively ignoring unique constraints. MERGING = 4; diff --git a/pkg/sql/catalog/descriptor.go b/pkg/sql/catalog/descriptor.go index 943c519b57a9..4f4db20aca13 100644 --- a/pkg/sql/catalog/descriptor.go +++ b/pkg/sql/catalog/descriptor.go @@ -358,7 +358,7 @@ type TableDescriptor interface { TableSpan(codec keys.SQLCodec) roachpb.Span // GetIndexMutationCapabilities returns: // 1. Whether the index is a mutation - // 2. if so, is it in state DELETE_AND_WRITE_ONLY + // 2. if so, is it in state WRITE_ONLY GetIndexMutationCapabilities(id descpb.IndexID) (isMutation, isWriteOnly bool) // AllIndexes returns a slice with all indexes, public and non-public, @@ -465,7 +465,7 @@ type TableDescriptor interface { // table's public columns, in the canonical order. PublicColumns() []Column // WritableColumns returns a slice of Column interfaces containing the - // table's public columns and DELETE_AND_WRITE_ONLY mutations, in the canonical + // table's public columns and WRITE_ONLY mutations, in the canonical // order. WritableColumns() []Column // DeletableColumns returns a slice of Column interfaces containing the diff --git a/pkg/sql/catalog/schemaexpr/default_exprs.go b/pkg/sql/catalog/schemaexpr/default_exprs.go index 258ba949c8b2..b89bac001759 100644 --- a/pkg/sql/catalog/schemaexpr/default_exprs.go +++ b/pkg/sql/catalog/schemaexpr/default_exprs.go @@ -90,7 +90,7 @@ func ProcessColumnSet( colIDSet.Add(cols[i].GetID()) } - // Add all public or columns in DELETE_AND_WRITE_ONLY state + // Add all public or columns in WRITE_ONLY state // that satisfy the condition. ret := make([]catalog.Column, 0, len(tableDesc.AllColumns())) ret = append(ret, cols...) diff --git a/pkg/sql/catalog/tabledesc/mutation.go b/pkg/sql/catalog/tabledesc/mutation.go index 1ad082b42ba5..0fa26bb5d903 100644 --- a/pkg/sql/catalog/tabledesc/mutation.go +++ b/pkg/sql/catalog/tabledesc/mutation.go @@ -54,7 +54,7 @@ func (mm maybeMutation) MutationID() descpb.MutationID { // WriteAndDeleteOnly returns true iff the table element is in a mutation in // the delete-and-write-only state. func (mm maybeMutation) WriteAndDeleteOnly() bool { - return mm.mutationState == descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + return mm.mutationState == descpb.DescriptorMutation_WRITE_ONLY } // DeleteOnly returns true iff the table element is in a mutation in the diff --git a/pkg/sql/catalog/tabledesc/safe_format_test.go b/pkg/sql/catalog/tabledesc/safe_format_test.go index 26e976abbea9..a7d1b0b9dc22 100644 --- a/pkg/sql/catalog/tabledesc/safe_format_test.go +++ b/pkg/sql/catalog/tabledesc/safe_format_test.go @@ -80,7 +80,7 @@ func TestSafeMessage(t *testing.T) { `{MutationID: 3, JobID: 1234}` + `], ` + `Mutations: [` + - `{MutationID: 1, Direction: ADD, State: DELETE_AND_WRITE_ONLY, ConstraintType: FOREIGN_KEY, ForeignKey: {OriginTableID: 112, OriginColumns: [2], ReferencedTableID: 2, ReferencedColumnIDs: [3], Validity: Unvalidated, State: ADD, MutationID: 1}}, ` + + `{MutationID: 1, Direction: ADD, State: WRITE_ONLY, ConstraintType: FOREIGN_KEY, ForeignKey: {OriginTableID: 112, OriginColumns: [2], ReferencedTableID: 2, ReferencedColumnIDs: [3], Validity: Unvalidated, State: ADD, MutationID: 1}}, ` + `{MutationID: 2, Direction: ADD, State: DELETE_ONLY, Column: {ID: 5, TypeID: 20, Null: false, State: ADD, MutationID: 2}}, ` + `{MutationID: 3, Direction: ADD, State: DELETE_ONLY, ConstraintType: CHECK, NotNullColumn: 2, Check: {Columns: [2], Validity: Unvalidated, State: ADD, MutationID: 3}}, ` + `{MutationID: 3, Direction: ADD, State: DELETE_ONLY, Index: {ID: 3, Unique: false, KeyColumns: [{ID: 3, Dir: ASC}, {ID: 2, Dir: DESC}], KeySuffixColumns: [1], StoreColumns: [5], State: ADD, MutationID: 3}}` + @@ -146,7 +146,7 @@ func TestSafeMessage(t *testing.T) { }) mutable.Mutations = append(mutable.Mutations, descpb.DescriptorMutation{ - State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + State: descpb.DescriptorMutation_WRITE_ONLY, Descriptor_: &descpb.DescriptorMutation_Constraint{ Constraint: &descpb.ConstraintToUpdate{ ConstraintType: descpb.ConstraintToUpdate_FOREIGN_KEY, diff --git a/pkg/sql/catalog/tabledesc/structured.go b/pkg/sql/catalog/tabledesc/structured.go index 65b7c706085b..fefe824f79c2 100644 --- a/pkg/sql/catalog/tabledesc/structured.go +++ b/pkg/sql/catalog/tabledesc/structured.go @@ -1559,7 +1559,7 @@ func (desc *wrapper) GetIndexMutationCapabilities(id descpb.IndexID) (bool, bool if mutationIndex := mutation.GetIndex(); mutationIndex != nil { if mutationIndex.ID == id { return true, - mutation.State == descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + mutation.State == descpb.DescriptorMutation_WRITE_ONLY } } } @@ -2100,7 +2100,7 @@ func (desc *Mutable) AddIndexMutation( return state == descpb.DescriptorMutation_BACKFILLING || state == descpb.DescriptorMutation_DELETE_ONLY case descpb.DescriptorMutation_DROP: - return state == descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + return state == descpb.DescriptorMutation_WRITE_ONLY default: return false } @@ -2169,7 +2169,7 @@ func (desc *Mutable) addIndexMutationMaybeWithTempIndex(m descpb.DescriptorMutat m.State = descpb.DescriptorMutation_DELETE_ONLY } case descpb.DescriptorMutation_DROP: - m.State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + m.State = descpb.DescriptorMutation_WRITE_ONLY } desc.addMutationWithNextID(m) // If we are adding an index, we add another mutation for the diff --git a/pkg/sql/delete_preserving_index_test.go b/pkg/sql/delete_preserving_index_test.go index bb7c783a48fc..09f1445bc198 100644 --- a/pkg/sql/delete_preserving_index_test.go +++ b/pkg/sql/delete_preserving_index_test.go @@ -272,9 +272,9 @@ CREATE UNIQUE INDEX test_index_to_mutate ON t.test (b); _, err = sqlDB.Exec(`DELETE FROM t.test WHERE a = 1`) require.NoError(t, err) - // Move index to DELETE_AND_WRITE_ONLY. The following inserts + // Move index to WRITE_ONLY. The following inserts // are seen by the index and deletes should be preserved. - err = mutateIndexByName(kvDB, codec, tableDesc, "test_index_to_mutate", nil, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY) + err = mutateIndexByName(kvDB, codec, tableDesc, "test_index_to_mutate", nil, descpb.DescriptorMutation_WRITE_ONLY) require.NoError(t, err) _, err = sqlDB.Exec(`INSERT INTO t.test VALUES (2, 2), (3, 3)`) @@ -333,7 +333,7 @@ CREATE UNIQUE INDEX test_index_to_mutate ON t.test (y) STORING (z, a); idx.StoreColumnIDs = []catid.ColumnID{0x1, 0x3, 0x4} idx.KeySuffixColumnIDs = nil return nil - }, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY) + }, descpb.DescriptorMutation_WRITE_ONLY) require.NoError(t, err) _, err = sqlDB.Exec(`INSERT INTO t.test VALUES (1, 1, 1, 1); DELETE FROM t.test WHERE x = 1;`) require.NoError(t, err) @@ -631,7 +631,7 @@ func TestMergeProcessor(t *testing.T) { // Here want to have different entries for the two indices, so we manipulate // the index to DELETE_ONLY when we don't want to write to it, and - // DELETE_AND_WRITE_ONLY when we write to it. + // WRITE_ONLY when we write to it. setUseDeletePreservingEncoding := func(b bool) func(*descpb.IndexDescriptor) error { return func(idx *descpb.IndexDescriptor) error { idx.UseDeletePreservingEncoding = b @@ -639,7 +639,7 @@ func TestMergeProcessor(t *testing.T) { } } - err := mutateIndexByName(kvDB, codec, tableDesc, test.dstIndex, nil, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY) + err := mutateIndexByName(kvDB, codec, tableDesc, test.dstIndex, nil, descpb.DescriptorMutation_WRITE_ONLY) require.NoError(t, err) err = mutateIndexByName(kvDB, codec, tableDesc, test.srcIndex, setUseDeletePreservingEncoding(true), descpb.DescriptorMutation_DELETE_ONLY) require.NoError(t, err) @@ -650,14 +650,14 @@ func TestMergeProcessor(t *testing.T) { err = mutateIndexByName(kvDB, codec, tableDesc, test.dstIndex, nil, descpb.DescriptorMutation_DELETE_ONLY) require.NoError(t, err) - err = mutateIndexByName(kvDB, codec, tableDesc, test.srcIndex, nil, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY) + err = mutateIndexByName(kvDB, codec, tableDesc, test.srcIndex, nil, descpb.DescriptorMutation_WRITE_ONLY) require.NoError(t, err) if _, err := tdb.Exec(test.srcDataSQL); err != nil { t.Fatal(err) } - err = mutateIndexByName(kvDB, codec, tableDesc, test.dstIndex, nil, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY) + err = mutateIndexByName(kvDB, codec, tableDesc, test.dstIndex, nil, descpb.DescriptorMutation_WRITE_ONLY) require.NoError(t, err) err = mutateIndexByName(kvDB, codec, tableDesc, test.srcIndex, nil, descpb.DescriptorMutation_DELETE_ONLY) require.NoError(t, err) diff --git a/pkg/sql/descriptor_mutation_test.go b/pkg/sql/descriptor_mutation_test.go index 66eddb93a5ec..89c8fa9cb449 100644 --- a/pkg/sql/descriptor_mutation_test.go +++ b/pkg/sql/descriptor_mutation_test.go @@ -137,12 +137,12 @@ func (mt mutationTest) writeMutation(ctx context.Context, m descpb.DescriptorMut } } if m.State == descpb.DescriptorMutation_UNKNOWN { - // randomly pick DELETE_ONLY/DELETE_AND_WRITE_ONLY state. + // randomly pick DELETE_ONLY/WRITE_ONLY state. r := rand.Intn(2) if r == 0 { m.State = descpb.DescriptorMutation_DELETE_ONLY } else { - m.State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + m.State = descpb.DescriptorMutation_WRITE_ONLY } } mt.tableDesc.Mutations = append(mt.tableDesc.Mutations, m) @@ -195,7 +195,7 @@ ALTER TABLE t.test ADD COLUMN i VARCHAR NOT NULL DEFAULT 'i'; mTest := makeMutationTest(t, kvDB, sqlDB, tableDesc) // Add column "i" as a mutation in delete/write. - mTest.writeColumnMutation(ctx, "i", descpb.DescriptorMutation{State: descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY}) + mTest.writeColumnMutation(ctx, "i", descpb.DescriptorMutation{State: descpb.DescriptorMutation_WRITE_ONLY}) // This row will conflict with the original row, and should insert an `i` // into the new column. @@ -258,7 +258,7 @@ func TestOperationsWithColumnMutation(t *testing.T) { for _, useUpsert := range []bool{true, false} { // Run the tests for both states. for _, state := range []descpb.DescriptorMutation_State{descpb.DescriptorMutation_DELETE_ONLY, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY} { + descpb.DescriptorMutation_WRITE_ONLY} { t.Run(fmt.Sprintf("useUpsert=%t/state=%v", useUpsert, state), func(t *testing.T) { @@ -292,7 +292,7 @@ func TestOperationsWithColumnMutation(t *testing.T) { mTest.CheckQueryResults(t, starQuery, [][]string{{"a", "z"}}) // The column backfill uses Put instead of CPut because it depends on - // an INSERT of a column in the DELETE_AND_WRITE_ONLY state failing. These two + // an INSERT of a column in the WRITE_ONLY state failing. These two // tests guarantee that. var err error @@ -368,7 +368,7 @@ func TestOperationsWithColumnMutation(t *testing.T) { // Make column "i" live so that it is read. mTest.makeMutationsActive(ctx) // Notice that the default value of "i" is only written when the - // descriptor is in the DELETE_AND_WRITE_ONLY state. + // descriptor is in the WRITE_ONLY state. mTest.CheckQueryResults(t, starQuery, afterDefaultInsert) // Clean up the all-defaults row mTest.Exec(t, `DELETE FROM t.test WHERE k = 'default'`) @@ -384,11 +384,11 @@ func TestOperationsWithColumnMutation(t *testing.T) { // Make column "i" live so that it is read. mTest.makeMutationsActive(ctx) // Notice that the default value of "i" is only written when the - // descriptor is in the DELETE_AND_WRITE_ONLY state. + // descriptor is in the WRITE_ONLY state. mTest.CheckQueryResults(t, starQuery, afterInsert) // The column backfill uses Put instead of CPut because it depends on - // an UPDATE of a column in the DELETE_AND_WRITE_ONLY state failing. This test + // an UPDATE of a column in the WRITE_ONLY state failing. This test // guarantees that. // Make column "i" a mutation. @@ -522,7 +522,7 @@ func TestOperationsWithIndexMutation(t *testing.T) { // See the effect of the operations depending on the state. for _, state := range []descpb.DescriptorMutation_State{ descpb.DescriptorMutation_DELETE_ONLY, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, descpb.DescriptorMutation_MERGING, descpb.DescriptorMutation_BACKFILLING, } { @@ -695,17 +695,17 @@ func TestOperationsWithColumnAndIndexMutation(t *testing.T) { // Run the tests for both states for a column and an index. for _, state := range []descpb.DescriptorMutation_State{ descpb.DescriptorMutation_DELETE_ONLY, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, } { for _, idxState := range []descpb.DescriptorMutation_State{ descpb.DescriptorMutation_DELETE_ONLY, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, descpb.DescriptorMutation_BACKFILLING, } { // Ignore the impossible column in DELETE_ONLY state while index - // is in the DELETE_AND_WRITE_ONLY state. + // is in the WRITE_ONLY state. if state == descpb.DescriptorMutation_DELETE_ONLY && - idxState == descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY { + idxState == descpb.DescriptorMutation_WRITE_ONLY { continue } // Init table to start state. @@ -1174,10 +1174,10 @@ CREATE TABLE t.test (k CHAR PRIMARY KEY, v CHAR UNIQUE); // Third. {"idx_g", 3, descpb.DescriptorMutation_BACKFILLING}, {"test_g_crdb_internal_dpe_key", 3, descpb.DescriptorMutation_DELETE_ONLY}, - // Drop mutations start off in the DELETE_AND_WRITE_ONLY state. + // Drop mutations start off in the WRITE_ONLY state. // UNIQUE column deletion gets split into two mutations with the same ID. - {"test_v_key", 4, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY}, - {"v", 4, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY}, + {"test_v_key", 4, descpb.DescriptorMutation_WRITE_ONLY}, + {"v", 4, descpb.DescriptorMutation_WRITE_ONLY}, } if len(tableDesc.AllMutations()) != len(expected) { @@ -1201,7 +1201,7 @@ CREATE TABLE t.test (k CHAR PRIMARY KEY, v CHAR UNIQUE); } actualState := descpb.DescriptorMutation_UNKNOWN if m.WriteAndDeleteOnly() { - actualState = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + actualState = descpb.DescriptorMutation_WRITE_ONLY } else if m.DeleteOnly() { actualState = descpb.DescriptorMutation_DELETE_ONLY } else if m.Backfilling() { diff --git a/pkg/sql/indexbackfiller_test.go b/pkg/sql/indexbackfiller_test.go index 5ef5ebeb320f..058ea2a925c8 100644 --- a/pkg/sql/indexbackfiller_test.go +++ b/pkg/sql/indexbackfiller_test.go @@ -71,7 +71,7 @@ func TestIndexBackfiller(t *testing.T) { RunBeforePublishWriteAndDelete: func() { // Signal that we've moved into DELETE_ONLY. moveToTDelete <- true - // Wait until we get a signal to move to DELETE_AND_WRITE_ONLY. + // Wait until we get a signal to move to WRITE_ONLY. <-moveToTWrite }, RunBeforeBackfill: func() error { @@ -132,13 +132,13 @@ func TestIndexBackfiller(t *testing.T) { execOrFail("INSERT INTO t.kv VALUES (9, 'h')") // new_index: nothing, temp_index: nothing // Move to WRITE_ONLY mode. - // tempIndex: DELETE_AND_WRITE_ONLY + // tempIndex: WRITE_ONLY // newIndex BACKFILLING moveToTWrite <- true execOrFail("INSERT INTO t.kv VALUES (2, 'b')") // new_index: nothing, temp_index: sees insert // Pick our scan timestamp. - // tempIndex: DELETE_AND_WRITE_ONLY + // tempIndex: WRITE_ONLY // newIndex BACKFILLING moveToTScan <- true execOrFail("UPDATE t.kv SET v = 'd' WHERE k = 3") @@ -301,8 +301,8 @@ INSERT INTO foo VALUES (1), (10), (100); } mut.NextColumnID++ mut.AddColumnMutation(&columnWithDefault, descpb.DescriptorMutation_ADD) - // Cheat and jump right to DELETE_AND_WRITE_ONLY. - mut.Mutations[len(mut.Mutations)-1].State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + // Cheat and jump right to WRITE_ONLY. + mut.Mutations[len(mut.Mutations)-1].State = descpb.DescriptorMutation_WRITE_ONLY computedColumnNotInPrimaryIndex := descpb.ColumnDescriptor{ Name: "comp", ID: mut.NextColumnID, @@ -314,8 +314,8 @@ INSERT INTO foo VALUES (1), (10), (100); } mut.NextColumnID++ mut.AddColumnMutation(&computedColumnNotInPrimaryIndex, descpb.DescriptorMutation_ADD) - // Cheat and jump right to DELETE_AND_WRITE_ONLY. - mut.Mutations[len(mut.Mutations)-1].State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + // Cheat and jump right to WRITE_ONLY. + mut.Mutations[len(mut.Mutations)-1].State = descpb.DescriptorMutation_WRITE_ONLY mut.Families[0].ColumnIDs = append(mut.Families[0].ColumnIDs, columnWithDefault.ID, diff --git a/pkg/sql/logictest/testdata/logic_test/partial_index b/pkg/sql/logictest/testdata/logic_test/partial_index index 2eabdbc87313..e631f86b103d 100644 --- a/pkg/sql/logictest/testdata/logic_test/partial_index +++ b/pkg/sql/logictest/testdata/logic_test/partial_index @@ -1467,7 +1467,7 @@ SELECT * FROM virt@idx WHERE c > 10 8 8 18 # Regression tests for #52318. Mutations on partial indexes in the -# DELETE_AND_WRITE_ONLY state should update the indexes correctly. +# WRITE_ONLY state should update the indexes correctly. subtest regression_52318 statement ok diff --git a/pkg/sql/opt/exec/execbuilder/testdata/show_trace b/pkg/sql/opt/exec/execbuilder/testdata/show_trace index 1881a5aff68a..0a689cd40fa0 100644 --- a/pkg/sql/opt/exec/execbuilder/testdata/show_trace +++ b/pkg/sql/opt/exec/execbuilder/testdata/show_trace @@ -193,7 +193,7 @@ SET tracing = off query TT $trace_query ---- -drop index Put /Table/3/1/108/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 columns: nullable:false hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > next_column_id:3 families: next_family_id:1 primary_index: interleave:<> partitioning: type:FORWARD created_explicitly:false encoding_type:1 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:1 not_visible:false > next_index_id:4 privileges: users: owner_proto:"root" version:2 > mutations: interleave:<> partitioning: type:FORWARD created_explicitly:true encoding_type:0 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:2 not_visible:false > state:DELETE_AND_WRITE_ONLY direction:DROP mutation_id:2 rollback:false > next_mutation_id:3 format_version:3 state:PUBLIC offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false mutationJobs:<...> drop_time:0 replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:4 import_start_wall_time:0 > +drop index Put /Table/3/1/108/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 columns: nullable:false hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > next_column_id:3 families: next_family_id:1 primary_index: interleave:<> partitioning: type:FORWARD created_explicitly:false encoding_type:1 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:1 not_visible:false > next_index_id:4 privileges: users: owner_proto:"root" version:2 > mutations: interleave:<> partitioning: type:FORWARD created_explicitly:true encoding_type:0 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:2 not_visible:false > state:WRITE_ONLY direction:DROP mutation_id:2 rollback:false > next_mutation_id:3 format_version:3 state:PUBLIC offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false mutationJobs:<...> drop_time:0 replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:4 import_start_wall_time:0 > sql query rows affected: 0 statement ok diff --git a/pkg/sql/schema_changer.go b/pkg/sql/schema_changer.go index 59c5ffe65b3a..aa9cc259204b 100644 --- a/pkg/sql/schema_changer.go +++ b/pkg/sql/schema_changer.go @@ -82,10 +82,10 @@ const ( // the cluster to converge to seeing the schema element in the DELETE_ONLY // state. RunningStatusDeleteOnly jobs.RunningStatus = "waiting in DELETE-ONLY" - // RunningStatusDeleteAndWriteOnly is for jobs that are currently waiting on + // RunningStatusWriteOnly is for jobs that are currently waiting on // the cluster to converge to seeing the schema element in the - // DELETE_AND_WRITE_ONLY state. - RunningStatusDeleteAndWriteOnly jobs.RunningStatus = "waiting in DELETE-AND-WRITE_ONLY" + // WRITE_ONLY state. + RunningStatusWriteOnly jobs.RunningStatus = "waiting in WRITE_ONLY" // RunningStatusMerging is for jobs that are currently waiting on // the cluster to converge to seeing the schema element in the // MERGING state. @@ -892,7 +892,7 @@ func (sc *SchemaChanger) initJobRunningStatus(ctx context.Context) error { if mutation.Adding() && mutation.DeleteOnly() { runStatus = RunningStatusDeleteOnly } else if mutation.Dropped() && mutation.WriteAndDeleteOnly() { - runStatus = RunningStatusDeleteAndWriteOnly + runStatus = RunningStatusWriteOnly } } if runStatus != "" && !desc.Dropped() { @@ -1114,12 +1114,12 @@ func (sc *SchemaChanger) RunStateMachineBeforeBackfill(ctx context.Context) erro // it will be better to run the backfill of a unique index // twice: once in the DELETE_ONLY state to confirm that // the index can indeed be created, and subsequently in the - // DELETE_AND_WRITE_ONLY state to fill in the missing elements of the + // WRITE_ONLY state to fill in the missing elements of the // index (INSERT and UPDATE that happened in the interim). - tbl.Mutations[m.MutationOrdinal()].State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY - runStatus = RunningStatusDeleteAndWriteOnly + tbl.Mutations[m.MutationOrdinal()].State = descpb.DescriptorMutation_WRITE_ONLY + runStatus = RunningStatusWriteOnly } - // else if DELETE_AND_WRITE_ONLY, then the state change has already moved forward. + // else if WRITE_ONLY, then the state change has already moved forward. } else if m.Dropped() { if m.WriteAndDeleteOnly() || m.Merging() { tbl.Mutations[m.MutationOrdinal()].State = descpb.DescriptorMutation_DELETE_ONLY @@ -2266,7 +2266,7 @@ func (sc *SchemaChanger) reverseMutation( } mutation.Direction = descpb.DescriptorMutation_ADD - if notStarted && mutation.State != descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY { + if notStarted && mutation.State != descpb.DescriptorMutation_WRITE_ONLY { panic(errors.AssertionFailedf("mutation in bad state: %+v", mutation)) } } diff --git a/pkg/sql/schema_changer_test.go b/pkg/sql/schema_changer_test.go index 1650215aa21b..da174cfeaffc 100644 --- a/pkg/sql/schema_changer_test.go +++ b/pkg/sql/schema_changer_test.go @@ -175,7 +175,7 @@ INSERT INTO t.test VALUES ('a', 'b'), ('c', 'd'); t.Fatal(err) } // The expected end state. - expectedState := descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + expectedState := descpb.DescriptorMutation_WRITE_ONLY if direction == descpb.DescriptorMutation_DROP { expectedState = descpb.DescriptorMutation_DELETE_ONLY } @@ -2366,7 +2366,7 @@ ALTER TABLE t.test DROP column v`) // Unfortunately this is the same failure present when an index drop // fails, so the rollback never completes and leaves orphaned kvs. // TODO(erik): Ignore errors or individually drop indexes in - // DELETE_AND_WRITE_ONLY which failed during the creation backfill + // WRITE_ONLY which failed during the creation backfill // as a rollback from a drop. if e := 1; e != len(tableDesc.PublicColumns()) { t.Fatalf("e = %d, v = %d, columns = %+v", e, len(tableDesc.PublicColumns()), tableDesc.PublicColumns()) @@ -3105,7 +3105,7 @@ CREATE TABLE t.test ( }() // Wait for the temporary indexes for the new primary indexes - // to move to the DELETE_AND_WRITE_ONLY state, which happens + // to move to the WRITE_ONLY state, which happens // right before backfilling of the index begins. <-backfillNotification diff --git a/pkg/sql/schemachanger/scdecomp/helpers.go b/pkg/sql/schemachanger/scdecomp/helpers.go index 6b52ba8e4b1e..68121a429feb 100644 --- a/pkg/sql/schemachanger/scdecomp/helpers.go +++ b/pkg/sql/schemachanger/scdecomp/helpers.go @@ -39,7 +39,7 @@ func descriptorStatus(desc catalog.Descriptor) scpb.Status { // maybeMutationStatus tries to map a table mutation to an element status // on a best-effort basis. This is necessary incomplete, for instance we can't -// distinguish between DELETE_AND_WRITE_ONLY, BACKFILLED and VALIDATED for +// distinguish between WRITE_ONLY, BACKFILLED and VALIDATED for // write-only indexes. // // TODO(postamar): handle constraint mutation statuses diff --git a/pkg/sql/schemachanger/scexec/exec_backfill_test.go b/pkg/sql/schemachanger/scexec/exec_backfill_test.go index b25a46c0696c..2929c8af48b4 100644 --- a/pkg/sql/schemachanger/scexec/exec_backfill_test.go +++ b/pkg/sql/schemachanger/scexec/exec_backfill_test.go @@ -287,7 +287,7 @@ func TestExecBackfiller(t *testing.T) { case addIdx.GetID(): m.State = descpb.DescriptorMutation_MERGING case tmpIdx.GetID(): - m.State = descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + m.State = descpb.DescriptorMutation_WRITE_ONLY } } descs.UpsertDescriptorEntry(mut) diff --git a/pkg/sql/schemachanger/scexec/exec_validation.go b/pkg/sql/schemachanger/scexec/exec_validation.go index abefc48dfdcf..60247ec0f9e0 100644 --- a/pkg/sql/schemachanger/scexec/exec_validation.go +++ b/pkg/sql/schemachanger/scexec/exec_validation.go @@ -23,7 +23,7 @@ import ( ) func executeValidateUniqueIndex( - ctx context.Context, deps Dependencies, op *scop.ValidateUniqueIndex, + ctx context.Context, deps Dependencies, op *scop.ValidateIndex, ) error { descs, err := deps.Catalog().MustReadImmutableDescriptors(ctx, op.TableID) if err != nil { @@ -70,7 +70,7 @@ func executeValidationOps(ctx context.Context, deps Dependencies, ops []scop.Op) func executeValidationOp(ctx context.Context, deps Dependencies, op scop.Op) (err error) { switch op := op.(type) { - case *scop.ValidateUniqueIndex: + case *scop.ValidateIndex: if err = executeValidateUniqueIndex(ctx, deps, op); err != nil { return errors.Wrapf(err, "%T: %v", op, op) } diff --git a/pkg/sql/schemachanger/scexec/executor_external_test.go b/pkg/sql/schemachanger/scexec/executor_external_test.go index f402a4ccaec9..ca2dffff345d 100644 --- a/pkg/sql/schemachanger/scexec/executor_external_test.go +++ b/pkg/sql/schemachanger/scexec/executor_external_test.go @@ -209,7 +209,7 @@ CREATE TABLE db.t ( }), ops: func() []scop.Op { return []scop.Op{ - &scop.MakeAddedTempIndexDeleteOnly{ + &scop.MakeAbsentTempIndexDeleteOnly{ Index: scpb.Index{ TableID: table.ID, IndexID: indexToAdd.ID, diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/column.go b/pkg/sql/schemachanger/scexec/scmutationexec/column.go index 316da854ecf3..94b41076a028 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/column.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/column.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/redact" ) -func (m *visitor) MakeAddedColumnDeleteOnly( - ctx context.Context, op scop.MakeAddedColumnDeleteOnly, +func (m *visitor) MakeAbsentColumnDeleteOnly( + ctx context.Context, op scop.MakeAbsentColumnDeleteOnly, ) error { col := &descpb.ColumnDescriptor{ ID: op.Column.ColumnID, @@ -83,8 +83,8 @@ func (m *visitor) SetAddedColumnType(ctx context.Context, op scop.SetAddedColumn return tbl.AllocateIDsWithoutValidation(ctx) } -func (m *visitor) MakeAddedColumnDeleteAndWriteOnly( - ctx context.Context, op scop.MakeAddedColumnDeleteAndWriteOnly, +func (m *visitor) MakeDeleteOnlyColumnWriteOnly( + ctx context.Context, op scop.MakeDeleteOnlyColumnWriteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -94,12 +94,14 @@ func (m *visitor) MakeAddedColumnDeleteAndWriteOnly( tbl, MakeColumnIDMutationSelector(op.ColumnID), descpb.DescriptorMutation_DELETE_ONLY, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, descpb.DescriptorMutation_ADD, ) } -func (m *visitor) MakeColumnPublic(ctx context.Context, op scop.MakeColumnPublic) error { +func (m *visitor) MakeWriteOnlyColumnPublic( + ctx context.Context, op scop.MakeWriteOnlyColumnPublic, +) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { return err @@ -110,7 +112,7 @@ func (m *visitor) MakeColumnPublic(ctx context.Context, op scop.MakeColumnPublic Tag: op.StatementTag, ApplicationName: op.Authorization.AppName, User: op.Authorization.UserName, - }, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY) + }, descpb.DescriptorMutation_WRITE_ONLY) if err != nil { return err } @@ -134,8 +136,8 @@ func (m *visitor) MakeColumnPublic(ctx context.Context, op scop.MakeColumnPublic return nil } -func (m *visitor) MakeDroppedColumnDeleteAndWriteOnly( - ctx context.Context, op scop.MakeDroppedColumnDeleteAndWriteOnly, +func (m *visitor) MakePublicColumnWriteOnly( + ctx context.Context, op scop.MakePublicColumnWriteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -152,8 +154,8 @@ func (m *visitor) MakeDroppedColumnDeleteAndWriteOnly( op.ColumnID, tbl.GetName(), tbl.GetID()) } -func (m *visitor) MakeDroppedColumnDeleteOnly( - ctx context.Context, op scop.MakeDroppedColumnDeleteOnly, +func (m *visitor) MakeWriteOnlyColumnDeleteOnly( + ctx context.Context, op scop.MakeWriteOnlyColumnDeleteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -162,7 +164,7 @@ func (m *visitor) MakeDroppedColumnDeleteOnly( return mutationStateChange( tbl, MakeColumnIDMutationSelector(op.ColumnID), - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, descpb.DescriptorMutation_DELETE_ONLY, descpb.DescriptorMutation_DROP, ) @@ -193,7 +195,9 @@ func (m *visitor) RemoveDroppedColumnType( return nil } -func (m *visitor) MakeColumnAbsent(ctx context.Context, op scop.MakeColumnAbsent) error { +func (m *visitor) MakeDeleteOnlyColumnAbsent( + ctx context.Context, op scop.MakeDeleteOnlyColumnAbsent, +) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil || tbl.Dropped() { return err diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/drop.go b/pkg/sql/schemachanger/scexec/scmutationexec/drop.go index 4c48cafb7bfc..54fb63bb25b2 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/drop.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/drop.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/errors" ) -func (m *visitor) CreateGcJobForTable(ctx context.Context, op scop.CreateGcJobForTable) error { +func (m *visitor) CreateGCJobForTable(ctx context.Context, op scop.CreateGCJobForTable) error { desc, err := m.checkOutTable(ctx, op.TableID) if err != nil { return err @@ -32,8 +32,8 @@ func (m *visitor) CreateGcJobForTable(ctx context.Context, op scop.CreateGcJobFo return nil } -func (m *visitor) CreateGcJobForDatabase( - ctx context.Context, op scop.CreateGcJobForDatabase, +func (m *visitor) CreateGCJobForDatabase( + ctx context.Context, op scop.CreateGCJobForDatabase, ) error { desc, err := m.checkOutDatabase(ctx, op.DatabaseID) if err != nil { @@ -43,7 +43,7 @@ func (m *visitor) CreateGcJobForDatabase( return nil } -func (m *visitor) CreateGcJobForIndex(ctx context.Context, op scop.CreateGcJobForIndex) error { +func (m *visitor) CreateGCJobForIndex(ctx context.Context, op scop.CreateGCJobForIndex) error { desc, err := m.s.GetDescriptor(ctx, op.TableID) if err != nil { return err @@ -63,7 +63,7 @@ func (m *visitor) CreateGcJobForIndex(ctx context.Context, op scop.CreateGcJobFo func (m *visitor) MarkDescriptorAsPublic( ctx context.Context, op scop.MarkDescriptorAsPublic, ) error { - desc, err := m.s.CheckOutDescriptor(ctx, op.DescID) + desc, err := m.s.CheckOutDescriptor(ctx, op.DescriptorID) if err != nil { return err } @@ -74,7 +74,7 @@ func (m *visitor) MarkDescriptorAsPublic( func (m *visitor) MarkDescriptorAsSyntheticallyDropped( ctx context.Context, op scop.MarkDescriptorAsSyntheticallyDropped, ) error { - desc, err := m.s.GetDescriptor(ctx, op.DescID) + desc, err := m.s.GetDescriptor(ctx, op.DescriptorID) if err != nil { return err } @@ -87,7 +87,7 @@ func (m *visitor) MarkDescriptorAsSyntheticallyDropped( func (m *visitor) MarkDescriptorAsDropped( ctx context.Context, op scop.MarkDescriptorAsDropped, ) error { - desc, err := m.s.CheckOutDescriptor(ctx, op.DescID) + desc, err := m.s.CheckOutDescriptor(ctx, op.DescriptorID) if err != nil { return err } @@ -157,7 +157,7 @@ func (m *visitor) RemoveDatabaseRoleSettings( } func (m *visitor) RemoveUserPrivileges(ctx context.Context, op scop.RemoveUserPrivileges) error { - desc, err := m.s.CheckOutDescriptor(ctx, op.DescID) + desc, err := m.s.CheckOutDescriptor(ctx, op.DescriptorID) if err != nil { return err } diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/helpers.go b/pkg/sql/schemachanger/scexec/scmutationexec/helpers.go index 9640b3206da6..2336d4dbeaaf 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/helpers.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/helpers.go @@ -225,7 +225,7 @@ func enqueueAddIndexMutation( func enqueueDropIndexMutation(tbl *tabledesc.Mutable, idx *descpb.IndexDescriptor) error { if err := tbl.AddIndexMutation( - idx, descpb.DescriptorMutation_DROP, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + idx, descpb.DescriptorMutation_DROP, descpb.DescriptorMutation_WRITE_ONLY, ); err != nil { return err } diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/index.go b/pkg/sql/schemachanger/scexec/scmutationexec/index.go index c22796c1a1cd..3c7fbf9b223b 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/index.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/index.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/redact" ) -func (m *visitor) MakeAddedIndexBackfilling( - ctx context.Context, op scop.MakeAddedIndexBackfilling, +func (m *visitor) MakeAbsentIndexBackfilling( + ctx context.Context, op scop.MakeAbsentIndexBackfilling, ) error { return addNewIndexMutation( ctx, m, op.Index, op.IsSecondaryIndex, op.IsDeletePreserving, @@ -35,8 +35,8 @@ func (m *visitor) MakeAddedIndexBackfilling( ) } -func (m *visitor) MakeAddedTempIndexDeleteOnly( - ctx context.Context, op scop.MakeAddedTempIndexDeleteOnly, +func (m *visitor) MakeAbsentTempIndexDeleteOnly( + ctx context.Context, op scop.MakeAbsentTempIndexDeleteOnly, ) error { const isDeletePreserving = true // temp indexes are always delete preserving return addNewIndexMutation( @@ -132,8 +132,8 @@ func (m *visitor) MakeBackfillingIndexDeleteOnly( ) } -func (m *visitor) MakeAddedIndexDeleteAndWriteOnly( - ctx context.Context, op scop.MakeAddedIndexDeleteAndWriteOnly, +func (m *visitor) MakeDeleteOnlyIndexWriteOnly( + ctx context.Context, op scop.MakeDeleteOnlyIndexWriteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -143,7 +143,7 @@ func (m *visitor) MakeAddedIndexDeleteAndWriteOnly( tbl, MakeIndexIDMutationSelector(op.IndexID), descpb.DescriptorMutation_DELETE_ONLY, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, descpb.DescriptorMutation_ADD, ) } @@ -175,13 +175,13 @@ func (m *visitor) MakeMergedIndexWriteOnly( tbl, MakeIndexIDMutationSelector(op.IndexID), descpb.DescriptorMutation_MERGING, - descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY, + descpb.DescriptorMutation_WRITE_ONLY, descpb.DescriptorMutation_ADD, ) } -func (m *visitor) MakeAddedPrimaryIndexPublic( - ctx context.Context, op scop.MakeAddedPrimaryIndexPublic, +func (m *visitor) MakeValidatedPrimaryIndexPublic( + ctx context.Context, op scop.MakeValidatedPrimaryIndexPublic, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -198,15 +198,15 @@ func (m *visitor) MakeAddedPrimaryIndexPublic( Tag: op.StatementTag, ApplicationName: op.Authorization.AppName, User: op.Authorization.UserName, - }, descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY); err != nil { + }, descpb.DescriptorMutation_WRITE_ONLY); err != nil { return err } tbl.PrimaryIndex = indexDesc return nil } -func (m *visitor) MakeAddedSecondaryIndexPublic( - ctx context.Context, op scop.MakeAddedSecondaryIndexPublic, +func (m *visitor) MakeValidatedSecondaryIndexPublic( + ctx context.Context, op scop.MakeValidatedSecondaryIndexPublic, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -233,8 +233,8 @@ func (m *visitor) MakeAddedSecondaryIndexPublic( return nil } -func (m *visitor) MakeDroppedPrimaryIndexDeleteAndWriteOnly( - ctx context.Context, op scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly, +func (m *visitor) MakePublicPrimaryIndexWriteOnly( + ctx context.Context, op scop.MakePublicPrimaryIndexWriteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -248,8 +248,8 @@ func (m *visitor) MakeDroppedPrimaryIndexDeleteAndWriteOnly( return enqueueDropIndexMutation(tbl, &desc) } -func (m *visitor) MakeDroppedNonPrimaryIndexDeleteAndWriteOnly( - ctx context.Context, op scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly, +func (m *visitor) MakePublicSecondaryIndexWriteOnly( + ctx context.Context, op scop.MakePublicSecondaryIndexWriteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -265,8 +265,8 @@ func (m *visitor) MakeDroppedNonPrimaryIndexDeleteAndWriteOnly( return errors.AssertionFailedf("failed to find secondary index %d in descriptor %v", op.IndexID, tbl) } -func (m *visitor) MakeDroppedIndexDeleteOnly( - ctx context.Context, op scop.MakeDroppedIndexDeleteOnly, +func (m *visitor) MakeWriteOnlyIndexDeleteOnly( + ctx context.Context, op scop.MakeWriteOnlyIndexDeleteOnly, ) error { tbl, err := m.checkOutTable(ctx, op.TableID) if err != nil { @@ -277,7 +277,7 @@ func (m *visitor) MakeDroppedIndexDeleteOnly( return err } // It's okay if the index is in MERGING. - exp := descpb.DescriptorMutation_DELETE_AND_WRITE_ONLY + exp := descpb.DescriptorMutation_WRITE_ONLY if idx.Merging() { exp = descpb.DescriptorMutation_MERGING } diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/references.go b/pkg/sql/schemachanger/scexec/scmutationexec/references.go index ce5b09f0ae04..4133ac0586e7 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/references.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/references.go @@ -210,7 +210,7 @@ func (m *visitor) UpdateTableBackReferencesInTypes( func (m *visitor) RemoveBackReferenceInTypes( ctx context.Context, op scop.RemoveBackReferenceInTypes, ) error { - return updateBackReferencesInTypes(ctx, m, op.TypeIDs, op.BackReferencedDescID, catalog.DescriptorIDSet{}) + return updateBackReferencesInTypes(ctx, m, op.TypeIDs, op.BackReferencedDescriptorID, catalog.DescriptorIDSet{}) } func updateBackReferencesInTypes( diff --git a/pkg/sql/schemachanger/scop/mutation.go b/pkg/sql/schemachanger/scop/mutation.go index 11093c3338e9..75c984150afb 100644 --- a/pkg/sql/schemachanger/scop/mutation.go +++ b/pkg/sql/schemachanger/scop/mutation.go @@ -42,17 +42,17 @@ type NotImplemented struct { ElementType string } -// MakeAddedTempIndexDeleteOnly adds a non-existent index to the +// MakeAbsentTempIndexDeleteOnly adds a non-existent index to the // table in the DELETE_ONLY state. -type MakeAddedTempIndexDeleteOnly struct { +type MakeAbsentTempIndexDeleteOnly struct { mutationOp Index scpb.Index IsSecondaryIndex bool } -// MakeAddedIndexBackfilling adds a non-existent index to the +// MakeAbsentIndexBackfilling adds a non-existent index to the // table in the BACKFILLING state. -type MakeAddedIndexBackfilling struct { +type MakeAbsentIndexBackfilling struct { mutationOp Index scpb.Index IsSecondaryIndex bool @@ -68,9 +68,9 @@ type SetAddedIndexPartialPredicate struct { Expr catpb.Expression } -// MakeAddedIndexDeleteAndWriteOnly transitions an index addition mutation from -// DELETE_ONLY to DELETE_AND_WRITE_ONLY. -type MakeAddedIndexDeleteAndWriteOnly struct { +// MakeDeleteOnlyIndexWriteOnly transitions an index addition mutation from +// DELETE_ONLY to WRITE_ONLY. +type MakeDeleteOnlyIndexWriteOnly struct { mutationOp TableID descpb.ID IndexID descpb.IndexID @@ -100,47 +100,48 @@ type MakeBackfillingIndexDeleteOnly struct { IndexID descpb.IndexID } -// MakeAddedSecondaryIndexPublic moves a new primary index from its mutation to +// MakeValidatedSecondaryIndexPublic moves a new primary index from its mutation to // public. -type MakeAddedSecondaryIndexPublic struct { +type MakeValidatedSecondaryIndexPublic struct { mutationOp TableID descpb.ID IndexID descpb.IndexID } -// MakeAddedPrimaryIndexPublic moves a new primary index from its mutation to +// MakeValidatedPrimaryIndexPublic moves a new primary index from its mutation to // public. -type MakeAddedPrimaryIndexPublic struct { +type MakeValidatedPrimaryIndexPublic struct { mutationOp EventBase TableID descpb.ID IndexID descpb.IndexID } -// MakeDroppedPrimaryIndexDeleteAndWriteOnly moves a dropped primary index from -// public to DELETE_AND_WRITE_ONLY. -type MakeDroppedPrimaryIndexDeleteAndWriteOnly struct { +// MakePublicPrimaryIndexWriteOnly zeros out the table's +// primary index and adds an index drop mutation in WRITE_ONLY +// for it. +type MakePublicPrimaryIndexWriteOnly struct { mutationOp TableID descpb.ID IndexID descpb.IndexID } -// CreateGcJobForTable creates a GC job for a given table, when necessary. -type CreateGcJobForTable struct { +// CreateGCJobForTable creates a GC job for a given table, when necessary. +type CreateGCJobForTable struct { mutationOp TableID descpb.ID StatementForDropJob } -// CreateGcJobForDatabase creates a GC job for a given database. -type CreateGcJobForDatabase struct { +// CreateGCJobForDatabase creates a GC job for a given database. +type CreateGCJobForDatabase struct { mutationOp DatabaseID descpb.ID StatementForDropJob } -// CreateGcJobForIndex creates a GC job for a given table index. -type CreateGcJobForIndex struct { +// CreateGCJobForIndex creates a GC job for a given table index. +type CreateGCJobForIndex struct { mutationOp TableID descpb.ID IndexID descpb.IndexID @@ -150,47 +151,49 @@ type CreateGcJobForIndex struct { // MarkDescriptorAsPublic changes the descriptor's state to PUBLIC. type MarkDescriptorAsPublic struct { mutationOp - DescID descpb.ID + DescriptorID descpb.ID } // MarkDescriptorAsSyntheticallyDropped changes the descriptor's state to // DROPPED, but records that status only synthetically. type MarkDescriptorAsSyntheticallyDropped struct { mutationOp - DescID descpb.ID + DescriptorID descpb.ID } // MarkDescriptorAsDropped changes the descriptor's state to DROPPED. type MarkDescriptorAsDropped struct { mutationOp - DescID descpb.ID + DescriptorID descpb.ID } -// DrainDescriptorName marks a descriptor as dropped. +// DrainDescriptorName marks a descriptor's name as to-be-drained from +// the system.Namespace table. type DrainDescriptorName struct { mutationOp Namespace scpb.Namespace } -// MakeAddedColumnDeleteAndWriteOnly transitions a column addition mutation from -// DELETE_ONLY to DELETE_AND_WRITE_ONLY. -type MakeAddedColumnDeleteAndWriteOnly struct { +// MakeDeleteOnlyColumnWriteOnly transitions a column addition mutation from +// DELETE_ONLY to WRITE_ONLY. +type MakeDeleteOnlyColumnWriteOnly struct { mutationOp TableID descpb.ID ColumnID descpb.ColumnID } -// MakeDroppedNonPrimaryIndexDeleteAndWriteOnly moves a dropped secondary index -// from public to DELETE_AND_WRITE_ONLY. -type MakeDroppedNonPrimaryIndexDeleteAndWriteOnly struct { +// MakePublicSecondaryIndexWriteOnly zeros out the secondary +// index and adds an index drop mutation in WRITE_ONLY +// for it. +type MakePublicSecondaryIndexWriteOnly struct { mutationOp TableID descpb.ID IndexID descpb.IndexID } -// MakeDroppedIndexDeleteOnly transitions an index drop mutation from -// DELETE_AND_WRITE_ONLY to DELETE_ONLY. -type MakeDroppedIndexDeleteOnly struct { +// MakeWriteOnlyIndexDeleteOnly transitions an index drop mutation from +// WRITE_ONLY to DELETE_ONLY. +type MakeWriteOnlyIndexDeleteOnly struct { mutationOp TableID descpb.ID IndexID descpb.IndexID @@ -213,8 +216,8 @@ type MakeIndexAbsent struct { IndexID descpb.IndexID } -// MakeAddedColumnDeleteOnly adds a new column in the DELETE_ONLY state. -type MakeAddedColumnDeleteOnly struct { +// MakeAbsentColumnDeleteOnly adds a new column in the DELETE_ONLY state. +type MakeAbsentColumnDeleteOnly struct { mutationOp Column scpb.Column } @@ -225,25 +228,25 @@ type SetAddedColumnType struct { ColumnType scpb.ColumnType } -// MakeColumnPublic moves a new column from its mutation to public. -type MakeColumnPublic struct { +// MakeWriteOnlyColumnPublic moves a new column from its mutation to public. +type MakeWriteOnlyColumnPublic struct { mutationOp EventBase TableID descpb.ID ColumnID descpb.ColumnID } -// MakeDroppedColumnDeleteAndWriteOnly moves a dropped column from public to -// DELETE_AND_WRITE_ONLY. -type MakeDroppedColumnDeleteAndWriteOnly struct { +// MakePublicColumnWriteOnly zeros out the column and adds +// a column drop mutation in WRITE_ONLY for it. +type MakePublicColumnWriteOnly struct { mutationOp TableID descpb.ID ColumnID descpb.ColumnID } -// MakeDroppedColumnDeleteOnly transitions a column drop mutation from -// DELETE_AND_WRITE_ONLY to DELETE_ONLY. -type MakeDroppedColumnDeleteOnly struct { +// MakeWriteOnlyColumnDeleteOnly transitions a column drop mutation from +// WRITE_ONLY to DELETE_ONLY. +type MakeWriteOnlyColumnDeleteOnly struct { mutationOp TableID descpb.ID ColumnID descpb.ColumnID @@ -256,9 +259,9 @@ type RemoveDroppedColumnType struct { ColumnID descpb.ColumnID } -// MakeColumnAbsent removes a dropped column mutation in DELETE_ONLY from the +// MakeDeleteOnlyColumnAbsent removes a dropped column mutation in DELETE_ONLY from the // table. -type MakeColumnAbsent struct { +type MakeDeleteOnlyColumnAbsent struct { mutationOp EventBase TableID descpb.ID @@ -372,8 +375,8 @@ type UpdateTableBackReferencesInTypes struct { // removed and is known to be unique to the descriptor. type RemoveBackReferenceInTypes struct { mutationOp - BackReferencedDescID descpb.ID - TypeIDs []descpb.ID + BackReferencedDescriptorID descpb.ID + TypeIDs []descpb.ID } // UpdateBackReferencesInSequences updates back references to a table expression @@ -563,8 +566,8 @@ type RemoveDatabaseRoleSettings struct { // RemoveUserPrivileges is used to revoke a user's privileges. type RemoveUserPrivileges struct { mutationOp - DescID descpb.ID - User string + DescriptorID descpb.ID + User string } // DeleteSchedule is used to delete a schedule ID from the database. diff --git a/pkg/sql/schemachanger/scop/mutation_visitor_generated.go b/pkg/sql/schemachanger/scop/mutation_visitor_generated.go index e37d85e064f5..7d25415b50db 100644 --- a/pkg/sql/schemachanger/scop/mutation_visitor_generated.go +++ b/pkg/sql/schemachanger/scop/mutation_visitor_generated.go @@ -23,35 +23,35 @@ type MutationOp interface { // MutationVisitor is a visitor for MutationOp operations. type MutationVisitor interface { NotImplemented(context.Context, NotImplemented) error - MakeAddedTempIndexDeleteOnly(context.Context, MakeAddedTempIndexDeleteOnly) error - MakeAddedIndexBackfilling(context.Context, MakeAddedIndexBackfilling) error + MakeAbsentTempIndexDeleteOnly(context.Context, MakeAbsentTempIndexDeleteOnly) error + MakeAbsentIndexBackfilling(context.Context, MakeAbsentIndexBackfilling) error SetAddedIndexPartialPredicate(context.Context, SetAddedIndexPartialPredicate) error - MakeAddedIndexDeleteAndWriteOnly(context.Context, MakeAddedIndexDeleteAndWriteOnly) error + MakeDeleteOnlyIndexWriteOnly(context.Context, MakeDeleteOnlyIndexWriteOnly) error MakeBackfilledIndexMerging(context.Context, MakeBackfilledIndexMerging) error MakeMergedIndexWriteOnly(context.Context, MakeMergedIndexWriteOnly) error MakeBackfillingIndexDeleteOnly(context.Context, MakeBackfillingIndexDeleteOnly) error - MakeAddedSecondaryIndexPublic(context.Context, MakeAddedSecondaryIndexPublic) error - MakeAddedPrimaryIndexPublic(context.Context, MakeAddedPrimaryIndexPublic) error - MakeDroppedPrimaryIndexDeleteAndWriteOnly(context.Context, MakeDroppedPrimaryIndexDeleteAndWriteOnly) error - CreateGcJobForTable(context.Context, CreateGcJobForTable) error - CreateGcJobForDatabase(context.Context, CreateGcJobForDatabase) error - CreateGcJobForIndex(context.Context, CreateGcJobForIndex) error + MakeValidatedSecondaryIndexPublic(context.Context, MakeValidatedSecondaryIndexPublic) error + MakeValidatedPrimaryIndexPublic(context.Context, MakeValidatedPrimaryIndexPublic) error + MakePublicPrimaryIndexWriteOnly(context.Context, MakePublicPrimaryIndexWriteOnly) error + CreateGCJobForTable(context.Context, CreateGCJobForTable) error + CreateGCJobForDatabase(context.Context, CreateGCJobForDatabase) error + CreateGCJobForIndex(context.Context, CreateGCJobForIndex) error MarkDescriptorAsPublic(context.Context, MarkDescriptorAsPublic) error MarkDescriptorAsSyntheticallyDropped(context.Context, MarkDescriptorAsSyntheticallyDropped) error MarkDescriptorAsDropped(context.Context, MarkDescriptorAsDropped) error DrainDescriptorName(context.Context, DrainDescriptorName) error - MakeAddedColumnDeleteAndWriteOnly(context.Context, MakeAddedColumnDeleteAndWriteOnly) error - MakeDroppedNonPrimaryIndexDeleteAndWriteOnly(context.Context, MakeDroppedNonPrimaryIndexDeleteAndWriteOnly) error - MakeDroppedIndexDeleteOnly(context.Context, MakeDroppedIndexDeleteOnly) error + MakeDeleteOnlyColumnWriteOnly(context.Context, MakeDeleteOnlyColumnWriteOnly) error + MakePublicSecondaryIndexWriteOnly(context.Context, MakePublicSecondaryIndexWriteOnly) error + MakeWriteOnlyIndexDeleteOnly(context.Context, MakeWriteOnlyIndexDeleteOnly) error RemoveDroppedIndexPartialPredicate(context.Context, RemoveDroppedIndexPartialPredicate) error MakeIndexAbsent(context.Context, MakeIndexAbsent) error - MakeAddedColumnDeleteOnly(context.Context, MakeAddedColumnDeleteOnly) error + MakeAbsentColumnDeleteOnly(context.Context, MakeAbsentColumnDeleteOnly) error SetAddedColumnType(context.Context, SetAddedColumnType) error - MakeColumnPublic(context.Context, MakeColumnPublic) error - MakeDroppedColumnDeleteAndWriteOnly(context.Context, MakeDroppedColumnDeleteAndWriteOnly) error - MakeDroppedColumnDeleteOnly(context.Context, MakeDroppedColumnDeleteOnly) error + MakeWriteOnlyColumnPublic(context.Context, MakeWriteOnlyColumnPublic) error + MakePublicColumnWriteOnly(context.Context, MakePublicColumnWriteOnly) error + MakeWriteOnlyColumnDeleteOnly(context.Context, MakeWriteOnlyColumnDeleteOnly) error RemoveDroppedColumnType(context.Context, RemoveDroppedColumnType) error - MakeColumnAbsent(context.Context, MakeColumnAbsent) error + MakeDeleteOnlyColumnAbsent(context.Context, MakeDeleteOnlyColumnAbsent) error RemoveOwnerBackReferenceInSequence(context.Context, RemoveOwnerBackReferenceInSequence) error RemoveSequenceOwner(context.Context, RemoveSequenceOwner) error RemoveCheckConstraint(context.Context, RemoveCheckConstraint) error @@ -103,13 +103,13 @@ func (op NotImplemented) Visit(ctx context.Context, v MutationVisitor) error { } // Visit is part of the MutationOp interface. -func (op MakeAddedTempIndexDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedTempIndexDeleteOnly(ctx, op) +func (op MakeAbsentTempIndexDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeAbsentTempIndexDeleteOnly(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeAddedIndexBackfilling) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedIndexBackfilling(ctx, op) +func (op MakeAbsentIndexBackfilling) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeAbsentIndexBackfilling(ctx, op) } // Visit is part of the MutationOp interface. @@ -118,8 +118,8 @@ func (op SetAddedIndexPartialPredicate) Visit(ctx context.Context, v MutationVis } // Visit is part of the MutationOp interface. -func (op MakeAddedIndexDeleteAndWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedIndexDeleteAndWriteOnly(ctx, op) +func (op MakeDeleteOnlyIndexWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeDeleteOnlyIndexWriteOnly(ctx, op) } // Visit is part of the MutationOp interface. @@ -138,33 +138,33 @@ func (op MakeBackfillingIndexDeleteOnly) Visit(ctx context.Context, v MutationVi } // Visit is part of the MutationOp interface. -func (op MakeAddedSecondaryIndexPublic) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedSecondaryIndexPublic(ctx, op) +func (op MakeValidatedSecondaryIndexPublic) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeValidatedSecondaryIndexPublic(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeAddedPrimaryIndexPublic) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedPrimaryIndexPublic(ctx, op) +func (op MakeValidatedPrimaryIndexPublic) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeValidatedPrimaryIndexPublic(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeDroppedPrimaryIndexDeleteAndWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeDroppedPrimaryIndexDeleteAndWriteOnly(ctx, op) +func (op MakePublicPrimaryIndexWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakePublicPrimaryIndexWriteOnly(ctx, op) } // Visit is part of the MutationOp interface. -func (op CreateGcJobForTable) Visit(ctx context.Context, v MutationVisitor) error { - return v.CreateGcJobForTable(ctx, op) +func (op CreateGCJobForTable) Visit(ctx context.Context, v MutationVisitor) error { + return v.CreateGCJobForTable(ctx, op) } // Visit is part of the MutationOp interface. -func (op CreateGcJobForDatabase) Visit(ctx context.Context, v MutationVisitor) error { - return v.CreateGcJobForDatabase(ctx, op) +func (op CreateGCJobForDatabase) Visit(ctx context.Context, v MutationVisitor) error { + return v.CreateGCJobForDatabase(ctx, op) } // Visit is part of the MutationOp interface. -func (op CreateGcJobForIndex) Visit(ctx context.Context, v MutationVisitor) error { - return v.CreateGcJobForIndex(ctx, op) +func (op CreateGCJobForIndex) Visit(ctx context.Context, v MutationVisitor) error { + return v.CreateGCJobForIndex(ctx, op) } // Visit is part of the MutationOp interface. @@ -188,18 +188,18 @@ func (op DrainDescriptorName) Visit(ctx context.Context, v MutationVisitor) erro } // Visit is part of the MutationOp interface. -func (op MakeAddedColumnDeleteAndWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedColumnDeleteAndWriteOnly(ctx, op) +func (op MakeDeleteOnlyColumnWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeDeleteOnlyColumnWriteOnly(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeDroppedNonPrimaryIndexDeleteAndWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly(ctx, op) +func (op MakePublicSecondaryIndexWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakePublicSecondaryIndexWriteOnly(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeDroppedIndexDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeDroppedIndexDeleteOnly(ctx, op) +func (op MakeWriteOnlyIndexDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeWriteOnlyIndexDeleteOnly(ctx, op) } // Visit is part of the MutationOp interface. @@ -213,8 +213,8 @@ func (op MakeIndexAbsent) Visit(ctx context.Context, v MutationVisitor) error { } // Visit is part of the MutationOp interface. -func (op MakeAddedColumnDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeAddedColumnDeleteOnly(ctx, op) +func (op MakeAbsentColumnDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeAbsentColumnDeleteOnly(ctx, op) } // Visit is part of the MutationOp interface. @@ -223,18 +223,18 @@ func (op SetAddedColumnType) Visit(ctx context.Context, v MutationVisitor) error } // Visit is part of the MutationOp interface. -func (op MakeColumnPublic) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeColumnPublic(ctx, op) +func (op MakeWriteOnlyColumnPublic) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeWriteOnlyColumnPublic(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeDroppedColumnDeleteAndWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeDroppedColumnDeleteAndWriteOnly(ctx, op) +func (op MakePublicColumnWriteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakePublicColumnWriteOnly(ctx, op) } // Visit is part of the MutationOp interface. -func (op MakeDroppedColumnDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeDroppedColumnDeleteOnly(ctx, op) +func (op MakeWriteOnlyColumnDeleteOnly) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeWriteOnlyColumnDeleteOnly(ctx, op) } // Visit is part of the MutationOp interface. @@ -243,8 +243,8 @@ func (op RemoveDroppedColumnType) Visit(ctx context.Context, v MutationVisitor) } // Visit is part of the MutationOp interface. -func (op MakeColumnAbsent) Visit(ctx context.Context, v MutationVisitor) error { - return v.MakeColumnAbsent(ctx, op) +func (op MakeDeleteOnlyColumnAbsent) Visit(ctx context.Context, v MutationVisitor) error { + return v.MakeDeleteOnlyColumnAbsent(ctx, op) } // Visit is part of the MutationOp interface. diff --git a/pkg/sql/schemachanger/scop/validation.go b/pkg/sql/schemachanger/scop/validation.go index 7d7528377631..2cb8c4ce0fa5 100644 --- a/pkg/sql/schemachanger/scop/validation.go +++ b/pkg/sql/schemachanger/scop/validation.go @@ -18,8 +18,11 @@ type validationOp struct{ baseOp } func (validationOp) Type() Type { return ValidationType } -// ValidateUniqueIndex validates uniqueness of entries for a unique index. -type ValidateUniqueIndex struct { +// ValidateIndex validates the following on an index +// addition that is in WRITE_ONLY: +// 1. its row count is equal to the current primary index row count; +// 2. check for entry uniqueness if it's a unique index; +type ValidateIndex struct { validationOp TableID descpb.ID IndexID descpb.IndexID diff --git a/pkg/sql/schemachanger/scop/validation_visitor_generated.go b/pkg/sql/schemachanger/scop/validation_visitor_generated.go index eae21486426e..b40da5a9dfaf 100644 --- a/pkg/sql/schemachanger/scop/validation_visitor_generated.go +++ b/pkg/sql/schemachanger/scop/validation_visitor_generated.go @@ -22,13 +22,13 @@ type ValidationOp interface { // ValidationVisitor is a visitor for ValidationOp operations. type ValidationVisitor interface { - ValidateUniqueIndex(context.Context, ValidateUniqueIndex) error + ValidateIndex(context.Context, ValidateIndex) error ValidateCheckConstraint(context.Context, ValidateCheckConstraint) error } // Visit is part of the ValidationOp interface. -func (op ValidateUniqueIndex) Visit(ctx context.Context, v ValidationVisitor) error { - return v.ValidateUniqueIndex(ctx, op) +func (op ValidateIndex) Visit(ctx context.Context, v ValidationVisitor) error { + return v.ValidateIndex(ctx, op) } // Visit is part of the ValidationOp interface. diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_alias_type.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_alias_type.go index 8b6d32ba7a6c..e5b41b56c238 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_alias_type.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_alias_type.go @@ -28,7 +28,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.AliasType) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.TypeID, + DescriptorID: this.TypeID, } }), ), @@ -38,7 +38,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.AliasType, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.TypeID, + DescriptorID: this.TypeID, } }), ), @@ -46,7 +46,7 @@ func init() { revertible(false), emit(func(this *scpb.AliasType) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.TypeID, + DescriptorID: this.TypeID, } }), ), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_column.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_column.go index a44b411b3361..45aabd58ca76 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_column.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_column.go @@ -21,8 +21,8 @@ func init() { toPublic( scpb.Status_ABSENT, to(scpb.Status_DELETE_ONLY, - emit(func(this *scpb.Column) *scop.MakeAddedColumnDeleteOnly { - return &scop.MakeAddedColumnDeleteOnly{ + emit(func(this *scpb.Column) *scop.MakeAbsentColumnDeleteOnly { + return &scop.MakeAbsentColumnDeleteOnly{ Column: *protoutil.Clone(this).(*scpb.Column), } }), @@ -31,16 +31,16 @@ func init() { }), ), to(scpb.Status_WRITE_ONLY, - emit(func(this *scpb.Column) *scop.MakeAddedColumnDeleteAndWriteOnly { - return &scop.MakeAddedColumnDeleteAndWriteOnly{ + emit(func(this *scpb.Column) *scop.MakeDeleteOnlyColumnWriteOnly { + return &scop.MakeDeleteOnlyColumnWriteOnly{ TableID: this.TableID, ColumnID: this.ColumnID, } }), ), to(scpb.Status_PUBLIC, - emit(func(this *scpb.Column, md *targetsWithElementMap) *scop.MakeColumnPublic { - return &scop.MakeColumnPublic{ + emit(func(this *scpb.Column, md *targetsWithElementMap) *scop.MakeWriteOnlyColumnPublic { + return &scop.MakeWriteOnlyColumnPublic{ EventBase: newLogEventBase(this, md), TableID: this.TableID, ColumnID: this.ColumnID, @@ -56,8 +56,8 @@ func init() { toAbsent( scpb.Status_PUBLIC, to(scpb.Status_WRITE_ONLY, - emit(func(this *scpb.Column) *scop.MakeDroppedColumnDeleteAndWriteOnly { - return &scop.MakeDroppedColumnDeleteAndWriteOnly{ + emit(func(this *scpb.Column) *scop.MakePublicColumnWriteOnly { + return &scop.MakePublicColumnWriteOnly{ TableID: this.TableID, ColumnID: this.ColumnID, } @@ -68,16 +68,16 @@ func init() { ), to(scpb.Status_DELETE_ONLY, revertible(false), - emit(func(this *scpb.Column) *scop.MakeDroppedColumnDeleteOnly { - return &scop.MakeDroppedColumnDeleteOnly{ + emit(func(this *scpb.Column) *scop.MakeWriteOnlyColumnDeleteOnly { + return &scop.MakeWriteOnlyColumnDeleteOnly{ TableID: this.TableID, ColumnID: this.ColumnID, } }), ), to(scpb.Status_ABSENT, - emit(func(this *scpb.Column, md *targetsWithElementMap) *scop.MakeColumnAbsent { - return &scop.MakeColumnAbsent{ + emit(func(this *scpb.Column, md *targetsWithElementMap) *scop.MakeDeleteOnlyColumnAbsent { + return &scop.MakeDeleteOnlyColumnAbsent{ EventBase: newLogEventBase(this, md), TableID: this.TableID, ColumnID: this.ColumnID, diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_database.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_database.go index 8e886b0dab42..e26fd6e9e5e7 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_database.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_database.go @@ -28,7 +28,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.Database) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.DatabaseID, + DescriptorID: this.DatabaseID, } }), ), @@ -38,7 +38,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.Database, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.DatabaseID, + DescriptorID: this.DatabaseID, } }), ), @@ -46,7 +46,7 @@ func init() { revertible(false), emit(func(this *scpb.Database) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.DatabaseID, + DescriptorID: this.DatabaseID, } }), ), @@ -54,8 +54,8 @@ func init() { emit(func(this *scpb.Database, md *targetsWithElementMap) *scop.LogEvent { return newLogEventOp(this, md) }), - emit(func(this *scpb.Database, md *targetsWithElementMap) *scop.CreateGcJobForDatabase { - return &scop.CreateGcJobForDatabase{ + emit(func(this *scpb.Database, md *targetsWithElementMap) *scop.CreateGCJobForDatabase { + return &scop.CreateGCJobForDatabase{ DatabaseID: this.DatabaseID, StatementForDropJob: statementForDropJob(this, md), } diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_enum_type.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_enum_type.go index 2f908f688081..a9d4a0647d5d 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_enum_type.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_enum_type.go @@ -28,7 +28,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.EnumType) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.TypeID, + DescriptorID: this.TypeID, } }), ), @@ -38,7 +38,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.EnumType, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.TypeID, + DescriptorID: this.TypeID, } }), ), @@ -46,7 +46,7 @@ func init() { revertible(false), emit(func(this *scpb.EnumType) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.TypeID, + DescriptorID: this.TypeID, } }), ), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_primary_index.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_primary_index.go index 855d506c6d19..56b0d4d952bd 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_primary_index.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_primary_index.go @@ -21,8 +21,8 @@ func init() { toPublic( scpb.Status_ABSENT, to(scpb.Status_BACKFILL_ONLY, - emit(func(this *scpb.PrimaryIndex) *scop.MakeAddedIndexBackfilling { - return &scop.MakeAddedIndexBackfilling{ + emit(func(this *scpb.PrimaryIndex) *scop.MakeAbsentIndexBackfilling { + return &scop.MakeAbsentIndexBackfilling{ Index: *protoutil.Clone(&this.Index).(*scpb.Index), } }), @@ -76,16 +76,16 @@ func init() { }), ), to(scpb.Status_VALIDATED, - emit(func(this *scpb.PrimaryIndex) *scop.ValidateUniqueIndex { - return &scop.ValidateUniqueIndex{ + emit(func(this *scpb.PrimaryIndex) *scop.ValidateIndex { + return &scop.ValidateIndex{ TableID: this.TableID, IndexID: this.IndexID, } }), ), to(scpb.Status_PUBLIC, - emit(func(this *scpb.PrimaryIndex, md *targetsWithElementMap) *scop.MakeAddedPrimaryIndexPublic { - return &scop.MakeAddedPrimaryIndexPublic{ + emit(func(this *scpb.PrimaryIndex, md *targetsWithElementMap) *scop.MakeValidatedPrimaryIndexPublic { + return &scop.MakeValidatedPrimaryIndexPublic{ EventBase: newLogEventBase(this, md), TableID: this.TableID, IndexID: this.IndexID, @@ -97,9 +97,9 @@ func init() { toAbsent( scpb.Status_PUBLIC, to(scpb.Status_VALIDATED, - emit(func(this *scpb.PrimaryIndex) *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly { + emit(func(this *scpb.PrimaryIndex) *scop.MakePublicPrimaryIndexWriteOnly { // Most of this logic is taken from MakeMutationComplete(). - return &scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly{ + return &scop.MakePublicPrimaryIndexWriteOnly{ TableID: this.TableID, IndexID: this.IndexID, } @@ -111,8 +111,8 @@ func init() { equiv(scpb.Status_MERGE_ONLY), equiv(scpb.Status_MERGED), to(scpb.Status_DELETE_ONLY, - emit(func(this *scpb.PrimaryIndex) *scop.MakeDroppedIndexDeleteOnly { - return &scop.MakeDroppedIndexDeleteOnly{ + emit(func(this *scpb.PrimaryIndex) *scop.MakeWriteOnlyIndexDeleteOnly { + return &scop.MakeWriteOnlyIndexDeleteOnly{ TableID: this.TableID, IndexID: this.IndexID, } @@ -121,8 +121,8 @@ func init() { equiv(scpb.Status_BACKFILLED), equiv(scpb.Status_BACKFILL_ONLY), to(scpb.Status_ABSENT, - emit(func(this *scpb.PrimaryIndex, md *targetsWithElementMap) *scop.CreateGcJobForIndex { - return &scop.CreateGcJobForIndex{ + emit(func(this *scpb.PrimaryIndex, md *targetsWithElementMap) *scop.CreateGCJobForIndex { + return &scop.CreateGCJobForIndex{ TableID: this.TableID, IndexID: this.IndexID, StatementForDropJob: statementForDropJob(this, md), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_schema.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_schema.go index a865d7bc2ec2..ba2ff8acd263 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_schema.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_schema.go @@ -28,7 +28,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.Schema) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.SchemaID, + DescriptorID: this.SchemaID, } }), ), @@ -37,7 +37,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.Schema, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.SchemaID, + DescriptorID: this.SchemaID, } }), ), @@ -45,7 +45,7 @@ func init() { revertible(false), emit(func(this *scpb.Schema) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.SchemaID, + DescriptorID: this.SchemaID, } }), ), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_secondary_index.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_secondary_index.go index f1667efacb53..0c7606c32906 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_secondary_index.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_secondary_index.go @@ -21,8 +21,8 @@ func init() { toPublic( scpb.Status_ABSENT, to(scpb.Status_BACKFILL_ONLY, - emit(func(this *scpb.SecondaryIndex) *scop.MakeAddedIndexBackfilling { - return &scop.MakeAddedIndexBackfilling{ + emit(func(this *scpb.SecondaryIndex) *scop.MakeAbsentIndexBackfilling { + return &scop.MakeAbsentIndexBackfilling{ Index: *protoutil.Clone(&this.Index).(*scpb.Index), IsSecondaryIndex: true, } @@ -77,18 +77,16 @@ func init() { }), ), to(scpb.Status_VALIDATED, - emit(func(this *scpb.SecondaryIndex) *scop.ValidateUniqueIndex { - // TODO(ajwerner): Should this say something other than - // ValidateUniqueIndex for a non-unique index? - return &scop.ValidateUniqueIndex{ + emit(func(this *scpb.SecondaryIndex) *scop.ValidateIndex { + return &scop.ValidateIndex{ TableID: this.TableID, IndexID: this.IndexID, } }), ), to(scpb.Status_PUBLIC, - emit(func(this *scpb.SecondaryIndex) *scop.MakeAddedSecondaryIndexPublic { - return &scop.MakeAddedSecondaryIndexPublic{ + emit(func(this *scpb.SecondaryIndex) *scop.MakeValidatedSecondaryIndexPublic { + return &scop.MakeValidatedSecondaryIndexPublic{ TableID: this.TableID, IndexID: this.IndexID, } @@ -98,9 +96,9 @@ func init() { toAbsent( scpb.Status_PUBLIC, to(scpb.Status_VALIDATED, - emit(func(this *scpb.SecondaryIndex) *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly { + emit(func(this *scpb.SecondaryIndex) *scop.MakePublicSecondaryIndexWriteOnly { // Most of this logic is taken from MakeMutationComplete(). - return &scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly{ + return &scop.MakePublicSecondaryIndexWriteOnly{ TableID: this.TableID, IndexID: this.IndexID, } @@ -112,8 +110,8 @@ func init() { equiv(scpb.Status_MERGE_ONLY), equiv(scpb.Status_MERGED), to(scpb.Status_DELETE_ONLY, - emit(func(this *scpb.SecondaryIndex) *scop.MakeDroppedIndexDeleteOnly { - return &scop.MakeDroppedIndexDeleteOnly{ + emit(func(this *scpb.SecondaryIndex) *scop.MakeWriteOnlyIndexDeleteOnly { + return &scop.MakeWriteOnlyIndexDeleteOnly{ TableID: this.TableID, IndexID: this.IndexID, } @@ -125,8 +123,8 @@ func init() { emit(func(this *scpb.SecondaryIndex, md *targetsWithElementMap) *scop.LogEvent { return newLogEventOp(this, md) }), - emit(func(this *scpb.SecondaryIndex, md *targetsWithElementMap) *scop.CreateGcJobForIndex { - return &scop.CreateGcJobForIndex{ + emit(func(this *scpb.SecondaryIndex, md *targetsWithElementMap) *scop.CreateGCJobForIndex { + return &scop.CreateGCJobForIndex{ TableID: this.TableID, IndexID: this.IndexID, StatementForDropJob: statementForDropJob(this, md), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence.go index d7e20b2e4c0f..411f7bdeaedf 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_sequence.go @@ -29,7 +29,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.Sequence) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.SequenceID, + DescriptorID: this.SequenceID, } }), ), @@ -38,7 +38,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.Sequence, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.SequenceID, + DescriptorID: this.SequenceID, } }), ), @@ -46,7 +46,7 @@ func init() { revertible(false), emit(func(this *scpb.Sequence) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.SequenceID, + DescriptorID: this.SequenceID, } }), emit(func(this *scpb.Sequence) *scop.RemoveAllTableComments { @@ -59,8 +59,8 @@ func init() { emit(func(this *scpb.Sequence, md *targetsWithElementMap) *scop.LogEvent { return newLogEventOp(this, md) }), - emit(func(this *scpb.Sequence, md *targetsWithElementMap) *scop.CreateGcJobForTable { - return &scop.CreateGcJobForTable{ + emit(func(this *scpb.Sequence, md *targetsWithElementMap) *scop.CreateGCJobForTable { + return &scop.CreateGCJobForTable{ TableID: this.SequenceID, StatementForDropJob: statementForDropJob(this, md), } diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table.go index a38be982178a..400ed5e7c12d 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table.go @@ -28,7 +28,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.Table) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.TableID, + DescriptorID: this.TableID, } }), ), @@ -38,7 +38,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.Table, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.TableID, + DescriptorID: this.TableID, } }), ), @@ -46,7 +46,7 @@ func init() { revertible(false), emit(func(this *scpb.Table) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.TableID, + DescriptorID: this.TableID, } }), emit(func(this *scpb.Table) *scop.RemoveAllTableComments { @@ -59,8 +59,8 @@ func init() { emit(func(this *scpb.Table, md *targetsWithElementMap) *scop.LogEvent { return newLogEventOp(this, md) }), - emit(func(this *scpb.Table, md *targetsWithElementMap) *scop.CreateGcJobForTable { - return &scop.CreateGcJobForTable{ + emit(func(this *scpb.Table, md *targetsWithElementMap) *scop.CreateGCJobForTable { + return &scop.CreateGCJobForTable{ TableID: this.TableID, StatementForDropJob: statementForDropJob(this, md), } diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table_locality_secondary_region.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table_locality_secondary_region.go index e6f04687b5c7..174bcffeac5f 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table_locality_secondary_region.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_table_locality_secondary_region.go @@ -34,8 +34,8 @@ func init() { // TODO(postamar): implement table locality update emit(func(this *scpb.TableLocalitySecondaryRegion) *scop.RemoveBackReferenceInTypes { return &scop.RemoveBackReferenceInTypes{ - TypeIDs: []catid.DescID{this.RegionEnumTypeID}, - BackReferencedDescID: this.TableID, + TypeIDs: []catid.DescID{this.RegionEnumTypeID}, + BackReferencedDescriptorID: this.TableID, } }), ), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go index d26309e42306..f9e2293c42cc 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go @@ -21,16 +21,16 @@ func init() { toTransientAbsent( scpb.Status_ABSENT, to(scpb.Status_DELETE_ONLY, - emit(func(this *scpb.TemporaryIndex) *scop.MakeAddedTempIndexDeleteOnly { - return &scop.MakeAddedTempIndexDeleteOnly{ + emit(func(this *scpb.TemporaryIndex) *scop.MakeAbsentTempIndexDeleteOnly { + return &scop.MakeAbsentTempIndexDeleteOnly{ Index: *protoutil.Clone(&this.Index).(*scpb.Index), IsSecondaryIndex: this.IsUsingSecondaryEncoding, } }), ), to(scpb.Status_WRITE_ONLY, - emit(func(this *scpb.TemporaryIndex) *scop.MakeAddedIndexDeleteAndWriteOnly { - return &scop.MakeAddedIndexDeleteAndWriteOnly{ + emit(func(this *scpb.TemporaryIndex) *scop.MakeDeleteOnlyIndexWriteOnly { + return &scop.MakeDeleteOnlyIndexWriteOnly{ TableID: this.TableID, IndexID: this.IndexID, } @@ -41,16 +41,16 @@ func init() { scpb.Status_WRITE_ONLY, to(scpb.Status_DELETE_ONLY, revertible(false), - emit(func(this *scpb.TemporaryIndex) *scop.MakeDroppedIndexDeleteOnly { - return &scop.MakeDroppedIndexDeleteOnly{ + emit(func(this *scpb.TemporaryIndex) *scop.MakeWriteOnlyIndexDeleteOnly { + return &scop.MakeWriteOnlyIndexDeleteOnly{ TableID: this.TableID, IndexID: this.IndexID, } }), ), to(scpb.Status_ABSENT, - emit(func(this *scpb.TemporaryIndex) *scop.CreateGcJobForIndex { - return &scop.CreateGcJobForIndex{ + emit(func(this *scpb.TemporaryIndex) *scop.CreateGCJobForIndex { + return &scop.CreateGCJobForIndex{ TableID: this.TableID, IndexID: this.IndexID, } diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_user_privileges.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_user_privileges.go index 7ac2ebb572d9..69897f8a24f6 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_user_privileges.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_user_privileges.go @@ -32,8 +32,8 @@ func init() { revertible(false), emit(func(this *scpb.UserPrivileges) *scop.RemoveUserPrivileges { return &scop.RemoveUserPrivileges{ - DescID: this.DescriptorID, - User: this.UserName, + DescriptorID: this.DescriptorID, + User: this.UserName, } }), ), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_view.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_view.go index f9c9260ecaec..80a6a2045c96 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_view.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_view.go @@ -28,7 +28,7 @@ func init() { to(scpb.Status_PUBLIC, emit(func(this *scpb.View) *scop.MarkDescriptorAsPublic { return &scop.MarkDescriptorAsPublic{ - DescID: this.ViewID, + DescriptorID: this.ViewID, } }), ), @@ -38,7 +38,7 @@ func init() { to(scpb.Status_TXN_DROPPED, emit(func(this *scpb.View, md *targetsWithElementMap) *scop.MarkDescriptorAsSyntheticallyDropped { return &scop.MarkDescriptorAsSyntheticallyDropped{ - DescID: this.ViewID, + DescriptorID: this.ViewID, } }), ), @@ -46,7 +46,7 @@ func init() { revertible(false), emit(func(this *scpb.View) *scop.MarkDescriptorAsDropped { return &scop.MarkDescriptorAsDropped{ - DescID: this.ViewID, + DescriptorID: this.ViewID, } }), emit(func(this *scpb.View) *scop.RemoveBackReferenceInTypes { @@ -54,8 +54,8 @@ func init() { return nil } return &scop.RemoveBackReferenceInTypes{ - BackReferencedDescID: this.ViewID, - TypeIDs: this.UsesTypeIDs, + BackReferencedDescriptorID: this.ViewID, + TypeIDs: this.UsesTypeIDs, } }), emit(func(this *scpb.View) *scop.RemoveViewBackReferencesInRelations { @@ -77,12 +77,12 @@ func init() { emit(func(this *scpb.View, md *targetsWithElementMap) *scop.LogEvent { return newLogEventOp(this, md) }), - emit(func(this *scpb.View, md *targetsWithElementMap) *scop.CreateGcJobForTable { + emit(func(this *scpb.View, md *targetsWithElementMap) *scop.CreateGCJobForTable { if !this.IsMaterialized { return nil } - return &scop.CreateGcJobForTable{ + return &scop.CreateGCJobForTable{ TableID: this.ViewID, StatementForDropJob: statementForDropJob(this, md), } diff --git a/pkg/sql/schemachanger/scplan/internal/scgraph/graph_test.go b/pkg/sql/schemachanger/scplan/internal/scgraph/graph_test.go index f2d7b4cfd87b..336348a53bad 100644 --- a/pkg/sql/schemachanger/scplan/internal/scgraph/graph_test.go +++ b/pkg/sql/schemachanger/scplan/internal/scgraph/graph_test.go @@ -118,7 +118,7 @@ func TestGraphRanks(t *testing.T) { scpb.Status_ABSENT, scpb.Status_PUBLIC, revertible, canFail, - &scop.MakeColumnAbsent{}, + &scop.MakeDeleteOnlyColumnAbsent{}, )) } else { require.NoError(t, graph.AddOpEdges( @@ -126,7 +126,7 @@ func TestGraphRanks(t *testing.T) { scpb.Status_PUBLIC, scpb.Status_ABSENT, revertible, canFail, - &scop.MakeColumnAbsent{}, + &scop.MakeDeleteOnlyColumnAbsent{}, )) } } diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column index a6b84e618af1..77168fc7528d 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column @@ -13,7 +13,7 @@ StatementPhase stage 1 of 1 with 6 MutationType ops [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 1}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 2 PgAttributeNum: 2 @@ -90,7 +90,7 @@ PostCommitPhase stage 1 of 2 with 5 MutationType ops transitions: [[Column:{DescID: 104, ColumnID: 2}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 2 TableID: 104 *scop.SetJobStateOnDescriptor @@ -105,7 +105,7 @@ PostCommitPhase stage 2 of 2 with 6 MutationType ops transitions: [[Column:{DescID: 104, ColumnID: 2}, PUBLIC], WRITE_ONLY] -> PUBLIC ops: - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 2 EventBase: Authorization: @@ -147,7 +147,7 @@ StatementPhase stage 1 of 1 with 11 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC ops: - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 2 PgAttributeNum: 2 @@ -187,7 +187,7 @@ StatementPhase stage 1 of 1 with 11 MutationType ops Expression: Expr: 123:::INT8 TableID: 104 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 2 IndexID: 2 @@ -204,7 +204,7 @@ StatementPhase stage 1 of 1 with 11 MutationType ops IndexID: 2 Kind: 2 TableID: 104 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 3 IndexID: 3 @@ -243,10 +243,10 @@ PostCommitPhase stage 1 of 7 with 4 MutationType ops [[Column:{DescID: 104, ColumnID: 2}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 2 TableID: 104 - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 104 *scop.SetJobStateOnDescriptor @@ -306,7 +306,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 104 PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops @@ -321,7 +321,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT ops: - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 104 *scop.SetIndexName @@ -332,10 +332,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops IndexID: 2 Name: foo_pkey TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 104 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -347,7 +347,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops SubWorkID: 1 IndexID: 2 TableID: 104 - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 2 EventBase: Authorization: @@ -371,13 +371,13 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 5 MutationType ops [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 104 *scop.MakeIndexAbsent IndexID: 3 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 104 *scop.SetJobStateOnDescriptor @@ -389,7 +389,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops transitions: [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo ADD COLUMN j INT8 NOT NULL DEFAULT 123 @@ -436,7 +436,7 @@ StatementPhase stage 1 of 1 with 18 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 2}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 2 PgAttributeNum: 2 @@ -476,7 +476,7 @@ StatementPhase stage 1 of 1 with 18 MutationType ops Expression: Expr: 123:::INT8 TableID: 104 - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 3 PgAttributeNum: 3 @@ -517,7 +517,7 @@ StatementPhase stage 1 of 1 with 18 MutationType ops Expression: Expr: 456:::INT8 TableID: 104 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 2 IndexID: 2 @@ -534,7 +534,7 @@ StatementPhase stage 1 of 1 with 18 MutationType ops IndexID: 2 Kind: 2 TableID: 104 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 3 IndexID: 3 @@ -590,13 +590,13 @@ PostCommitPhase stage 1 of 7 with 5 MutationType ops [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY [[Column:{DescID: 104, ColumnID: 3}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 2 TableID: 104 - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 3 TableID: 104 - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 104 *scop.SetJobStateOnDescriptor @@ -656,7 +656,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 104 PostCommitNonRevertiblePhase stage 1 of 3 with 11 MutationType ops @@ -672,7 +672,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 11 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT [[Column:{DescID: 104, ColumnID: 3}, PUBLIC], WRITE_ONLY] -> PUBLIC ops: - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 104 *scop.SetIndexName @@ -683,10 +683,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 11 MutationType ops IndexID: 2 Name: foo_pkey TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 104 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -697,7 +697,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 11 MutationType ops SubWorkID: 1 IndexID: 2 TableID: 104 - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 2 EventBase: Authorization: @@ -710,7 +710,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 11 MutationType ops TableID: 104 *scop.RefreshStats TableID: 104 - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 3 EventBase: Authorization: @@ -734,13 +734,13 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 5 MutationType ops [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 104 *scop.MakeIndexAbsent IndexID: 3 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 104 *scop.SetJobStateOnDescriptor @@ -752,7 +752,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops transitions: [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo ADD COLUMN j INT8 DEFAULT 123 @@ -790,7 +790,7 @@ StatementPhase stage 1 of 1 with 10 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC ops: - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 2 PgAttributeNum: 2 @@ -829,7 +829,7 @@ StatementPhase stage 1 of 1 with 10 MutationType ops family: IntFamily oid: 20 width: 64 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 2 IndexID: 2 @@ -846,7 +846,7 @@ StatementPhase stage 1 of 1 with 10 MutationType ops IndexID: 2 Kind: 2 TableID: 104 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 3 IndexID: 3 @@ -885,10 +885,10 @@ PostCommitPhase stage 1 of 7 with 4 MutationType ops [[Column:{DescID: 104, ColumnID: 2}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 2 TableID: 104 - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 104 *scop.SetJobStateOnDescriptor @@ -948,7 +948,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 104 PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops @@ -963,7 +963,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT ops: - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 104 *scop.SetIndexName @@ -974,10 +974,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops IndexID: 2 Name: foo_pkey TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 104 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -989,7 +989,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops SubWorkID: 1 IndexID: 2 TableID: 104 - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 2 EventBase: Authorization: @@ -1013,13 +1013,13 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 5 MutationType ops [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 104 *scop.MakeIndexAbsent IndexID: 3 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 104 *scop.SetJobStateOnDescriptor @@ -1031,7 +1031,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops transitions: [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo ADD COLUMN a INT8 AS (i + 1) STORED @@ -1075,7 +1075,7 @@ StatementPhase stage 1 of 1 with 10 MutationType ops [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 3}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 2 PgAttributeNum: 2 @@ -1114,7 +1114,7 @@ StatementPhase stage 1 of 1 with 10 MutationType ops IndexID: 1 Kind: 2 TableID: 104 - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 3 PgAttributeNum: 3 @@ -1184,10 +1184,10 @@ PostCommitPhase stage 1 of 2 with 5 MutationType ops [[Column:{DescID: 104, ColumnID: 2}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY [[Column:{DescID: 107, ColumnID: 3}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 2 TableID: 104 - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 3 TableID: 107 *scop.SetJobStateOnDescriptor @@ -1201,7 +1201,7 @@ PostCommitPhase stage 2 of 2 with 7 MutationType ops [[Column:{DescID: 104, ColumnID: 2}, PUBLIC], WRITE_ONLY] -> PUBLIC [[Column:{DescID: 107, ColumnID: 3}, PUBLIC], WRITE_ONLY] -> PUBLIC ops: - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 2 EventBase: Authorization: @@ -1214,7 +1214,7 @@ PostCommitPhase stage 2 of 2 with 7 MutationType ops TableID: 104 *scop.RefreshStats TableID: 104 - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 3 EventBase: Authorization: @@ -1260,7 +1260,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops [[IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 4}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 5}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 2 IndexID: 2 @@ -1277,7 +1277,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops IndexID: 2 Kind: 2 TableID: 108 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 3 IndexID: 3 @@ -1293,7 +1293,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops IndexID: 3 Kind: 2 TableID: 108 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 4 IndexID: 4 @@ -1302,7 +1302,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops TableID: 108 TemporaryIndexID: 5 IsSecondaryIndex: true - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 5 IndexID: 5 @@ -1351,10 +1351,10 @@ PostCommitPhase stage 1 of 7 with 4 MutationType ops [[TemporaryIndex:{DescID: 108, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY [[TemporaryIndex:{DescID: 108, IndexID: 5, ConstraintID: 5, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 108 - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 5 TableID: 108 *scop.SetJobStateOnDescriptor @@ -1437,10 +1437,10 @@ PostCommitPhase stage 7 of 7 with 2 ValidationType ops [[PrimaryIndex:{DescID: 108, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED [[SecondaryIndex:{DescID: 108, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 108 - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 4 TableID: 108 PostCommitNonRevertiblePhase stage 1 of 3 with 10 MutationType ops @@ -1458,7 +1458,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 10 MutationType ops [[TemporaryIndex:{DescID: 108, IndexID: 5, ConstraintID: 5, SourceIndexID: 1}, TRANSIENT_ABSENT], WRITE_ONLY] -> TRANSIENT_DELETE_ONLY [[IndexName:{DescID: 108, Name: t_i_key, IndexID: 4}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 108 *scop.SetIndexName @@ -1469,17 +1469,17 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 10 MutationType ops IndexID: 2 Name: t_pkey TableID: 108 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 108 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 5 TableID: 108 *scop.SetIndexName IndexID: 4 Name: t_i_key TableID: 108 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -1490,7 +1490,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 10 MutationType ops SubWorkID: 1 IndexID: 2 TableID: 108 - *scop.MakeAddedSecondaryIndexPublic + *scop.MakeValidatedSecondaryIndexPublic IndexID: 4 TableID: 108 *scop.SetJobStateOnDescriptor @@ -1504,19 +1504,19 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 7 MutationType ops [[TemporaryIndex:{DescID: 108, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT [[TemporaryIndex:{DescID: 108, IndexID: 5, ConstraintID: 5, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 108 *scop.MakeIndexAbsent IndexID: 3 TableID: 108 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 5 TableID: 108 *scop.MakeIndexAbsent IndexID: 5 TableID: 108 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 108 *scop.SetJobStateOnDescriptor @@ -1528,7 +1528,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops transitions: [[PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) @@ -1571,7 +1571,7 @@ StatementPhase stage 1 of 1 with 11 MutationType ops [[IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 3}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 109, ColumnID: 2, IndexID: 3}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC ops: - *scop.MakeAddedColumnDeleteOnly + *scop.MakeAbsentColumnDeleteOnly Column: ColumnID: 2 PgAttributeNum: 2 @@ -1612,7 +1612,7 @@ StatementPhase stage 1 of 1 with 11 MutationType ops Expression: Expr: 1:::INT8 TableID: 109 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 2 IndexID: 2 @@ -1629,7 +1629,7 @@ StatementPhase stage 1 of 1 with 11 MutationType ops IndexID: 2 Kind: 2 TableID: 109 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 3 IndexID: 3 @@ -1668,10 +1668,10 @@ PostCommitPhase stage 1 of 15 with 4 MutationType ops [[Column:{DescID: 109, ColumnID: 2}, PUBLIC], DELETE_ONLY] -> WRITE_ONLY [[TemporaryIndex:{DescID: 109, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedColumnDeleteAndWriteOnly + *scop.MakeDeleteOnlyColumnWriteOnly ColumnID: 2 TableID: 109 - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 109 *scop.SetJobStateOnDescriptor @@ -1731,7 +1731,7 @@ PostCommitPhase stage 7 of 15 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 109, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 109 PostCommitPhase stage 8 of 15 with 14 MutationType ops @@ -1748,7 +1748,7 @@ PostCommitPhase stage 8 of 15 with 14 MutationType ops [[IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 5}, PUBLIC], ABSENT] -> PUBLIC [[TemporaryIndex:{DescID: 109, IndexID: 5, ConstraintID: 4, SourceIndexID: 2}, TRANSIENT_ABSENT], ABSENT] -> DELETE_ONLY ops: - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 109 *scop.SetIndexName @@ -1759,7 +1759,7 @@ PostCommitPhase stage 8 of 15 with 14 MutationType ops IndexID: 2 Name: baz_pkey TableID: 109 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -1771,7 +1771,7 @@ PostCommitPhase stage 8 of 15 with 14 MutationType ops SubWorkID: 1 IndexID: 2 TableID: 109 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 4 IndexID: 4 @@ -1780,7 +1780,7 @@ PostCommitPhase stage 8 of 15 with 14 MutationType ops TableID: 109 TemporaryIndexID: 5 IsSecondaryIndex: true - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 4 IndexID: 5 @@ -1806,7 +1806,7 @@ PostCommitPhase stage 8 of 15 with 14 MutationType ops IndexID: 5 Kind: 1 TableID: 109 - *scop.MakeColumnPublic + *scop.MakeWriteOnlyColumnPublic ColumnID: 2 EventBase: Authorization: @@ -1828,7 +1828,7 @@ PostCommitPhase stage 9 of 15 with 3 MutationType ops transitions: [[TemporaryIndex:{DescID: 109, IndexID: 5, ConstraintID: 4, SourceIndexID: 2}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 5 TableID: 109 *scop.SetJobStateOnDescriptor @@ -1888,7 +1888,7 @@ PostCommitPhase stage 15 of 15 with 1 ValidationType op transitions: [[SecondaryIndex:{DescID: 109, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 4 TableID: 109 PostCommitNonRevertiblePhase stage 1 of 2 with 7 MutationType ops @@ -1902,20 +1902,20 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 7 MutationType ops [[IndexName:{DescID: 109, Name: baz_g_key, IndexID: 4}, PUBLIC], ABSENT] -> PUBLIC [[TemporaryIndex:{DescID: 109, IndexID: 5, ConstraintID: 4, SourceIndexID: 2}, TRANSIENT_ABSENT], WRITE_ONLY] -> TRANSIENT_DELETE_ONLY ops: - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 109 *scop.SetIndexName IndexID: 4 Name: baz_g_key TableID: 109 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 5 TableID: 109 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 109 - *scop.MakeAddedSecondaryIndexPublic + *scop.MakeValidatedSecondaryIndexPublic IndexID: 4 TableID: 109 *scop.SetJobStateOnDescriptor @@ -1929,7 +1929,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 8 MutationType ops [[TemporaryIndex:{DescID: 109, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT [[TemporaryIndex:{DescID: 109, IndexID: 5, ConstraintID: 4, SourceIndexID: 2}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.baz ADD COLUMN g INT8 UNIQUE DEFAULT 1 @@ -1946,13 +1946,13 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 8 MutationType ops SubWorkID: 1 IndexID: 1 TableID: 109 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 109 *scop.MakeIndexAbsent IndexID: 3 TableID: 109 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 5 TableID: 109 *scop.MakeIndexAbsent diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key index b19017aadefc..646c07dc45bb 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key @@ -21,7 +21,7 @@ StatementPhase stage 1 of 1 with 14 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeDroppedColumnDeleteAndWriteOnly + *scop.MakePublicColumnWriteOnly ColumnID: 3 TableID: 104 *scop.LogEvent @@ -44,7 +44,7 @@ StatementPhase stage 1 of 1 with 14 MutationType ops ColumnID: 3 Name: crdb_internal_column_3_name_placeholder TableID: 104 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 2 IndexID: 2 @@ -67,7 +67,7 @@ StatementPhase stage 1 of 1 with 14 MutationType ops Kind: 2 Ordinal: 1 TableID: 104 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 3 IndexID: 3 @@ -89,7 +89,7 @@ StatementPhase stage 1 of 1 with 14 MutationType ops Kind: 2 Ordinal: 1 TableID: 104 - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 4 IndexID: 4 @@ -128,7 +128,7 @@ PostCommitPhase stage 1 of 15 with 3 MutationType ops transitions: [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 104 *scop.SetJobStateOnDescriptor @@ -188,7 +188,7 @@ PostCommitPhase stage 7 of 15 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 104 PostCommitPhase stage 8 of 15 with 9 MutationType ops @@ -201,7 +201,7 @@ PostCommitPhase stage 8 of 15 with 9 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC ops: - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 104 *scop.SetIndexName @@ -212,7 +212,7 @@ PostCommitPhase stage 8 of 15 with 9 MutationType ops IndexID: 2 Name: t_pkey TableID: 104 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -223,7 +223,7 @@ PostCommitPhase stage 8 of 15 with 9 MutationType ops SubWorkID: 1 IndexID: 2 TableID: 104 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 5 IndexID: 5 @@ -247,7 +247,7 @@ PostCommitPhase stage 9 of 15 with 3 MutationType ops transitions: [[TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 5 TableID: 104 *scop.SetJobStateOnDescriptor @@ -307,7 +307,7 @@ PostCommitPhase stage 15 of 15 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 4 TableID: 104 PostCommitNonRevertiblePhase stage 1 of 4 with 6 MutationType ops @@ -325,16 +325,16 @@ PostCommitNonRevertiblePhase stage 1 of 4 with 6 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 5}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT ops: - *scop.MakeDroppedColumnDeleteOnly + *scop.MakeWriteOnlyColumnDeleteOnly ColumnID: 3 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 5 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 104 *scop.SetJobStateOnDescriptor @@ -355,7 +355,7 @@ PostCommitNonRevertiblePhase stage 2 of 4 with 12 MutationType ops [[IndexName:{DescID: 104, Name: t_pkey, IndexID: 4}, PUBLIC], ABSENT] -> PUBLIC [[TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (k) @@ -371,14 +371,14 @@ PostCommitNonRevertiblePhase stage 2 of 4 with 12 MutationType ops SubWorkID: 1 IndexID: 1 TableID: 104 - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 2 TableID: 104 *scop.SetIndexName IndexID: 2 Name: crdb_internal_index_2_name_placeholder TableID: 104 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 104 *scop.MakeIndexAbsent @@ -388,13 +388,13 @@ PostCommitNonRevertiblePhase stage 2 of 4 with 12 MutationType ops IndexID: 4 Name: t_pkey TableID: 104 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 5 TableID: 104 *scop.MakeIndexAbsent IndexID: 5 TableID: 104 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -414,7 +414,7 @@ PostCommitNonRevertiblePhase stage 3 of 4 with 3 MutationType ops transitions: [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_VALIDATED] -> TRANSIENT_DELETE_ONLY ops: - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 2 TableID: 104 *scop.SetJobStateOnDescriptor @@ -429,7 +429,7 @@ PostCommitNonRevertiblePhase stage 4 of 4 with 6 MutationType ops [[ColumnDefaultExpression:{DescID: 104, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (k) @@ -448,7 +448,7 @@ PostCommitNonRevertiblePhase stage 4 of 4 with 6 MutationType ops *scop.RemoveColumnDefaultExpression ColumnID: 3 TableID: 104 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column index 24727848f31e..82082fbfb054 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column @@ -33,7 +33,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops [[IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 4}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 4}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC ops: - *scop.MakeDroppedColumnDeleteAndWriteOnly + *scop.MakePublicColumnWriteOnly ColumnID: 2 TableID: 107 *scop.LogEvent @@ -55,7 +55,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops ColumnID: 2 Name: crdb_internal_column_2_name_placeholder TableID: 107 - *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicSecondaryIndexWriteOnly IndexID: 2 TableID: 107 *scop.SetIndexName @@ -63,8 +63,8 @@ StatementPhase stage 1 of 1 with 12 MutationType ops Name: crdb_internal_index_2_name_placeholder TableID: 107 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 108 - *scop.MakeAddedIndexBackfilling + DescriptorID: 108 + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 3 IndexID: 3 @@ -81,7 +81,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops IndexID: 3 Kind: 2 TableID: 107 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 4 IndexID: 4 @@ -130,7 +130,7 @@ PostCommitPhase stage 1 of 7 with 6 MutationType ops transitions: [[TemporaryIndex:{DescID: 107, IndexID: 4, ConstraintID: 4, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 4 TableID: 107 *scop.SetJobStateOnDescriptor @@ -214,7 +214,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 107, IndexID: 3, ConstraintID: 3, TemporaryIndexID: 4, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 3 TableID: 107 PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops @@ -256,10 +256,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops [[IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 4}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT [[IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 4}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT ops: - *scop.MakeDroppedColumnDeleteOnly + *scop.MakeWriteOnlyColumnDeleteOnly ColumnID: 2 TableID: 107 - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 107 *scop.SetIndexName @@ -267,9 +267,9 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops Name: crdb_internal_index_1_name_placeholder TableID: 107 *scop.MarkDescriptorAsDropped - DescID: 108 + DescriptorID: 108 *scop.RemoveBackReferenceInTypes - BackReferencedDescID: 108 + BackReferencedDescriptorID: 108 TypeIDs: - 104 *scop.RemoveViewBackReferencesInRelations @@ -290,10 +290,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops IndexID: 3 Name: foo_pkey TableID: 107 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 4 TableID: 107 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 2 TableID: 107 *scop.DrainDescriptorName @@ -302,7 +302,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops DescriptorID: 108 Name: fooview SchemaID: 101 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -352,7 +352,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v1 CASCADE @@ -385,7 +385,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -396,7 +396,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -407,7 +407,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -418,7 +418,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -429,7 +429,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -440,13 +440,13 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 4 TableID: 107 *scop.MakeIndexAbsent IndexID: 4 TableID: 107 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 107 *scop.SetJobStateOnDescriptor @@ -466,7 +466,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 9 MutationType ops [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 2}, ABSENT], DELETE_ONLY] -> ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v1 CASCADE @@ -490,7 +490,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 9 MutationType ops TypeIDs: - 104 - 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -960,7 +960,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops [[IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 4}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 4}, TRANSIENT_ABSENT], ABSENT] -> PUBLIC ops: - *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicSecondaryIndexWriteOnly IndexID: 2 TableID: 107 *scop.SetIndexName @@ -968,8 +968,8 @@ StatementPhase stage 1 of 1 with 12 MutationType ops Name: crdb_internal_index_2_name_placeholder TableID: 107 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 108 - *scop.MakeAddedIndexBackfilling + DescriptorID: 108 + *scop.MakeAbsentIndexBackfilling Index: ConstraintID: 3 IndexID: 3 @@ -986,7 +986,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops IndexID: 3 Kind: 2 TableID: 107 - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: ConstraintID: 4 IndexID: 4 @@ -1002,7 +1002,7 @@ StatementPhase stage 1 of 1 with 12 MutationType ops IndexID: 4 Kind: 2 TableID: 107 - *scop.MakeDroppedColumnDeleteAndWriteOnly + *scop.MakePublicColumnWriteOnly ColumnID: 3 TableID: 107 *scop.LogEvent @@ -1061,7 +1061,7 @@ PostCommitPhase stage 1 of 7 with 7 MutationType ops transitions: [[TemporaryIndex:{DescID: 107, IndexID: 4, ConstraintID: 4, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 4 TableID: 107 *scop.SetJobStateOnDescriptor @@ -1153,7 +1153,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[PrimaryIndex:{DescID: 107, IndexID: 3, ConstraintID: 3, TemporaryIndexID: 4, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 3 TableID: 107 PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops @@ -1195,10 +1195,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops [[IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 4}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT [[IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 4}, TRANSIENT_ABSENT], PUBLIC] -> TRANSIENT_ABSENT ops: - *scop.MakeDroppedColumnDeleteOnly + *scop.MakeWriteOnlyColumnDeleteOnly ColumnID: 3 TableID: 107 - *scop.MakeDroppedPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicPrimaryIndexWriteOnly IndexID: 1 TableID: 107 *scop.SetIndexName @@ -1206,9 +1206,9 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops Name: crdb_internal_index_1_name_placeholder TableID: 107 *scop.MarkDescriptorAsDropped - DescID: 108 + DescriptorID: 108 *scop.RemoveBackReferenceInTypes - BackReferencedDescID: 108 + BackReferencedDescriptorID: 108 TypeIDs: - 104 *scop.RemoveViewBackReferencesInRelations @@ -1229,10 +1229,10 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops IndexID: 3 Name: foo_pkey TableID: 107 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 4 TableID: 107 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 2 TableID: 107 *scop.DrainDescriptorName @@ -1241,7 +1241,7 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops DescriptorID: 108 Name: fooview SchemaID: 101 - *scop.MakeAddedPrimaryIndexPublic + *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: UserName: root @@ -1293,7 +1293,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v2 CASCADE @@ -1326,7 +1326,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1337,7 +1337,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1348,7 +1348,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -1359,7 +1359,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1370,7 +1370,7 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1381,13 +1381,13 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 4 TableID: 107 *scop.MakeIndexAbsent IndexID: 4 TableID: 107 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 1 TableID: 107 *scop.SetJobStateOnDescriptor @@ -1410,7 +1410,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 10 MutationType ops [[ColumnDefaultExpression:{DescID: 107, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 2}, ABSENT], DELETE_ONLY] -> ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v2 CASCADE @@ -1434,7 +1434,7 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 10 MutationType ops BackReferencedTableID: 107 SequenceIDs: - 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/scplan/testdata/create_index b/pkg/sql/schemachanger/scplan/testdata/create_index index 01b8be609027..1eff84f5b685 100644 --- a/pkg/sql/schemachanger/scplan/testdata/create_index +++ b/pkg/sql/schemachanger/scplan/testdata/create_index @@ -16,14 +16,14 @@ StatementPhase stage 1 of 1 with 8 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: IndexID: 2 SourceIndexID: 1 TableID: 104 TemporaryIndexID: 3 IsSecondaryIndex: true - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: IndexID: 3 SourceIndexID: 1 @@ -79,7 +79,7 @@ PostCommitPhase stage 1 of 7 with 3 MutationType ops transitions: [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 104 *scop.SetJobStateOnDescriptor @@ -139,7 +139,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 104 PostCommitNonRevertiblePhase stage 1 of 2 with 5 MutationType ops @@ -152,10 +152,10 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 5 MutationType ops IndexID: 2 Name: id1 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 104 - *scop.MakeAddedSecondaryIndexPublic + *scop.MakeValidatedSecondaryIndexPublic IndexID: 2 TableID: 104 *scop.SetJobStateOnDescriptor @@ -167,7 +167,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops transitions: [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 104 *scop.MakeIndexAbsent @@ -306,7 +306,7 @@ StatementPhase stage 1 of 1 with 8 MutationType ops [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 3}, PUBLIC], ABSENT] -> PUBLIC [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3}, PUBLIC], ABSENT] -> PUBLIC ops: - *scop.MakeAddedIndexBackfilling + *scop.MakeAbsentIndexBackfilling Index: IndexID: 2 IsConcurrently: true @@ -315,7 +315,7 @@ StatementPhase stage 1 of 1 with 8 MutationType ops TableID: 104 TemporaryIndexID: 3 IsSecondaryIndex: true - *scop.MakeAddedTempIndexDeleteOnly + *scop.MakeAbsentTempIndexDeleteOnly Index: IndexID: 3 IsConcurrently: true @@ -374,7 +374,7 @@ PostCommitPhase stage 1 of 7 with 3 MutationType ops transitions: [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1}, TRANSIENT_ABSENT], DELETE_ONLY] -> WRITE_ONLY ops: - *scop.MakeAddedIndexDeleteAndWriteOnly + *scop.MakeDeleteOnlyIndexWriteOnly IndexID: 3 TableID: 104 *scop.SetJobStateOnDescriptor @@ -434,7 +434,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op transitions: [[SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0, TemporaryIndexID: 3, SourceIndexID: 1}, PUBLIC], WRITE_ONLY] -> VALIDATED ops: - *scop.ValidateUniqueIndex + *scop.ValidateIndex IndexID: 2 TableID: 104 PostCommitNonRevertiblePhase stage 1 of 2 with 5 MutationType ops @@ -447,10 +447,10 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 5 MutationType ops IndexID: 2 Name: id1 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 3 TableID: 104 - *scop.MakeAddedSecondaryIndexPublic + *scop.MakeValidatedSecondaryIndexPublic IndexID: 2 TableID: 104 *scop.SetJobStateOnDescriptor @@ -462,7 +462,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops transitions: [[TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 0, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 3 TableID: 104 *scop.MakeIndexAbsent diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_database b/pkg/sql/schemachanger/scplan/testdata/drop_database index ced84237e312..d41cb9931156 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_database +++ b/pkg/sql/schemachanger/scplan/testdata/drop_database @@ -69,33 +69,33 @@ StatementPhase stage 1 of 1 with 14 MutationType ops [[Column:{DescID: 117, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 104 + DescriptorID: 104 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 106 + DescriptorID: 106 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 107 + DescriptorID: 107 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 110 + DescriptorID: 110 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 108 + DescriptorID: 108 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 109 + DescriptorID: 109 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 111 + DescriptorID: 111 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 112 + DescriptorID: 112 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 113 + DescriptorID: 113 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 114 + DescriptorID: 114 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 115 + DescriptorID: 115 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 116 + DescriptorID: 116 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 117 + DescriptorID: 117 PreCommitPhase stage 1 of 1 with 68 MutationType ops transitions: [[Namespace:{DescID: 104, Name: db1, ReferencedDescID: 0}, ABSENT], PUBLIC] -> ABSENT @@ -296,7 +296,7 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 104 + DescriptorID: 104 *scop.RemoveDatabaseRoleSettings DatabaseID: 104 *scop.RemoveDatabaseComment @@ -316,13 +316,13 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops SubWorkID: 1 TargetStatus: 1 *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.RemoveSchemaParent Parent: ParentDatabaseID: 104 SchemaID: 105 *scop.MarkDescriptorAsDropped - DescID: 106 + DescriptorID: 106 *scop.RemoveSchemaParent Parent: ParentDatabaseID: 104 @@ -330,11 +330,11 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops *scop.RemoveSchemaComment SchemaID: 106 *scop.MarkDescriptorAsDropped - DescID: 107 + DescriptorID: 107 *scop.RemoveAllTableComments TableID: 107 *scop.MarkDescriptorAsDropped - DescID: 110 + DescriptorID: 110 *scop.RemoveAllTableComments TableID: 110 *scop.RemoveColumnDefaultExpression @@ -346,11 +346,11 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops SequenceIDs: - 107 *scop.MarkDescriptorAsDropped - DescID: 108 + DescriptorID: 108 *scop.RemoveAllTableComments TableID: 108 *scop.MarkDescriptorAsDropped - DescID: 109 + DescriptorID: 109 *scop.RemoveAllTableComments TableID: 109 *scop.RemoveColumnDefaultExpression @@ -362,7 +362,7 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops SequenceIDs: - 108 *scop.MarkDescriptorAsDropped - DescID: 111 + DescriptorID: 111 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 111 RelationIDs: @@ -370,7 +370,7 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops *scop.RemoveAllTableComments TableID: 111 *scop.MarkDescriptorAsDropped - DescID: 112 + DescriptorID: 112 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 112 RelationIDs: @@ -378,7 +378,7 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops *scop.RemoveAllTableComments TableID: 112 *scop.MarkDescriptorAsDropped - DescID: 113 + DescriptorID: 113 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 113 RelationIDs: @@ -387,7 +387,7 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops *scop.RemoveAllTableComments TableID: 113 *scop.MarkDescriptorAsDropped - DescID: 114 + DescriptorID: 114 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 114 RelationIDs: @@ -395,13 +395,13 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops *scop.RemoveAllTableComments TableID: 114 *scop.MarkDescriptorAsDropped - DescID: 115 + DescriptorID: 115 *scop.MarkDescriptorAsDropped - DescID: 116 + DescriptorID: 116 *scop.MarkDescriptorAsDropped - DescID: 117 + DescriptorID: 117 *scop.RemoveBackReferenceInTypes - BackReferencedDescID: 117 + BackReferencedDescriptorID: 117 TypeIDs: - 115 - 116 @@ -621,7 +621,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForDatabase + *scop.CreateGCJobForDatabase DatabaseID: 104 StatementForDropJob: Statement: DROP DATABASE db1 CASCADE @@ -671,7 +671,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 3 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP DATABASE db1 CASCADE TableID: 107 @@ -688,11 +688,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 3 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP DATABASE db1 CASCADE TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -703,7 +703,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -714,7 +714,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -725,7 +725,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -736,7 +736,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -760,7 +760,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 6 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP DATABASE db1 CASCADE TableID: 108 @@ -777,11 +777,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 6 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP DATABASE db1 CASCADE TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -792,7 +792,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -803,7 +803,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -814,7 +814,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -825,7 +825,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -857,7 +857,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -868,7 +868,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 8 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -879,7 +879,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 8 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -911,7 +911,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 112 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -922,7 +922,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 9 SubWorkID: 1 TableID: 112 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -933,7 +933,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 9 SubWorkID: 1 TableID: 112 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -944,7 +944,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 9 SubWorkID: 1 TableID: 112 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -981,7 +981,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -992,7 +992,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 10 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1003,7 +1003,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 10 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1014,7 +1014,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 10 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1047,7 +1047,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1058,7 +1058,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 10 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1069,7 +1069,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 10 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1080,7 +1080,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 10 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1159,7 +1159,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 117 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1170,7 +1170,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 12 SubWorkID: 1 TableID: 117 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1181,7 +1181,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 12 SubWorkID: 1 TableID: 117 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -1192,7 +1192,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 12 SubWorkID: 1 TableID: 117 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1203,7 +1203,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops SourceElementID: 12 SubWorkID: 1 TableID: 117 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_index b/pkg/sql/schemachanger/scplan/testdata/drop_index index 005aa241bf01..e79a1914ebcc 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_index +++ b/pkg/sql/schemachanger/scplan/testdata/drop_index @@ -20,7 +20,7 @@ StatementPhase stage 1 of 1 with 2 MutationType ops [[SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0}, ABSENT], PUBLIC] -> VALIDATED [[IndexName:{DescID: 104, Name: idx1, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT ops: - *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicSecondaryIndexWriteOnly IndexID: 2 TableID: 104 *scop.SetIndexName @@ -51,7 +51,7 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 3 MutationType ops transitions: [[SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0}, ABSENT], VALIDATED] -> DELETE_ONLY ops: - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 2 TableID: 104 *scop.SetJobStateOnDescriptor @@ -78,7 +78,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 5 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: Statement: DROP INDEX defaultdb.public.t1@idx1 CASCADE @@ -143,14 +143,14 @@ StatementPhase stage 1 of 1 with 5 MutationType ops [[SecondaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 0}, ABSENT], PUBLIC] -> VALIDATED [[IndexName:{DescID: 104, Name: idx2, IndexID: 4}, ABSENT], PUBLIC] -> ABSENT ops: - *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicSecondaryIndexWriteOnly IndexID: 4 TableID: 104 *scop.SetIndexName IndexID: 4 Name: crdb_internal_index_4_name_placeholder TableID: 104 - *scop.MakeDroppedColumnDeleteAndWriteOnly + *scop.MakePublicColumnWriteOnly ColumnID: 4 TableID: 104 *scop.LogEvent @@ -198,10 +198,10 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 4 MutationType ops [[Column:{DescID: 104, ColumnID: 4}, ABSENT], WRITE_ONLY] -> DELETE_ONLY [[SecondaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 0}, ABSENT], VALIDATED] -> DELETE_ONLY ops: - *scop.MakeDroppedColumnDeleteOnly + *scop.MakeWriteOnlyColumnDeleteOnly ColumnID: 4 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 4 TableID: 104 *scop.SetJobStateOnDescriptor @@ -234,7 +234,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 7 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 4 StatementForDropJob: Statement: DROP INDEX defaultdb.public.t1@idx2 CASCADE @@ -242,7 +242,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 7 MutationType ops *scop.MakeIndexAbsent IndexID: 4 TableID: 104 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4 EventBase: Authorization: @@ -362,14 +362,14 @@ StatementPhase stage 1 of 1 with 5 MutationType ops [[SecondaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 0}, ABSENT], PUBLIC] -> VALIDATED [[IndexName:{DescID: 104, Name: idx3, IndexID: 6}, ABSENT], PUBLIC] -> ABSENT ops: - *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicSecondaryIndexWriteOnly IndexID: 6 TableID: 104 *scop.SetIndexName IndexID: 6 Name: crdb_internal_index_6_name_placeholder TableID: 104 - *scop.MakeDroppedColumnDeleteAndWriteOnly + *scop.MakePublicColumnWriteOnly ColumnID: 5 TableID: 104 *scop.LogEvent @@ -425,10 +425,10 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 4 MutationType ops [[Column:{DescID: 104, ColumnID: 5}, ABSENT], WRITE_ONLY] -> DELETE_ONLY [[SecondaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 0}, ABSENT], VALIDATED] -> DELETE_ONLY ops: - *scop.MakeDroppedColumnDeleteOnly + *scop.MakeWriteOnlyColumnDeleteOnly ColumnID: 5 TableID: 104 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 6 TableID: 104 *scop.SetJobStateOnDescriptor @@ -463,7 +463,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 6 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 6 StatementForDropJob: Statement: DROP INDEX defaultdb.public.t1@idx3 CASCADE @@ -471,7 +471,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 6 MutationType ops *scop.MakeIndexAbsent IndexID: 6 TableID: 104 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 5 EventBase: Authorization: @@ -597,7 +597,7 @@ StatementPhase stage 1 of 1 with 3 MutationType ops [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], PUBLIC] -> WRITE_ONLY [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: - *scop.MakeDroppedNonPrimaryIndexDeleteAndWriteOnly + *scop.MakePublicSecondaryIndexWriteOnly IndexID: 8 TableID: 104 *scop.SetIndexName @@ -605,7 +605,7 @@ StatementPhase stage 1 of 1 with 3 MutationType ops Name: crdb_internal_index_8_name_placeholder TableID: 104 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 PreCommitPhase stage 1 of 1 with 7 MutationType ops transitions: [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 8}, ABSENT], PUBLIC] -> ABSENT @@ -627,7 +627,7 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 105 RelationIDs: @@ -689,7 +689,7 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -700,7 +700,7 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -711,7 +711,7 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -722,7 +722,7 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeDroppedIndexDeleteOnly + *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 8 TableID: 104 *scop.SetJobStateOnDescriptor @@ -753,7 +753,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 5 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForIndex + *scop.CreateGCJobForIndex IndexID: 8 StatementForDropJob: Statement: DROP INDEX defaultdb.public.t1@idx4 CASCADE diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by index cd051ef6eed2..ec5b55ada5f0 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by +++ b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by @@ -49,23 +49,23 @@ StatementPhase stage 1 of 1 with 9 MutationType ops [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 106 + DescriptorID: 106 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 109 + DescriptorID: 109 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 107 + DescriptorID: 107 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 108 + DescriptorID: 108 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 110 + DescriptorID: 110 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 111 + DescriptorID: 111 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 112 + DescriptorID: 112 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 113 + DescriptorID: 113 PreCommitPhase stage 1 of 1 with 46 MutationType ops transitions: [[UserPrivileges:{DescID: 100, Name: r}, ABSENT], PUBLIC] -> ABSENT @@ -194,23 +194,23 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.RemoveUserPrivileges - DescID: 100 + DescriptorID: 100 User: r *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.RemoveSchemaParent Parent: ParentDatabaseID: 100 SchemaID: 105 *scop.RemoveUserPrivileges - DescID: 104 + DescriptorID: 104 User: r *scop.MarkDescriptorAsDropped - DescID: 106 + DescriptorID: 106 *scop.RemoveAllTableComments TableID: 106 *scop.MarkDescriptorAsDropped - DescID: 109 + DescriptorID: 109 *scop.RemoveAllTableComments TableID: 109 *scop.RemoveColumnDefaultExpression @@ -222,11 +222,11 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops SequenceIDs: - 106 *scop.MarkDescriptorAsDropped - DescID: 107 + DescriptorID: 107 *scop.RemoveAllTableComments TableID: 107 *scop.MarkDescriptorAsDropped - DescID: 108 + DescriptorID: 108 *scop.RemoveAllTableComments TableID: 108 *scop.RemoveColumnDefaultExpression @@ -238,7 +238,7 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops SequenceIDs: - 107 *scop.MarkDescriptorAsDropped - DescID: 110 + DescriptorID: 110 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 110 RelationIDs: @@ -246,13 +246,13 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops *scop.RemoveAllTableComments TableID: 110 *scop.MarkDescriptorAsDropped - DescID: 111 + DescriptorID: 111 *scop.MarkDescriptorAsDropped - DescID: 112 + DescriptorID: 112 *scop.MarkDescriptorAsDropped - DescID: 113 + DescriptorID: 113 *scop.RemoveBackReferenceInTypes - BackReferencedDescID: 113 + BackReferencedDescriptorID: 113 TypeIDs: - 111 - 112 @@ -430,7 +430,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP OWNED BY r TableID: 106 @@ -447,11 +447,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP OWNED BY r TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -462,7 +462,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -473,7 +473,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -484,7 +484,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -495,7 +495,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -519,7 +519,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP OWNED BY r TableID: 107 @@ -536,11 +536,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP OWNED BY r TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -551,7 +551,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -562,7 +562,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -573,7 +573,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -584,7 +584,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -616,7 +616,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -627,7 +627,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -638,7 +638,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -716,7 +716,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -727,7 +727,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -738,7 +738,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -749,7 +749,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_schema b/pkg/sql/schemachanger/scplan/testdata/drop_schema index a481861745e4..139bd0e0909c 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_schema +++ b/pkg/sql/schemachanger/scplan/testdata/drop_schema @@ -1195,25 +1195,25 @@ StatementPhase stage 1 of 1 with 10 MutationType ops [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 104 + DescriptorID: 104 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 106 + DescriptorID: 106 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 107 + DescriptorID: 107 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 108 + DescriptorID: 108 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 109 + DescriptorID: 109 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 110 + DescriptorID: 110 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 111 + DescriptorID: 111 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 112 + DescriptorID: 112 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 113 + DescriptorID: 113 PreCommitPhase stage 1 of 1 with 49 MutationType ops transitions: [[Namespace:{DescID: 104, Name: sc1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -1365,7 +1365,7 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 104 + DescriptorID: 104 *scop.RemoveSchemaParent Parent: ParentDatabaseID: 100 @@ -1373,11 +1373,11 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops *scop.RemoveSchemaComment SchemaID: 104 *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.RemoveAllTableComments TableID: 105 *scop.MarkDescriptorAsDropped - DescID: 106 + DescriptorID: 106 *scop.RemoveAllTableComments TableID: 106 *scop.RemoveColumnDefaultExpression @@ -1389,7 +1389,7 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops SequenceIDs: - 105 *scop.MarkDescriptorAsDropped - DescID: 107 + DescriptorID: 107 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 107 RelationIDs: @@ -1397,7 +1397,7 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops *scop.RemoveAllTableComments TableID: 107 *scop.MarkDescriptorAsDropped - DescID: 108 + DescriptorID: 108 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 108 RelationIDs: @@ -1405,7 +1405,7 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops *scop.RemoveAllTableComments TableID: 108 *scop.MarkDescriptorAsDropped - DescID: 109 + DescriptorID: 109 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 109 RelationIDs: @@ -1414,7 +1414,7 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops *scop.RemoveAllTableComments TableID: 109 *scop.MarkDescriptorAsDropped - DescID: 110 + DescriptorID: 110 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 110 RelationIDs: @@ -1422,13 +1422,13 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops *scop.RemoveAllTableComments TableID: 110 *scop.MarkDescriptorAsDropped - DescID: 111 + DescriptorID: 111 *scop.MarkDescriptorAsDropped - DescID: 112 + DescriptorID: 112 *scop.MarkDescriptorAsDropped - DescID: 113 + DescriptorID: 113 *scop.RemoveBackReferenceInTypes - BackReferencedDescID: 113 + BackReferencedDescriptorID: 113 TypeIDs: - 111 - 112 @@ -1620,7 +1620,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP SCHEMA defaultdb.sc1 CASCADE TableID: 105 @@ -1637,11 +1637,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP SCHEMA defaultdb.sc1 CASCADE TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1652,7 +1652,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1663,7 +1663,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -1674,7 +1674,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1685,7 +1685,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1717,7 +1717,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1728,7 +1728,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 4 SubWorkID: 1 TableID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1739,7 +1739,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 4 SubWorkID: 1 TableID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1771,7 +1771,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1782,7 +1782,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1793,7 +1793,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1804,7 +1804,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1841,7 +1841,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1852,7 +1852,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1863,7 +1863,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1874,7 +1874,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1907,7 +1907,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1918,7 +1918,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1929,7 +1929,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1940,7 +1940,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 110 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -2019,7 +2019,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -2030,7 +2030,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 8 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -2041,7 +2041,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 8 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -2052,7 +2052,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 8 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -2063,7 +2063,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 8 SubWorkID: 1 TableID: 113 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_sequence b/pkg/sql/schemachanger/scplan/testdata/drop_sequence index 67efed46df21..841cb3a95996 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_sequence +++ b/pkg/sql/schemachanger/scplan/testdata/drop_sequence @@ -10,7 +10,7 @@ StatementPhase stage 1 of 1 with 1 MutationType op [[Sequence:{DescID: 104}, ABSENT], PUBLIC] -> TXN_DROPPED ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 104 + DescriptorID: 104 PreCommitPhase stage 1 of 1 with 5 MutationType ops transitions: [[Namespace:{DescID: 104, Name: sq1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -21,7 +21,7 @@ PreCommitPhase stage 1 of 1 with 5 MutationType ops [[ObjectParent:{DescID: 104, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 104 + DescriptorID: 104 *scop.RemoveAllTableComments TableID: 104 *scop.DrainDescriptorName @@ -62,7 +62,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 4 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP SEQUENCE defaultdb.public.sq1 TableID: 104 @@ -86,7 +86,7 @@ StatementPhase stage 1 of 1 with 1 MutationType op [[Sequence:{DescID: 104}, ABSENT], PUBLIC] -> TXN_DROPPED ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 104 + DescriptorID: 104 PreCommitPhase stage 1 of 1 with 11 MutationType ops transitions: [[Namespace:{DescID: 104, Name: sq1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -99,7 +99,7 @@ PreCommitPhase stage 1 of 1 with 11 MutationType ops [[ColumnDefaultExpression:{DescID: 106, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 104 + DescriptorID: 104 *scop.RemoveAllTableComments TableID: 104 *scop.RemoveColumnDefaultExpression @@ -164,7 +164,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 6 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP SEQUENCE defaultdb.public.sq1 CASCADE TableID: 104 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_table b/pkg/sql/schemachanger/scplan/testdata/drop_table index 3c1dcaf11747..94bb98a41726 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_table +++ b/pkg/sql/schemachanger/scplan/testdata/drop_table @@ -49,11 +49,11 @@ StatementPhase stage 1 of 1 with 3 MutationType ops [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 109 + DescriptorID: 109 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 110 + DescriptorID: 110 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 111 + DescriptorID: 111 PreCommitPhase stage 1 of 1 with 32 MutationType ops transitions: [[Namespace:{DescID: 109, Name: shipments, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -134,7 +134,7 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 109 + DescriptorID: 109 *scop.RemoveAllTableComments TableID: 109 *scop.RemoveColumnDefaultExpression @@ -165,11 +165,11 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops - 107 - 108 *scop.MarkDescriptorAsDropped - DescID: 110 + DescriptorID: 110 *scop.RemoveAllTableComments TableID: 110 *scop.MarkDescriptorAsDropped - DescID: 111 + DescriptorID: 111 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 111 RelationIDs: @@ -290,11 +290,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP TABLE defaultdb.public.shipments CASCADE TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -305,7 +305,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -316,7 +316,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -327,7 +327,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4 EventBase: Authorization: @@ -338,7 +338,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 5 EventBase: Authorization: @@ -349,7 +349,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -360,7 +360,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -384,7 +384,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 2 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP TABLE defaultdb.public.shipments CASCADE TableID: 110 @@ -410,7 +410,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -421,7 +421,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -432,7 +432,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -443,7 +443,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -1223,7 +1223,7 @@ StatementPhase stage 1 of 1 with 1 MutationType op [[SecondaryIndex:{DescID: 114, IndexID: 2, ConstraintID: 0}, ABSENT], PUBLIC] -> VALIDATED ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 114 + DescriptorID: 114 PreCommitPhase stage 1 of 1 with 16 MutationType ops transitions: [[Namespace:{DescID: 114, Name: greeter, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -1264,7 +1264,7 @@ PreCommitPhase stage 1 of 1 with 16 MutationType ops [[ConstraintName:{DescID: 114, Name: check, ConstraintID: 2}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 114 + DescriptorID: 114 *scop.RemoveAllTableComments TableID: 114 *scop.RemoveColumnDefaultExpression @@ -1355,11 +1355,11 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 - *scop.CreateGcJobForTable + *scop.CreateGCJobForTable StatementForDropJob: Statement: DROP TABLE defaultdb.public.greeter TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -1370,7 +1370,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -1381,7 +1381,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -1392,7 +1392,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -1403,7 +1403,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 114 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_type b/pkg/sql/schemachanger/scplan/testdata/drop_type index b6d2a81cc2f4..08cbfe342af7 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_type +++ b/pkg/sql/schemachanger/scplan/testdata/drop_type @@ -11,9 +11,9 @@ StatementPhase stage 1 of 1 with 2 MutationType ops [[AliasType:{DescID: 105}, ABSENT], PUBLIC] -> TXN_DROPPED ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 104 + DescriptorID: 104 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 PreCommitPhase stage 1 of 1 with 7 MutationType ops transitions: [[Namespace:{DescID: 104, Name: typ, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -33,9 +33,9 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops [[ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 104 + DescriptorID: 104 *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.DrainDescriptorName Namespace: DatabaseID: 100 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_view b/pkg/sql/schemachanger/scplan/testdata/drop_view index 6e92db70c202..db0ef1c0df15 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_view +++ b/pkg/sql/schemachanger/scplan/testdata/drop_view @@ -14,7 +14,7 @@ StatementPhase stage 1 of 1 with 1 MutationType op [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 PreCommitPhase stage 1 of 1 with 7 MutationType ops transitions: [[Namespace:{DescID: 105, Name: v1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -34,7 +34,7 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 105 RelationIDs: @@ -94,7 +94,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -105,7 +105,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -116,7 +116,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -293,15 +293,15 @@ StatementPhase stage 1 of 1 with 5 MutationType ops [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], PUBLIC] -> WRITE_ONLY ops: *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 105 + DescriptorID: 105 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 106 + DescriptorID: 106 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 107 + DescriptorID: 107 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 108 + DescriptorID: 108 *scop.MarkDescriptorAsSyntheticallyDropped - DescID: 111 + DescriptorID: 111 PreCommitPhase stage 1 of 1 with 30 MutationType ops transitions: [[Namespace:{DescID: 105, Name: v1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -396,7 +396,7 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: *scop.MarkDescriptorAsDropped - DescID: 105 + DescriptorID: 105 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 105 RelationIDs: @@ -404,7 +404,7 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops *scop.RemoveAllTableComments TableID: 105 *scop.MarkDescriptorAsDropped - DescID: 106 + DescriptorID: 106 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 106 RelationIDs: @@ -412,7 +412,7 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops *scop.RemoveAllTableComments TableID: 106 *scop.MarkDescriptorAsDropped - DescID: 107 + DescriptorID: 107 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 107 RelationIDs: @@ -421,7 +421,7 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops *scop.RemoveAllTableComments TableID: 107 *scop.MarkDescriptorAsDropped - DescID: 108 + DescriptorID: 108 *scop.RemoveViewBackReferencesInRelations BackReferencedViewID: 108 RelationIDs: @@ -429,9 +429,9 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops *scop.RemoveAllTableComments TableID: 108 *scop.MarkDescriptorAsDropped - DescID: 111 + DescriptorID: 111 *scop.RemoveBackReferenceInTypes - BackReferencedDescID: 111 + BackReferencedDescriptorID: 111 TypeIDs: - 109 - 110 @@ -564,7 +564,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -575,7 +575,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -586,7 +586,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 105 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -618,7 +618,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -629,7 +629,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -640,7 +640,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -651,7 +651,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -688,7 +688,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -699,7 +699,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -710,7 +710,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -721,7 +721,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 107 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -754,7 +754,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -765,7 +765,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -776,7 +776,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -787,7 +787,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 3 SubWorkID: 1 TableID: 108 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: @@ -823,7 +823,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: Authorization: @@ -834,7 +834,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: Authorization: @@ -845,7 +845,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 3 EventBase: Authorization: @@ -856,7 +856,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: Authorization: @@ -867,7 +867,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 111 - *scop.MakeColumnAbsent + *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: Authorization: diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column b/pkg/sql/schemachanger/testdata/end_to_end/add_column index ab20b62439f7..04c51d81152e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column @@ -165,14 +165,14 @@ upsert descriptor #106 direction: ADD mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: tbl nextColumnId: 3 ... @@ -255,7 +255,7 @@ upsert descriptor #106 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -309,7 +309,7 @@ upsert descriptor #106 - width: 64 - direction: ADD - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + - direction: DROP index: @@ -336,7 +336,7 @@ upsert descriptor #106 + useDeletePreservingEncoding: true version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -443,7 +443,7 @@ upsert descriptor #106 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: tbl nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq index d1bec674bd05..9103a25af50e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq @@ -202,14 +202,14 @@ upsert descriptor #106 direction: ADD mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: tbl nextColumnId: 3 ... @@ -334,7 +334,7 @@ upsert descriptor #106 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -406,7 +406,7 @@ upsert descriptor #106 - - 107 - direction: ADD - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + - direction: DROP index: @@ -433,7 +433,7 @@ upsert descriptor #106 + useDeletePreservingEncoding: true version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -560,7 +560,7 @@ upsert descriptor #106 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: tbl nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default b/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default index 79d79e65665a..419eb390112d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default @@ -112,7 +112,7 @@ upsert descriptor #106 direction: ADD mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: tbl nextColumnId: 3 ... @@ -170,7 +170,7 @@ upsert descriptor #106 - width: 64 - direction: ADD - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + modificationTime: {} + mutations: [] name: tbl diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid index 9ab24a581906..1e93abc20057 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid @@ -51,7 +51,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -196,7 +196,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -279,7 +279,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -471,7 +471,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -554,7 +554,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: DROP index: ... @@ -588,7 +588,7 @@ upsert descriptor #104 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -597,14 +597,14 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - direction: ADD index: ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -613,7 +613,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 @@ -685,7 +685,7 @@ upsert descriptor #104 - unique: true - version: 4 - mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY - - direction: DROP - index: - constraintId: 1 @@ -785,7 +785,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid index 87ce6615d109..b4c8f6f24b3b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid @@ -51,7 +51,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -197,7 +197,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -280,7 +280,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -472,7 +472,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -555,7 +555,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: DROP index: ... @@ -589,7 +589,7 @@ upsert descriptor #104 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -598,14 +598,14 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - direction: ADD index: ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -614,7 +614,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 @@ -686,7 +686,7 @@ upsert descriptor #104 - unique: true - version: 4 - mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY - - direction: DROP - index: - constraintId: 1 @@ -786,7 +786,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla index 378c0d475991..8de318794184 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla @@ -186,14 +186,14 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -290,14 +290,14 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -376,7 +376,7 @@ upsert descriptor #104 - unique: true - version: 4 - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD - index: constraintId: 3 @@ -384,7 +384,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -411,7 +411,7 @@ upsert descriptor #104 + useDeletePreservingEncoding: true version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -554,7 +554,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index b/pkg/sql/schemachanger/testdata/end_to_end/create_index index ab51fbe77d5c..8d54ef7a3fb1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index @@ -128,7 +128,7 @@ upsert descriptor #106 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -211,7 +211,7 @@ upsert descriptor #106 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -284,7 +284,7 @@ upsert descriptor #106 - storeColumnNames: [] - version: 4 - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD - index: - createdExplicitly: true @@ -295,7 +295,7 @@ upsert descriptor #106 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic index f26866b0f1a2..c6894d888391 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic @@ -49,7 +49,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -165,7 +165,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -248,7 +248,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -282,7 +282,7 @@ upsert descriptor #104 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -309,7 +309,7 @@ upsert descriptor #104 + useDeletePreservingEncoding: true version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -416,7 +416,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index index 5543f85fa582..1d5874cc6681 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index @@ -78,7 +78,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: DROP + index: + createdAtNanos: "1640995200000000000" @@ -99,7 +99,7 @@ upsert descriptor #104 + sharded: {} + version: 3 + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -160,7 +160,7 @@ upsert descriptor #104 + virtual: true + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 4 - nextConstraintId: 2 @@ -229,7 +229,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - column: computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 ... @@ -312,7 +312,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -346,14 +346,14 @@ upsert descriptor #104 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - direction: DROP index: ... version: 3 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -378,7 +378,7 @@ upsert descriptor #104 - unique: true - version: 4 - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD - index: constraintId: 3 @@ -386,7 +386,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - column: computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 @@ -419,7 +419,7 @@ upsert descriptor #104 + unique: true + version: 4 + mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY name: t ... parentId: 100 @@ -531,7 +531,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 4 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements index 71283a557fb3..ea226a075349 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements @@ -87,7 +87,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: DROP + index: + createdAtNanos: "1640995200000000000" @@ -111,7 +111,7 @@ upsert descriptor #104 + sharded: {} + version: 3 + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -178,7 +178,7 @@ upsert descriptor #104 + virtual: true + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 5 - nextConstraintId: 2 @@ -253,7 +253,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - column: computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 ... @@ -336,7 +336,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -387,7 +387,7 @@ upsert descriptor #104 + useDeletePreservingEncoding: true version: 4 mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY - - direction: ADD + - column: + computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 @@ -402,7 +402,7 @@ upsert descriptor #104 + virtual: true + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: DROP index: - constraintId: 3 @@ -433,7 +433,7 @@ upsert descriptor #104 - useDeletePreservingEncoding: true version: 4 mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY - - column: - computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 - id: 4 @@ -470,7 +470,7 @@ upsert descriptor #104 + unique: true + version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: BACKFILLING + - direction: ADD + index: @@ -549,7 +549,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 5 ... @@ -632,7 +632,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -689,14 +689,14 @@ upsert descriptor #104 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - direction: DROP index: ... version: 3 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -705,21 +705,21 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - column: computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - direction: DROP index: ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -746,7 +746,7 @@ upsert descriptor #104 - unique: true - version: 4 - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD - index: - constraintId: 4 @@ -758,7 +758,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 5 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index index 7ca5f308c4ca..0d5a693b41a4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index @@ -55,7 +55,7 @@ upsert descriptor #106 + oid: 1700 + direction: DROP + mutationId: 3 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 5 @@ -181,7 +181,7 @@ upsert descriptor #106 version: 4 mutationId: 3 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: test nextColumnId: 5 ... @@ -264,7 +264,7 @@ upsert descriptor #106 version: 4 mutationId: 3 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -298,7 +298,7 @@ upsert descriptor #106 ... direction: DROP mutationId: 3 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -326,7 +326,7 @@ upsert descriptor #106 + useDeletePreservingEncoding: true version: 4 mutationId: 3 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -441,7 +441,7 @@ upsert descriptor #106 ... version: 4 mutationId: 3 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: test nextColumnId: 5 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index index cf400561388a..22cfb788c0a7 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index @@ -78,7 +78,7 @@ upsert descriptor #104 + sharded: {} + version: 3 + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -136,7 +136,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 - nextConstraintId: 2 @@ -204,7 +204,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - column: id: 2 ... @@ -287,7 +287,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -321,7 +321,7 @@ upsert descriptor #104 ... version: 3 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -348,7 +348,7 @@ upsert descriptor #104 + useDeletePreservingEncoding: true version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - column: @@ -391,7 +391,7 @@ upsert descriptor #104 - useDeletePreservingEncoding: true version: 4 mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY - - column: - id: 2 - name: crdb_internal_column_2_name_placeholder @@ -402,7 +402,7 @@ upsert descriptor #104 - width: 64 - direction: DROP - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -497,7 +497,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index index 389bc04a8604..53877c5ad4fd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index @@ -102,7 +102,7 @@ upsert descriptor #104 + shardBuckets: 16 + version: 3 + mutationId: 2 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - column: + computeExpr: mod(fnv32(crdb_internal.datums_to_bytes(j)), 16:::INT8) + hidden: true @@ -115,7 +115,7 @@ upsert descriptor #104 + virtual: true + direction: DROP + mutationId: 2 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 4 ... @@ -180,14 +180,14 @@ upsert descriptor #104 ... version: 3 mutationId: 2 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - column: computeExpr: mod(fnv32(crdb_internal.datums_to_bytes(j)), 16:::INT8) ... direction: DROP mutationId: 2 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 4 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index index ad519d079dc0..85df741c68e4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index @@ -78,7 +78,7 @@ upsert descriptor #104 + sharded: {} + version: 3 + mutationId: 2 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - column: + computeExpr: lower(j) + id: 3 @@ -91,7 +91,7 @@ upsert descriptor #104 + virtual: true + direction: DROP + mutationId: 2 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 4 ... @@ -143,14 +143,14 @@ upsert descriptor #104 ... version: 3 mutationId: 2 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - column: computeExpr: lower(j) ... direction: DROP mutationId: 2 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 4 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index index 387561e41160..262f097e935c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index @@ -62,7 +62,7 @@ upsert descriptor #104 + sharded: {} + version: 3 + mutationId: 2 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 3 ... @@ -114,7 +114,7 @@ upsert descriptor #104 ... version: 3 mutationId: 2 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 3 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements index a9dc620595b2..49654b76d084 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements @@ -87,7 +87,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: DROP + index: + createdAtNanos: "1640995200000000000" @@ -111,7 +111,7 @@ upsert descriptor #104 + sharded: {} + version: 3 + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY + - direction: ADD + index: + constraintId: 2 @@ -178,7 +178,7 @@ upsert descriptor #104 + virtual: true + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 5 - nextConstraintId: 2 @@ -250,7 +250,7 @@ upsert descriptor #104 useDeletePreservingEncoding: true ... mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY + - column: + defaultExpr: 32:::INT8 + id: 3 @@ -263,7 +263,7 @@ upsert descriptor #104 + width: 64 + direction: DROP + mutationId: 1 - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY name: t nextColumnId: 5 ... @@ -325,7 +325,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: DELETE_ONLY - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - column: computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 ... @@ -408,7 +408,7 @@ upsert descriptor #104 version: 4 mutationId: 1 - state: MERGING - + state: DELETE_AND_WRITE_ONLY + + state: WRITE_ONLY - direction: ADD index: ... @@ -442,14 +442,14 @@ upsert descriptor #104 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - direction: DROP index: ... version: 3 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD + state: DELETE_ONLY + - direction: DROP @@ -477,7 +477,7 @@ upsert descriptor #104 - unique: true - version: 4 - mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY - - direction: ADD - index: constraintId: 3 @@ -485,14 +485,14 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - column: computeExpr: crdb_internal_column_2_name_placeholder + 1:::INT8 ... direction: DROP mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY - column: defaultExpr: 32:::INT8 @@ -527,7 +527,7 @@ upsert descriptor #104 + unique: true + version: 4 + mutationId: 1 - state: DELETE_AND_WRITE_ONLY + state: WRITE_ONLY name: t ... parentId: 100 @@ -649,7 +649,7 @@ upsert descriptor #104 ... version: 4 mutationId: 1 - - state: DELETE_AND_WRITE_ONLY + - state: WRITE_ONLY + state: DELETE_ONLY name: t nextColumnId: 5 diff --git a/pkg/sql/schemachanger/testdata/explain/add_column b/pkg/sql/schemachanger/testdata/explain/add_column index f1e6b5c6c41c..9105b77c5b89 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column +++ b/pkg/sql/schemachanger/testdata/explain/add_column @@ -22,15 +22,15 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── ABSENT → PUBLIC IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 11 Mutation operations - │ ├── MakeAddedColumnDeleteOnly {"Column":{"ColumnID":2,"PgAttributeNum":2,"TableID":106}} + │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":2,"PgAttributeNum":2,"TableID":106}} │ ├── LogEvent {"TargetStatus":2} │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":106} │ ├── SetAddedColumnType {"ColumnType":{"ColumnID":2,"TableID":106}} │ ├── AddColumnDefaultExpression {"Default":{"ColumnID":2,"TableID":106}} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":106,"TemporaryIndexID":3}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":106,"TemporaryIndexID":3}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":2,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":2,"Kind":2,"TableID":106} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":106}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":106}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":106} │ └── AddColumnToIndex {"ColumnID":2,"IndexID":3,"Kind":2,"TableID":106} ├── PreCommitPhase @@ -45,8 +45,8 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── 4 Mutation operations - │ │ ├── MakeAddedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":106} - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":106} + │ │ ├── MakeDeleteOnlyColumnWriteOnly {"ColumnID":2,"TableID":106} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":106} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -84,7 +84,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":2,"TableID":106} + │ └── ValidateIndex {"IndexID":2,"TableID":106} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC @@ -100,12 +100,12 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 106, Name: tbl_pkey, IndexID: 1} │ └── 9 Mutation operations - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":106} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":106} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":106} │ ├── SetIndexName {"IndexID":2,"Name":"tbl_pkey","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":2,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":106} │ ├── RefreshStats {"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -115,16 +115,16 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── 1 element transitioning toward ABSENT │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} │ └── 5 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":106} ├── MakeIndexAbsent {"IndexID":1,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 index 9fcc38ef9c95..2f5b4fb68158 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 @@ -23,11 +23,11 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} └── 9 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 index 8c47ebd7e963..b2f90cb881ab 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,8 +35,8 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 index 0a19568d539a..191aa4fa60b1 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,8 +35,8 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 index 989f2e55c190..656373f7dacb 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,8 +35,8 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 index dcda26a91ca0..164affbcff73 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -34,11 +34,11 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 8 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 index 9ef86308f945..200503617a73 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -34,11 +34,11 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 8 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 index 7001fc6562c3..9cf07025c4c1 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -34,11 +34,11 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 8 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq index 0a65a6e55a61..8dea6a076330 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq @@ -22,16 +22,16 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── ABSENT → PUBLIC IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 12 Mutation operations - │ ├── MakeAddedColumnDeleteOnly {"Column":{"ColumnID":2,"PgAttributeNum":2,"TableID":106}} + │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":2,"PgAttributeNum":2,"TableID":106}} │ ├── LogEvent {"TargetStatus":2} │ ├── SetColumnName {"ColumnID":2,"Name":"l","TableID":106} │ ├── SetAddedColumnType {"ColumnType":{"ColumnID":2,"TableID":106}} │ ├── AddColumnDefaultExpression {"Default":{"ColumnID":2,"TableID":106}} │ ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":106,"TemporaryIndexID":3}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":106,"TemporaryIndexID":3}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":2,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":2,"Kind":2,"TableID":106} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":106}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":106}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":106} │ └── AddColumnToIndex {"ColumnID":2,"IndexID":3,"Kind":2,"TableID":106} ├── PreCommitPhase @@ -47,8 +47,8 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── 5 Mutation operations - │ │ ├── MakeAddedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":106} - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":106} + │ │ ├── MakeDeleteOnlyColumnWriteOnly {"ColumnID":2,"TableID":106} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":106} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":107} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} @@ -90,7 +90,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":2,"TableID":106} + │ └── ValidateIndex {"IndexID":2,"TableID":106} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC @@ -106,12 +106,12 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 106, Name: tbl_pkey, IndexID: 1} │ └── 10 Mutation operations - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":106} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":106} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":106} │ ├── SetIndexName {"IndexID":2,"Name":"tbl_pkey","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":2,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":106} │ ├── RefreshStats {"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} @@ -122,9 +122,9 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── 1 element transitioning toward ABSENT │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} │ └── 6 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -132,7 +132,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} └── 5 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":106} ├── MakeIndexAbsent {"IndexID":1,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 index 956b45abd38b..b924f221d388 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 @@ -23,13 +23,13 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} └── 11 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 index 7f7ebf49ab23..b4653c6fae11 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 8 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} @@ -37,9 +37,9 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO └── 8 Mutation operations ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 index b5cde4b28f7f..8e53df93b1aa 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 8 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} @@ -37,9 +37,9 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO └── 8 Mutation operations ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 index 446b4004875f..696c274cd29b 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 8 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} @@ -37,9 +37,9 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO └── 8 Mutation operations ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 index ee85ad0b8e76..d19920d0efc4 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,13 +35,13 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 10 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 index f164087de2ea..2481eb52d733 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,13 +35,13 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 10 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 index 9c8bc0b98e97..e7cc09a12057 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 @@ -20,10 +20,10 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":107} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,13 +35,13 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 10 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106} ├── UpdateBackReferencesInSequences {"BackReferencedColumnID":2,"BackReferencedTableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_no_default b/pkg/sql/schemachanger/testdata/explain/add_column_no_default index 0064148ca50e..4067a4db68cb 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/explain/add_column_no_default @@ -14,7 +14,7 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ │ ├── ABSENT → PUBLIC ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 2} │ │ └── ABSENT → PUBLIC IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 1} │ └── 5 Mutation operations - │ ├── MakeAddedColumnDeleteOnly {"Column":{"ColumnID":2,"PgAttributeNum":2,"TableID":106}} + │ ├── MakeAbsentColumnDeleteOnly {"Column":{"ColumnID":2,"PgAttributeNum":2,"TableID":106}} │ ├── LogEvent {"TargetStatus":2} │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":106} │ ├── SetAddedColumnType {"ColumnType":{"ColumnID":2,"IsNullable":true,"TableID":106}} @@ -29,14 +29,14 @@ Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN │ ├── 1 element transitioning toward PUBLIC │ │ └── DELETE_ONLY → WRITE_ONLY Column:{DescID: 106, ColumnID: 2} │ └── 3 Mutation operations - │ ├── MakeAddedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeDeleteOnlyColumnWriteOnly {"ColumnID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} └── Stage 2 of 2 in PostCommitPhase ├── 1 element transitioning toward PUBLIC │ └── WRITE_ONLY → PUBLIC Column:{DescID: 106, ColumnID: 2} └── 4 Mutation operations - ├── MakeColumnPublic {"ColumnID":2,"TableID":106} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":106} ├── RefreshStats {"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_2 index 2005f9b422c8..f362df720ed1 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_2 @@ -17,6 +17,6 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO └── 5 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} ├── RemoveColumnFromIndex {"ColumnID":2,"IndexID":1,"Kind":2,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_2_of_2 index b28939b8c237..d840d589dfa3 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_2_of_2 @@ -14,7 +14,7 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 106, Name: j, ColumnID: 2} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 1} │ └── 5 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":106} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":106} │ ├── RemoveColumnFromIndex {"ColumnID":2,"IndexID":1,"Kind":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} @@ -24,6 +24,6 @@ Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD CO │ ├── DELETE_ONLY → ABSENT Column:{DescID: 106, ColumnID: 2} │ └── PUBLIC → ABSENT ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 2} └── 3 Mutation operations - ├── MakeColumnAbsent {"ColumnID":2,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid index 699fa4ad4906..31ddcb4f05b3 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid @@ -21,16 +21,16 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 104, ColumnID: 2} │ │ └── PUBLIC → ABSENT ColumnName:{DescID: 104, Name: rowid, ColumnID: 2} │ └── 11 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":2,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":2,"Kind":2,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":3,"Kind":2,"TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":4,"IndexID":4,"IsUnique":true,"SourceIndexID":2,"TableID":104,"TemporaryIndexID":5}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":4,"IndexID":4,"IsUnique":true,"SourceIndexID":2,"TableID":104,"TemporaryIndexID":5}} │ └── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase @@ -42,7 +42,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 15 in PostCommitPhase @@ -80,7 +80,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ │ └── 1 Validation operation - │ │ └── ValidateUniqueIndex {"IndexID":2,"TableID":104} + │ │ └── ValidateIndex {"IndexID":2,"TableID":104} │ ├── Stage 8 of 15 in PostCommitPhase │ │ ├── 4 elements transitioning toward TRANSIENT_ABSENT │ │ │ ├── VALIDATED → PUBLIC PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} @@ -91,11 +91,11 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_pkey, IndexID: 1} │ │ └── 8 Mutation operations - │ │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ │ ├── SetIndexName {"IndexID":2,"Name":"t_pkey","TableID":104} - │ │ ├── MakeAddedPrimaryIndexPublic {"IndexID":2,"TableID":104} - │ │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":5,"IndexID":5,"IsUnique":true,"SourceIndexID":2,"TableID":104}} + │ │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":2,"TableID":104} + │ │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":5,"IndexID":5,"IsUnique":true,"SourceIndexID":2,"TableID":104}} │ │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":5,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} @@ -103,7 +103,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":5,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":5,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 10 of 15 in PostCommitPhase @@ -141,7 +141,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":4,"TableID":104} + │ └── ValidateIndex {"IndexID":4,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 4 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward TRANSIENT_ABSENT @@ -156,10 +156,10 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 1} │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── 6 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 4 in PostCommitNonRevertiblePhase @@ -176,23 +176,23 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ ├── 1 element transitioning toward ABSENT │ │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── 12 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":4,"Name":"t_pkey","TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 3 of 4 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ └── TRANSIENT_VALIDATED → TRANSIENT_DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 3 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 4 of 4 in PostCommitNonRevertiblePhase @@ -203,9 +203,9 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIM │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 104, ColumnID: 2} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 index dcf6e419254f..5efeadfcea6b 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 13 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,18 +45,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 index 7d488a0dc02e..3c2b26f07337 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 13 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,18 +45,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 index 724ca94809c9..0bdc1330f9a8 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 13 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,18 +45,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 index 0800421b8fb1..228fb39e5c44 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 12 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -45,20 +45,20 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 9 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 index d411a2b51f96..650f4b32dae0 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 12 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -45,20 +45,20 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 9 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 index 6fb93b6f078e..1df60a1c266a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 12 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -45,20 +45,20 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 9 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 index 3e2316912c76..7d4cde266e5a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 @@ -22,13 +22,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} └── 11 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 index 864bea701966..47ec29143b97 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,7 +35,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 index 84035dd0ab55..6af03e62fa3f 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,7 +35,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 index 2391459261fb..9802c4f30d60 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,7 +35,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 index eba9610c63f1..8a5cc3d0f3e7 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 index 7d052cfd47a3..9f2d5f866385 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 index 8437d7e65490..89f78a9f94e1 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 index 3c3821ec75c8..5897f18ae988 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 index 6f9c0458f7ef..fc5d0168ee67 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 @@ -28,15 +28,15 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 14 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,16 +45,16 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ └── 5 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid index 2d5f406816a5..c0825f76872e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid @@ -21,16 +21,16 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 104, ColumnID: 2} │ │ └── PUBLIC → ABSENT ColumnName:{DescID: 104, Name: rowid, ColumnID: 2} │ └── 11 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":2,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":2,"Kind":2,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":3,"Kind":2,"TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":4,"IndexID":4,"IsUnique":true,"SourceIndexID":2,"TableID":104,"TemporaryIndexID":5}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":4,"IndexID":4,"IsUnique":true,"SourceIndexID":2,"TableID":104,"TemporaryIndexID":5}} │ └── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase @@ -42,7 +42,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 15 in PostCommitPhase @@ -80,7 +80,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ │ └── 1 Validation operation - │ │ └── ValidateUniqueIndex {"IndexID":2,"TableID":104} + │ │ └── ValidateIndex {"IndexID":2,"TableID":104} │ ├── Stage 8 of 15 in PostCommitPhase │ │ ├── 4 elements transitioning toward TRANSIENT_ABSENT │ │ │ ├── VALIDATED → PUBLIC PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} @@ -91,11 +91,11 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_pkey, IndexID: 1} │ │ └── 8 Mutation operations - │ │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ │ ├── SetIndexName {"IndexID":2,"Name":"t_pkey","TableID":104} - │ │ ├── MakeAddedPrimaryIndexPublic {"IndexID":2,"TableID":104} - │ │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":5,"IndexID":5,"IsUnique":true,"SourceIndexID":2,"TableID":104}} + │ │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":2,"TableID":104} + │ │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":5,"IndexID":5,"IsUnique":true,"SourceIndexID":2,"TableID":104}} │ │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":5,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} @@ -103,7 +103,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":5,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":5,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 10 of 15 in PostCommitPhase @@ -141,7 +141,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":4,"TableID":104} + │ └── ValidateIndex {"IndexID":4,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 4 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward TRANSIENT_ABSENT @@ -156,10 +156,10 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 1} │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── 6 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 4 in PostCommitNonRevertiblePhase @@ -176,23 +176,23 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ ├── 1 element transitioning toward ABSENT │ │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── 12 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":4,"Name":"t_pkey","TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 3 of 4 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ └── TRANSIENT_VALIDATED → TRANSIENT_DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 3 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 4 of 4 in PostCommitNonRevertiblePhase @@ -203,9 +203,9 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 104, ColumnID: 2} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 index f38ef0cecc0e..a06250b28f1d 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 13 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,18 +45,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 index a40dae5a7158..866a43b36fb5 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 13 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,18 +45,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 index 6a3a0e29375f..fd86bc7030d6 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 13 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,18 +45,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 index cf5af53d3257..94193f01dd8e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 12 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -45,20 +45,20 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 9 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 index 93c010e5002c..bad78fcd3b4d 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 12 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -45,20 +45,20 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 9 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 index d6e8eb2166e7..ab94d2e61e40 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 12 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -45,20 +45,20 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 2} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 2} │ └── 9 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 index ff686b4b1338..4b6654994359 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 @@ -22,13 +22,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} └── 11 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 index 770f9d5416d4..e5edb98fb372 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,7 +35,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 index 376ff31bfd55..9c2402cb9326 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,7 +35,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 index 306a06bd733c..50e9cb2e3eab 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,7 +35,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 index dc9fc66d1bf8..2712ca04b4fc 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 index bb5926696a3e..2b8234981a1b 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 index 2fdbc227bb6d..0552df459ffc 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 index 15249b2aecaf..6c6a59d3f752 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 @@ -22,11 +22,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4} │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -35,9 +35,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 index 7cf601bfead8..77fbfec60dc3 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 @@ -28,15 +28,15 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ └── 14 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"rowid","TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -45,16 +45,16 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ └── 5 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla index f31df76f632b..26ffdac14db4 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla @@ -22,14 +22,14 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── ABSENT → PUBLIC IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ │ └── ABSENT → DELETE_ONLY TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} │ └── 12 Mutation operations - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":2,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":2,"Kind":2,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":3,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"Kind":2,"TableID":104} - │ ├── MakeAddedIndexBackfilling {"IsSecondaryIndex":true} - │ ├── MakeAddedTempIndexDeleteOnly {"IsSecondaryIndex":true} + │ ├── MakeAbsentIndexBackfilling {"IsSecondaryIndex":true} + │ ├── MakeAbsentTempIndexDeleteOnly {"IsSecondaryIndex":true} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":5,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":4,"Kind":1,"TableID":104} @@ -45,8 +45,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ │ ├── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} │ │ └── 4 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":5,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":5,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -95,8 +95,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ │ └── WRITE_ONLY → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 1} │ └── 2 Validation operations - │ ├── ValidateUniqueIndex {"IndexID":2,"TableID":104} - │ └── ValidateUniqueIndex {"IndexID":4,"TableID":104} + │ ├── ValidateIndex {"IndexID":2,"TableID":104} + │ └── ValidateIndex {"IndexID":4,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC @@ -115,14 +115,14 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_pkey, IndexID: 1} │ └── 10 Mutation operations - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} │ ├── SetIndexName {"IndexID":4,"Name":"t_i_key","TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":4,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -132,18 +132,18 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PR │ ├── 1 element transitioning toward ABSENT │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 index 0050550107ac..9a1d1f281042 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 @@ -22,14 +22,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} └── 11 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 index 08741c5e1573..08a04005c39a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} │ └── 9 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,9 +36,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 index a477b89983cb..623d1e3d3fea 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} │ └── 9 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,9 +36,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 index 3e97d46c591b..458f6bfef400 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 @@ -22,12 +22,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} │ └── 9 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,9 +36,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 index d7d214061585..52c9491f65c7 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 @@ -22,10 +22,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -35,14 +35,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} └── 11 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 index a0612068f966..bda8574bcc35 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 @@ -22,10 +22,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -35,14 +35,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} └── 11 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 index 0bbf403f591c..570054f353fc 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 @@ -22,10 +22,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -35,14 +35,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› A │ ├── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 4, TemporaryIndexID: 5, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 5, SourceIndexID: 1} └── 11 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} ├── MakeIndexAbsent {"IndexID":5,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index b/pkg/sql/schemachanger/testdata/explain/create_index index 4dc8636fa310..ba275601e64d 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index +++ b/pkg/sql/schemachanger/testdata/explain/create_index @@ -17,8 +17,8 @@ Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›. │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ └── ABSENT → DELETE_ONLY TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} │ └── 6 Mutation operations - │ ├── MakeAddedIndexBackfilling {"IsSecondaryIndex":true} - │ ├── MakeAddedTempIndexDeleteOnly {"IsSecondaryIndex":true} + │ ├── MakeAbsentIndexBackfilling {"IsSecondaryIndex":true} + │ ├── MakeAbsentTempIndexDeleteOnly {"IsSecondaryIndex":true} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":3,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"Kind":1,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":2,"TableID":106} @@ -33,7 +33,7 @@ Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›. │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":106} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":106} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -71,7 +71,7 @@ Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›. │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED SecondaryIndex:{DescID: 106, IndexID: 2, ConstraintID: 0, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":2,"TableID":106} + │ └── ValidateIndex {"IndexID":2,"TableID":106} └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -81,15 +81,15 @@ Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›. │ │ └── WRITE_ONLY → TRANSIENT_DELETE_ONLY TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} │ └── 5 Mutation operations │ ├── SetIndexName {"IndexID":2,"Name":"idx1","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward TRANSIENT_ABSENT │ └── TRANSIENT_DELETE_ONLY → TRANSIENT_ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 index 475b000a707a..ee1843b3c524 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 @@ -18,9 +18,9 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 index 061f15d2e6b3..7d8e79fcbaf0 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 @@ -17,9 +17,9 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -27,7 +27,7 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 index 518ff1d8e3a6..af52ecf9918b 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 @@ -17,9 +17,9 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ └── 6 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -27,7 +27,7 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 index 4e86e70c0732..7882bedda2d8 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 @@ -18,16 +18,16 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ └── 6 Mutation operations │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 index 0e190f923859..c20315b92511 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 @@ -17,8 +17,8 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ └── 4 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -27,9 +27,9 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 index bec7a0c33b67..33bc871422db 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 @@ -17,8 +17,8 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ └── 4 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -27,9 +27,9 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 index 94cfaec315ae..78e7f2e8d81c 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 @@ -17,8 +17,8 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 3} │ └── 4 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -27,9 +27,9 @@ Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.p │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 3, ConstraintID: 0, SourceIndexID: 1} └── 7 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":106} ├── MakeIndexAbsent {"IndexID":2,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":106} ├── MakeIndexAbsent {"IndexID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic b/pkg/sql/schemachanger/testdata/explain/drop_column_basic index 7fcfa3ebcd54..dc4d929c2e1d 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic @@ -17,12 +17,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 104, ColumnID: 2} │ │ └── PUBLIC → ABSENT ColumnName:{DescID: 104, Name: j, ColumnID: 2} │ └── 7 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":2,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":3}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":2,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ └── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase @@ -34,7 +34,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":3,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -72,7 +72,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":2,"TableID":104} + │ └── ValidateIndex {"IndexID":2,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -88,12 +88,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_pkey, IndexID: 1} │ └── 8 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -102,9 +102,9 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward ABSENT │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── 5 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -113,8 +113,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 5 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 index d9f1893ae57c..45cb2eba1439 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 @@ -18,11 +18,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} └── 9 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 index 0e850b79dd7b..835248b8a2ed 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 @@ -18,10 +18,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ └── 8 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -29,7 +29,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 index cf65e3b830ce..43742b9b67c6 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 @@ -18,10 +18,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ └── 8 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -29,7 +29,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 index d9ff3c6936b8..859882bed204 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 @@ -18,10 +18,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ └── 8 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -29,7 +29,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 index 01fac955a805..fba4e91a00e8 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 @@ -18,10 +18,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ └── 7 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -29,9 +29,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 index 173baf41cb86..8bd17a041426 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 @@ -18,10 +18,10 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ └── 7 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -29,9 +29,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 index 17bddbf91798..e173d3c110db 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 @@ -18,9 +18,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 3} │ └── 7 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -29,9 +29,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 2, TemporaryIndexID: 3, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index index 466d17fe5db7..f15910a88307 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index @@ -21,16 +21,16 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_expr_idx, IndexID: 2} │ └── 12 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":3,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":3,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -43,7 +43,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":4,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":4,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -81,7 +81,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":3,"TableID":104} + │ └── ValidateIndex {"IndexID":3,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -101,14 +101,14 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 10 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":3,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -121,12 +121,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 9 Mutation operations │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} - │ ├── MakeColumnAbsent {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -135,8 +135,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 5 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 index 77ad6b95fc79..747eacecba25 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 @@ -24,14 +24,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 index d3394699f993..1868b28e7210 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 @@ -24,13 +24,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -38,7 +38,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 index 1ed91bb75392..d1b0d97de56a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 @@ -24,13 +24,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -38,7 +38,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 index 8c9b172f19b4..254cc362110a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 @@ -24,13 +24,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -38,7 +38,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 index 4adec81d213d..fc39b2e49c11 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 @@ -24,13 +24,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -38,9 +38,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 index c8d92c0f1ab3..ae877a0160ac 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 @@ -24,13 +24,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -38,9 +38,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 index b92da02f8e93..6accf2f355fe 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 @@ -24,13 +24,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -38,9 +38,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 index 5cbdad9c669c..fb75890fb520 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 @@ -37,18 +37,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -58,18 +58,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 index fee9233e15b8..c026af7b4902 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 @@ -37,18 +37,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -58,18 +58,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 index de6838d073cf..bd84e198a149 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 @@ -37,19 +37,19 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -58,18 +58,18 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ └── 7 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 index db5c071e49b2..ef8b7e744e42 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 @@ -37,17 +37,17 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -57,21 +57,21 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 4, TemporaryIndexID: 6, SourceIndexID: 3} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ └── 10 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 index ffc1eac14ccc..685894631194 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 @@ -37,17 +37,17 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -57,21 +57,21 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 4, TemporaryIndexID: 6, SourceIndexID: 3} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ └── 10 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 index 55c9c82ecccd..4a6bc35a77b3 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 @@ -37,17 +37,17 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -57,21 +57,21 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 4, TemporaryIndexID: 6, SourceIndexID: 3} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ └── 10 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 index 4f02059816af..5d308e06a65d 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 @@ -27,14 +27,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 index 2dbc302c090a..e599b599d8cb 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 @@ -27,13 +27,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -41,7 +41,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 index 34b703a5f5b4..2272fd8ec9c4 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 @@ -27,13 +27,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -41,7 +41,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 index df01b16d59a9..dd8aa33a1ed0 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 @@ -27,21 +27,21 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 index 65eace05ff7a..49a495cb3bd4 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 @@ -27,13 +27,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -41,9 +41,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 index a81e44c4c0f6..37577d77283c 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 @@ -27,13 +27,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -41,9 +41,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 index 4ad3d4fe93ec..d7c805bd6a1e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 @@ -27,13 +27,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -41,9 +41,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 index 253057d1c2d3..c1beca02616b 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 @@ -27,13 +27,13 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -41,9 +41,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 index 499f394de60f..4994c061ab5f 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 @@ -37,19 +37,19 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":3,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":3,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":1,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":1,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":6,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -58,16 +58,16 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ └── 5 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 index db9fbfbeb135..ef547dd8aae0 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 @@ -23,18 +23,18 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_expr_k_idx, IndexID: 2} │ └── 14 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":3,"Kind":2,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":4,"Kind":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":4,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":4,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":4,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -47,7 +47,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":4,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":4,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -85,7 +85,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":3,"TableID":104} + │ └── ValidateIndex {"IndexID":3,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -108,14 +108,14 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 10 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":4,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":4,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -128,12 +128,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 9 Mutation operations │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} - │ ├── MakeColumnAbsent {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -142,8 +142,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 5 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 index 2737cfb21a29..6e0838318dd8 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 @@ -16,7 +16,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":4,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":4,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 15 in PostCommitPhase @@ -54,7 +54,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward PUBLIC │ │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ │ └── 1 Validation operation - │ │ └── ValidateUniqueIndex {"IndexID":3,"TableID":104} + │ │ └── ValidateIndex {"IndexID":3,"TableID":104} │ ├── Stage 8 of 15 in PostCommitPhase │ │ ├── 7 elements transitioning toward PUBLIC │ │ │ ├── VALIDATED → PUBLIC PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} @@ -70,12 +70,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_pkey, IndexID: 1} │ │ └── 12 Mutation operations - │ │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ │ ├── SetIndexName {"IndexID":3,"Name":"t_pkey","TableID":104} - │ │ ├── MakeAddedPrimaryIndexPublic {"IndexID":3,"TableID":104} - │ │ ├── MakeAddedIndexBackfilling {"IsSecondaryIndex":true} - │ │ ├── MakeAddedTempIndexDeleteOnly {"IsSecondaryIndex":true} + │ │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":3,"TableID":104} + │ │ ├── MakeAbsentIndexBackfilling {"IsSecondaryIndex":true} + │ │ ├── MakeAbsentTempIndexDeleteOnly {"IsSecondaryIndex":true} │ │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":6,"TableID":104} │ │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":6,"Kind":1,"TableID":104} │ │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":5,"TableID":104} @@ -86,7 +86,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 6, ConstraintID: 4, SourceIndexID: 3} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":6,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":6,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 10 of 15 in PostCommitPhase @@ -124,7 +124,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 4, TemporaryIndexID: 6, SourceIndexID: 3} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":5,"TableID":104} + │ └── ValidateIndex {"IndexID":5,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -147,14 +147,14 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 10 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} │ ├── SetIndexName {"IndexID":5,"Name":"idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":6,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":5,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":6,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":5,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -169,16 +169,16 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} └── 13 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":6,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":6,"TableID":104} ├── MakeIndexAbsent {"IndexID":6,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":4,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index index 4b736f851e9b..a41589510970 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index @@ -24,14 +24,14 @@ Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 106, ColumnID: 3} │ │ └── PUBLIC → ABSENT ColumnName:{DescID: 106, Name: pi, ColumnID: 3} │ └── 11 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":3,"TableID":106} + │ ├── MakePublicColumnWriteOnly {"ColumnID":3,"TableID":106} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":3,"Name":"crdb_internal_co...","TableID":106} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":5,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":106,"TemporaryIndexID":5}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":5,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":106,"TemporaryIndexID":5}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":4,"Kind":2,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":4,"IndexID":4,"Kind":2,"Ordinal":1,"TableID":106} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":6,"IndexID":5,"IsUnique":true,"SourceIndexID":1,"TableID":106}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":6,"IndexID":5,"IsUnique":true,"SourceIndexID":1,"TableID":106}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":5,"TableID":106} │ ├── AddColumnToIndex {"ColumnID":2,"IndexID":5,"Kind":2,"TableID":106} │ └── AddColumnToIndex {"ColumnID":4,"IndexID":5,"Kind":2,"Ordinal":1,"TableID":106} @@ -45,7 +45,7 @@ Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":5,"TableID":106} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":5,"TableID":106} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -83,7 +83,7 @@ Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 106, IndexID: 4, ConstraintID: 5, TemporaryIndexID: 5, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":4,"TableID":106} + │ └── ValidateIndex {"IndexID":4,"TableID":106} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -103,12 +103,12 @@ Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN │ │ ├── PUBLIC → VALIDATED PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 106, Name: test_pkey, IndexID: 1} │ └── 8 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":3,"TableID":106} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":106} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":3,"TableID":106} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":106} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":106} │ ├── SetIndexName {"IndexID":4,"Name":"test_pkey","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":4,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":4,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -117,9 +117,9 @@ Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN │ ├── 1 element transitioning toward ABSENT │ │ └── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} │ └── 5 Mutation operations - │ ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":5,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -129,9 +129,9 @@ Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 106, ColumnID: 3} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":106} ├── MakeIndexAbsent {"IndexID":1,"TableID":106} ├── RemoveColumnDefaultExpression {"ColumnID":3,"TableID":106} - ├── MakeColumnAbsent {"ColumnID":3,"TableID":106} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 index ffd822345aac..9149ce78f2fd 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 @@ -25,11 +25,11 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} └── 9 Mutation operations ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} ├── RefreshStats {"TableID":106} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} ├── MakeIndexAbsent {"IndexID":4,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 index 6d68357ece79..36fec74b5aee 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 @@ -25,10 +25,10 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} │ └── 8 Mutation operations │ ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} │ ├── RefreshStats {"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,7 +36,7 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 index bd29f1941187..b5b77cd47ed4 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 @@ -25,10 +25,10 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} │ └── 8 Mutation operations │ ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} │ ├── RefreshStats {"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,7 +36,7 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 index 01ea76466665..ee37b099d078 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 @@ -25,10 +25,10 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} │ └── 8 Mutation operations │ ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} │ ├── RefreshStats {"TableID":106} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,7 +36,7 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 index d89e80f0db3b..b2cacf1944c6 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 @@ -25,10 +25,10 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} │ └── 7 Mutation operations │ ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} │ ├── RefreshStats {"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -36,9 +36,9 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 4, ConstraintID: 5, TemporaryIndexID: 5, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} ├── MakeIndexAbsent {"IndexID":4,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 index f59337f7cc66..1a2f3db3f732 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 @@ -25,10 +25,10 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} │ └── 7 Mutation operations │ ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} │ ├── RefreshStats {"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -36,9 +36,9 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 4, ConstraintID: 5, TemporaryIndexID: 5, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} ├── MakeIndexAbsent {"IndexID":4,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 index bdabbddc006e..67d42d6f74f1 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 @@ -25,9 +25,9 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 106, ColumnID: 4, IndexID: 5} │ └── 7 Mutation operations │ ├── SetColumnName {"ColumnID":3,"Name":"pi","TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":106} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":5,"TableID":106} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":106} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":5,"TableID":106} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":106} │ ├── RefreshStats {"TableID":106} │ ├── SetJobStateOnDescriptor {"DescriptorID":106} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -36,9 +36,9 @@ Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP C │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 106, IndexID: 4, ConstraintID: 5, TemporaryIndexID: 5, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 106, IndexID: 5, ConstraintID: 6, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":106} ├── MakeIndexAbsent {"IndexID":4,"TableID":106} - ├── CreateGcJobForIndex {"IndexID":5,"TableID":106} + ├── CreateGCJobForIndex {"IndexID":5,"TableID":106} ├── MakeIndexAbsent {"IndexID":5,"TableID":106} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index index 50c18cdd480c..8e4f7d6ba16e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index @@ -19,13 +19,13 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_j_idx, IndexID: 2} │ └── 9 Mutation operations - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -38,7 +38,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":4,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":4,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -76,7 +76,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":3,"TableID":104} + │ └── ValidateIndex {"IndexID":3,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -95,13 +95,13 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 9 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -112,11 +112,11 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 8 Mutation operations │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -125,8 +125,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 5 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 index c2576a55fc4a..bd21afd26d6d 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 @@ -21,12 +21,12 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D └── 11 Mutation operations ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 index c40861e107bf..2166b36abeac 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 @@ -21,11 +21,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -33,7 +33,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 index af14d4e1530e..6402937c6297 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 @@ -21,11 +21,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -33,7 +33,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 index fbc8f4e50d1f..e627774af512 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 @@ -21,11 +21,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── 10 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -33,7 +33,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 index 41b0d24c3bc6..193cc07054ee 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 @@ -21,11 +21,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -33,9 +33,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 index 5f4ffa684b1c..2ed545984258 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 @@ -21,11 +21,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -33,9 +33,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 index b887580de4b1..bb1fa1d1c53f 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 @@ -21,11 +21,11 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ └── 9 Mutation operations │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_j_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -33,9 +33,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index b/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index index 587fdcddcab0..a360a1c08856 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index @@ -14,9 +14,9 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: idx, IndexID: 2} │ └── 5 Mutation operations - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":3,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":3,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -38,8 +38,8 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 104, ColumnID: 3} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 4 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -49,8 +49,8 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} └── 6 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":3,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index b/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index index 273fc76aa079..d7617f8bdda7 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index @@ -14,9 +14,9 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: idx, IndexID: 2} │ └── 5 Mutation operations - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":3,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":3,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -33,8 +33,8 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 104, ColumnID: 3} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 4 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -46,8 +46,8 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› └── 7 Mutation operations ├── RemoveDroppedIndexPartialPredicate {"IndexID":2,"TableID":104} ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":3,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index b/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index index 640f983ed79e..86c57ccdeb9e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index @@ -12,7 +12,7 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: idx, IndexID: 2} │ └── 2 Mutation operations - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ └── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase @@ -27,7 +27,7 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ ├── 1 element transitioning toward ABSENT │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 3 Mutation operations - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 2 of 2 in PostCommitNonRevertiblePhase @@ -35,7 +35,7 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} └── 5 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} ├── MakeIndexAbsent {"IndexID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 index 323d81e19409..15ce8b8fdddd 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 @@ -28,16 +28,16 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} ├── RefreshStats {"TableID":104} - ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} ├── RefreshStats {"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 index b1b40d712674..7953c6c3e76d 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 @@ -28,15 +28,15 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 index eba3783b25d2..c11ea82f46a3 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 @@ -28,15 +28,15 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 index 013ea01434ad..910e6576e505 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 @@ -28,15 +28,15 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -44,7 +44,7 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D ├── 1 element transitioning toward ABSENT │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 4 Mutation operations - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 index 86b2eb04ee35..bd6fd6b23869 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -44,9 +44,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 index 6703a40adf4f..87f88d189390 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -44,9 +44,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 index 617c3e3b16d7..e6fa017a5f7a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 @@ -28,14 +28,14 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── SetColumnName {"ColumnID":2,"Name":"j","TableID":104} │ ├── SetColumnName {"ColumnID":4,"Name":"crdb_internal_id...","TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"t_expr_k_idx","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":3,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":2,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeAddedSecondaryIndexPublic {"IndexID":2,"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":3,"TableID":104} + │ ├── MakeValidatedSecondaryIndexPublic {"IndexID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":3,"TableID":104} │ ├── RefreshStats {"TableID":104} - │ ├── MakeColumnPublic {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyColumnPublic {"ColumnID":4,"TableID":104} │ ├── RefreshStats {"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} @@ -44,9 +44,9 @@ Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› D │ ├── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── DELETE_ONLY → ABSENT TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} └── 6 Mutation operations - ├── CreateGcJobForIndex {"IndexID":3,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":3,"TableID":104} ├── MakeIndexAbsent {"IndexID":3,"TableID":104} - ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} ├── MakeIndexAbsent {"IndexID":4,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 index db9fbfbeb135..ef547dd8aae0 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 @@ -23,18 +23,18 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → VALIDATED SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 104, Name: t_expr_k_idx, IndexID: 2} │ └── 14 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":2,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":2,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ ├── SetColumnName {"ColumnID":2,"Name":"crdb_internal_co...","TableID":104} - │ ├── MakeDroppedNonPrimaryIndexDeleteAndWriteOnly {"IndexID":2,"TableID":104} + │ ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":104} │ ├── SetIndexName {"IndexID":2,"Name":"crdb_internal_in...","TableID":104} - │ ├── MakeAddedIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} + │ ├── MakeAbsentIndexBackfilling {"Index":{"ConstraintID":2,"IndexID":3,"IsUnique":true,"SourceIndexID":1,"TableID":104,"TemporaryIndexID":4}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":3,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":3,"Kind":2,"TableID":104} - │ ├── MakeAddedTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} + │ ├── MakeAbsentTempIndexDeleteOnly {"Index":{"ConstraintID":3,"IndexID":4,"IsUnique":true,"SourceIndexID":1,"TableID":104}} │ ├── AddColumnToIndex {"ColumnID":1,"IndexID":4,"TableID":104} │ ├── AddColumnToIndex {"ColumnID":3,"IndexID":4,"Kind":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":4,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":4,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":4,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -47,7 +47,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":4,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":4,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -85,7 +85,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":3,"TableID":104} + │ └── ValidateIndex {"IndexID":3,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -108,14 +108,14 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 2} │ │ └── VALIDATED → DELETE_ONLY SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 10 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":4,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":4,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -128,12 +128,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 9 Mutation operations │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} - │ ├── MakeColumnAbsent {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -142,8 +142,8 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 5 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 index 2ac94d6c9824..37a6614ec1e4 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 @@ -12,7 +12,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 104, ColumnID: 3} │ │ └── PUBLIC → ABSENT ColumnName:{DescID: 104, Name: k, ColumnID: 3} │ └── 3 Mutation operations - │ ├── MakeDroppedColumnDeleteAndWriteOnly {"ColumnID":3,"TableID":104} + │ ├── MakePublicColumnWriteOnly {"ColumnID":3,"TableID":104} │ ├── LogEvent {"TargetStatus":1} │ └── SetColumnName {"ColumnID":3,"Name":"crdb_internal_co...","TableID":104} ├── PreCommitPhase @@ -25,7 +25,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── 1 element transitioning toward TRANSIENT_ABSENT │ │ │ └── DELETE_ONLY → WRITE_ONLY TemporaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 3, SourceIndexID: 1} │ │ └── 3 Mutation operations - │ │ ├── MakeAddedIndexDeleteAndWriteOnly {"IndexID":4,"TableID":104} + │ │ ├── MakeDeleteOnlyIndexWriteOnly {"IndexID":4,"TableID":104} │ │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ │ └── UpdateSchemaChangerJob {"RunningStatus":"PostCommitPhase ..."} │ ├── Stage 2 of 7 in PostCommitPhase @@ -63,7 +63,7 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── 1 element transitioning toward PUBLIC │ │ └── WRITE_ONLY → VALIDATED PrimaryIndex:{DescID: 104, IndexID: 3, ConstraintID: 2, TemporaryIndexID: 4, SourceIndexID: 1} │ └── 1 Validation operation - │ └── ValidateUniqueIndex {"IndexID":3,"TableID":104} + │ └── ValidateIndex {"IndexID":3,"TableID":104} └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC @@ -88,16 +88,16 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 3} │ │ └── PUBLIC → ABSENT IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 4} │ └── 12 Mutation operations - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":3,"TableID":104} - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":2,"TableID":104} - │ ├── MakeDroppedColumnDeleteOnly {"ColumnID":4,"TableID":104} - │ ├── MakeDroppedPrimaryIndexDeleteAndWriteOnly {"IndexID":1,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":3,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":2,"TableID":104} + │ ├── MakeWriteOnlyColumnDeleteOnly {"ColumnID":4,"TableID":104} + │ ├── MakePublicPrimaryIndexWriteOnly {"IndexID":1,"TableID":104} │ ├── SetIndexName {"IndexID":1,"Name":"crdb_internal_in...","TableID":104} │ ├── RemoveColumnFromIndex {"ColumnID":3,"IndexID":3,"Kind":2,"TableID":104} │ ├── SetIndexName {"IndexID":3,"Name":"t_pkey","TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":2,"TableID":104} - │ ├── MakeAddedPrimaryIndexPublic {"IndexID":3,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":2,"TableID":104} + │ ├── MakeValidatedPrimaryIndexPublic {"IndexID":3,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} ├── Stage 2 of 3 in PostCommitNonRevertiblePhase @@ -110,12 +110,12 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ │ └── DELETE_ONLY → ABSENT SecondaryIndex:{DescID: 104, IndexID: 2, ConstraintID: 0} │ └── 9 Mutation operations │ ├── LogEvent {"TargetStatus":1} - │ ├── CreateGcJobForIndex {"IndexID":2,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":2,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":2,"TableID":104} - │ ├── CreateGcJobForIndex {"IndexID":4,"TableID":104} + │ ├── CreateGCJobForIndex {"IndexID":4,"TableID":104} │ ├── MakeIndexAbsent {"IndexID":4,"TableID":104} - │ ├── MakeDroppedIndexDeleteOnly {"IndexID":1,"TableID":104} - │ ├── MakeColumnAbsent {"ColumnID":4,"TableID":104} + │ ├── MakeWriteOnlyIndexDeleteOnly {"IndexID":1,"TableID":104} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4,"TableID":104} │ ├── SetJobStateOnDescriptor {"DescriptorID":104} │ └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── Stage 3 of 3 in PostCommitNonRevertiblePhase @@ -128,11 +128,11 @@ Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COL │ ├── PUBLIC → ABSENT ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 2} │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1} └── 8 Mutation operations - ├── CreateGcJobForIndex {"IndexID":1,"TableID":104} + ├── CreateGCJobForIndex {"IndexID":1,"TableID":104} ├── MakeIndexAbsent {"IndexID":1,"TableID":104} ├── RemoveColumnDefaultExpression {"ColumnID":3,"TableID":104} ├── RemoveColumnOnUpdateExpression {"ColumnID":3,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":104} - ├── MakeColumnAbsent {"ColumnID":3,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":104} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_schema b/pkg/sql/schemachanger/testdata/explain/drop_schema index 2ff8cc36e862..768b6e281e2a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_schema +++ b/pkg/sql/schemachanger/testdata/explain/drop_schema @@ -11,7 +11,7 @@ Schema change plan for DROP SCHEMA ‹db›.‹sc›; │ ├── 1 element transitioning toward ABSENT │ │ └── PUBLIC → TXN_DROPPED Schema:{DescID: 106} │ └── 1 Mutation operation - │ └── MarkDescriptorAsSyntheticallyDropped {"DescID":106} + │ └── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":106} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 6 elements transitioning toward ABSENT @@ -22,7 +22,7 @@ Schema change plan for DROP SCHEMA ‹db›.‹sc›; │ │ ├── TXN_DROPPED → DROPPED Schema:{DescID: 106} │ │ └── PUBLIC → ABSENT SchemaParent:{DescID: 106, ReferencedDescID: 104} │ └── 6 Mutation operations - │ ├── MarkDescriptorAsDropped {"DescID":106} + │ ├── MarkDescriptorAsDropped {"DescriptorID":106} │ ├── RemoveSchemaParent {"Parent":{"ParentDatabaseID":104,"SchemaID":106}} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":106,"Name":"sc"}} │ ├── SetJobStateOnDescriptor {"DescriptorID":104,"Initialize":true} diff --git a/pkg/sql/schemachanger/testdata/explain/drop_table b/pkg/sql/schemachanger/testdata/explain/drop_table index 53e3189b2cb5..1381b020df95 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_table +++ b/pkg/sql/schemachanger/testdata/explain/drop_table @@ -19,7 +19,7 @@ Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; │ │ ├── PUBLIC → WRITE_ONLY Column:{DescID: 107, ColumnID: 4294967294} │ │ └── PUBLIC → VALIDATED PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} │ └── 1 Mutation operation - │ └── MarkDescriptorAsSyntheticallyDropped {"DescID":107} + │ └── MarkDescriptorAsSyntheticallyDropped {"DescriptorID":107} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 28 elements transitioning toward ABSENT @@ -52,7 +52,7 @@ Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} │ │ └── PUBLIC → ABSENT IndexName:{DescID: 107, Name: t_pkey, IndexID: 1} │ └── 6 Mutation operations - │ ├── MarkDescriptorAsDropped {"DescID":107} + │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── RemoveAllTableComments {"TableID":107} │ ├── RemoveColumnDefaultExpression {"ColumnID":3,"TableID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"t","SchemaID":106}} @@ -70,11 +70,11 @@ Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} └── 9 Mutation operations ├── LogEvent {"TargetStatus":1} - ├── CreateGcJobForTable {"TableID":107} - ├── MakeColumnAbsent {"ColumnID":1,"TableID":107} - ├── MakeColumnAbsent {"ColumnID":2,"TableID":107} - ├── MakeColumnAbsent {"ColumnID":3,"TableID":107} - ├── MakeColumnAbsent {"ColumnID":4294967295,"TableID":107} - ├── MakeColumnAbsent {"ColumnID":4294967294,"TableID":107} + ├── CreateGCJobForTable {"TableID":107} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":107} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":107} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":107} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":107} + ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":107} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column b/pkg/sql/schemachanger/testdata/explain_verbose/add_column index 3a85e5875d78..9e0054be5ec3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column @@ -92,7 +92,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ │ └── • 11 Mutation operations │ │ -│ ├── • MakeAddedColumnDeleteOnly +│ ├── • MakeAbsentColumnDeleteOnly │ │ Column: │ │ ColumnID: 2 │ │ PgAttributeNum: 2 @@ -137,7 +137,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ Expr: 42:::INT8 │ │ TableID: 106 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 2 @@ -157,7 +157,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ Kind: 2 │ │ TableID: 106 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 3 @@ -233,11 +233,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ │ │ │ └── • 4 Mutation operations │ │ │ -│ │ ├── • MakeAddedColumnDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyColumnWriteOnly │ │ │ ColumnID: 2 │ │ │ TableID: 106 │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 106 │ │ │ @@ -372,7 +372,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 2 │ TableID: 106 │ @@ -476,7 +476,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ │ └── • 9 Mutation operations │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 106 │ │ @@ -490,11 +490,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ Name: tbl_pkey │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -507,7 +507,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ IndexID: 2 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -557,7 +557,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ │ └── • 5 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -565,7 +565,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 106 │ │ @@ -595,7 +595,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 index d471509f6791..5203357cfe5e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 @@ -110,7 +110,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: crdb_internal_column_2_name_placeholder │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -141,7 +141,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 index 0d8f2857644f..7de3b022492c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -89,11 +89,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -182,7 +182,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -190,7 +190,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ IndexID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 index 10df569caf42..51f0f8a6a20a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -89,11 +89,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -182,7 +182,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -190,7 +190,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ IndexID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 index 38cb2cd02914..89f7c56d7070 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -89,11 +89,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -182,7 +182,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -190,7 +190,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ IndexID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 index ee0bac737fa6..7f429289378e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -80,11 +80,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -169,7 +169,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 8 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -188,7 +188,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 index 1889dd9c22c5..e734ac3532ee 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -80,11 +80,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -169,7 +169,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 8 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -188,7 +188,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 index 2e155b9f756c..668a27d76b6e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -80,11 +80,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -169,7 +169,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 8 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -188,7 +188,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ColumnID: 2 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq index de1c40f58df3..cc799b12e074 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq @@ -92,7 +92,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ │ └── • 12 Mutation operations │ │ -│ ├── • MakeAddedColumnDeleteOnly +│ ├── • MakeAbsentColumnDeleteOnly │ │ Column: │ │ ColumnID: 2 │ │ PgAttributeNum: 2 @@ -145,7 +145,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ SequenceIDs: │ │ - 107 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 2 @@ -165,7 +165,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ Kind: 2 │ │ TableID: 106 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 3 @@ -246,11 +246,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ │ │ │ └── • 5 Mutation operations │ │ │ -│ │ ├── • MakeAddedColumnDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyColumnWriteOnly │ │ │ ColumnID: 2 │ │ │ TableID: 106 │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 106 │ │ │ @@ -397,7 +397,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 2 │ TableID: 106 │ @@ -501,7 +501,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ │ └── • 10 Mutation operations │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 106 │ │ @@ -515,11 +515,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ Name: tbl_pkey │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -532,7 +532,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ IndexID: 2 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -585,7 +585,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ │ └── • 6 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -593,7 +593,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 106 │ │ @@ -626,7 +626,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ └── • 5 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 index fa70796f04a0..ff175902c84d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 @@ -110,7 +110,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: crdb_internal_column_2_name_placeholder │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -147,7 +147,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ SequenceIDs: │ - 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 index 5d1f640daaa6..3f76a125acaf 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ │ └── • 8 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -89,11 +89,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ SequenceIDs: │ - 107 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ IndexID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 index 0fcd0ebce4d9..56c4289c8d24 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ │ └── • 8 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -89,11 +89,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ SequenceIDs: │ - 107 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ IndexID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 index 552f63dcec88..928fb0fd02cb 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ │ └── • 8 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -89,11 +89,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ SequenceIDs: │ - 107 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ IndexID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 index 9868cc518ac6..fd5e41f2a5d0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -80,11 +80,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 10 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -209,7 +209,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ SequenceIDs: │ - 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 index dacabad26293..d4417b3a296f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -80,11 +80,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 10 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -209,7 +209,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ SequenceIDs: │ - 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 index a96eb7bccbf5..535d098d44fd 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -80,11 +80,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 10 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ @@ -209,7 +209,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ SequenceIDs: │ - 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default index 04d1f462c372..d748e0acd459 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default @@ -41,7 +41,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT; │ │ │ └── • 5 Mutation operations │ │ -│ ├── • MakeAddedColumnDeleteOnly +│ ├── • MakeAbsentColumnDeleteOnly │ │ Column: │ │ ColumnID: 2 │ │ PgAttributeNum: 2 @@ -121,7 +121,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT; │ │ │ └── • 3 Mutation operations │ │ - │ ├── • MakeAddedColumnDeleteAndWriteOnly + │ ├── • MakeDeleteOnlyColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT; │ └── • 4 Mutation operations │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 index 48734fcf066b..d2ee6bb100d0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 @@ -52,7 +52,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 2; │ Kind: 2 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 index 8617bcc32698..18cbc088758e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 @@ -34,7 +34,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; │ │ │ └── • 5 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 106 │ │ @@ -85,7 +85,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; │ └── • 3 Mutation operations │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid index 28d8bc8e2b4c..a39474980314 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid @@ -78,7 +78,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ └── • 11 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -104,7 +104,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 2 @@ -124,7 +124,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 3 @@ -143,7 +143,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 4 │ │ IndexID: 4 @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 104 │ │ │ @@ -334,7 +334,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ │ │ └── • 1 Validation operation │ │ │ -│ │ └── • ValidateUniqueIndex +│ │ └── • ValidateIndex │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -398,7 +398,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ │ │ └── • 8 Mutation operations │ │ │ -│ │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly +│ │ ├── • MakePublicPrimaryIndexWriteOnly │ │ │ IndexID: 1 │ │ │ TableID: 104 │ │ │ @@ -412,7 +412,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ Name: t_pkey │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedPrimaryIndexPublic +│ │ ├── • MakeValidatedPrimaryIndexPublic │ │ │ EventBase: │ │ │ Authorization: │ │ │ UserName: root @@ -424,7 +424,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ IndexID: 2 │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedTempIndexDeleteOnly +│ │ ├── • MakeAbsentTempIndexDeleteOnly │ │ │ Index: │ │ │ ConstraintID: 5 │ │ │ IndexID: 5 @@ -459,7 +459,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 5 │ │ │ TableID: 104 │ │ │ @@ -591,7 +591,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 4 │ TableID: 104 │ @@ -671,19 +671,19 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -800,7 +800,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ └── • 12 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 1 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) @@ -818,7 +818,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -827,7 +827,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -840,7 +840,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -848,7 +848,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -880,7 +880,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ └── • 3 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -961,7 +961,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) @@ -983,7 +983,7 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ ColumnID: 2 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 index 2c27a33bfdbd..4c7b25b2e268 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 @@ -148,7 +148,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -157,15 +157,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -252,7 +252,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -260,7 +260,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -268,7 +268,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 index b5a34abe621f..1d473061e1c6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 @@ -148,7 +148,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -157,15 +157,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -252,7 +252,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -260,7 +260,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -268,7 +268,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 index 0e0b3d32c73e..6dc3113dd137 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 @@ -148,7 +148,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -157,15 +157,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -252,7 +252,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -260,7 +260,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -268,7 +268,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 index 89484ea58d22..58e0846fb510 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,15 +151,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -174,7 +174,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -186,7 +186,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -243,7 +243,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -270,7 +270,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -311,7 +311,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 index c764e5a182cf..08e751b7678d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,15 +151,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -174,7 +174,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -186,7 +186,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -243,7 +243,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -270,7 +270,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -311,7 +311,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 index a9830babcde0..ee44f0915bfc 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,19 +151,19 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -178,7 +178,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -243,7 +243,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -270,7 +270,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -311,7 +311,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 index afff2a894d0d..6b1b961dfc19 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 @@ -112,7 +112,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ Name: rowid │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -127,7 +127,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ├── • RefreshStats │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -146,7 +146,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -154,7 +154,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 index 27a515ab5182..3b7f529caa0c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -189,7 +189,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 index a7f69251246d..3e49b833491c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -189,7 +189,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 index 176b0ec31441..643117b26155 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -189,7 +189,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 index a4f3e0800855..0b12063a7943 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 index 49a464389976..f2c646fa00c5 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 index d4ba9cdd3f08..5f4b72b33114 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 @@ -97,15 +97,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -120,7 +120,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 index 2629a0905d25..d68c13ed9371 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 @@ -97,15 +97,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -120,7 +120,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 index 7243c4471f52..0ef9bdba2080 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -160,11 +160,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -179,7 +179,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -250,7 +250,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ └── • 5 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -258,7 +258,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -291,7 +291,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid index d069dacc29ee..6b18dae649f2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid @@ -78,7 +78,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ └── • 11 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -105,7 +105,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 2 @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 3 @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 4 │ │ IndexID: 4 @@ -201,7 +201,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 104 │ │ │ @@ -336,7 +336,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ │ │ └── • 1 Validation operation │ │ │ -│ │ └── • ValidateUniqueIndex +│ │ └── • ValidateIndex │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -400,7 +400,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ │ │ └── • 8 Mutation operations │ │ │ -│ │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly +│ │ ├── • MakePublicPrimaryIndexWriteOnly │ │ │ IndexID: 1 │ │ │ TableID: 104 │ │ │ @@ -414,7 +414,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ Name: t_pkey │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedPrimaryIndexPublic +│ │ ├── • MakeValidatedPrimaryIndexPublic │ │ │ EventBase: │ │ │ Authorization: │ │ │ UserName: root @@ -427,7 +427,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ IndexID: 2 │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedTempIndexDeleteOnly +│ │ ├── • MakeAbsentTempIndexDeleteOnly │ │ │ Index: │ │ │ ConstraintID: 5 │ │ │ IndexID: 5 @@ -462,7 +462,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 5 │ │ │ TableID: 104 │ │ │ @@ -594,7 +594,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 4 │ TableID: 104 │ @@ -674,19 +674,19 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -803,7 +803,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ └── • 12 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 1 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) @@ -822,7 +822,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -831,7 +831,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -844,7 +844,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -852,7 +852,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -885,7 +885,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ └── • 3 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -966,7 +966,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) @@ -989,7 +989,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ ColumnID: 2 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 index 1321f47b93d8..c827c4fa98ba 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 @@ -148,7 +148,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -157,15 +157,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -252,7 +252,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -260,7 +260,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -268,7 +268,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 index e638b6a9b271..c27f5a56301a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 @@ -148,7 +148,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -157,15 +157,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -252,7 +252,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -260,7 +260,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -268,7 +268,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 index a23a3f0dfd9e..0baaebd0cddd 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 @@ -148,7 +148,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -157,15 +157,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -252,7 +252,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -260,7 +260,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -268,7 +268,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 index 196f178b8c89..2ef649427920 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,15 +151,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -174,7 +174,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -186,7 +186,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -243,7 +243,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -270,7 +270,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -311,7 +311,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 index ec6229cf45c8..a1ecad9cde4d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,15 +151,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -174,7 +174,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -186,7 +186,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -243,7 +243,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -270,7 +270,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -311,7 +311,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 index ecef90dcc806..3907538a3db5 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -151,19 +151,19 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -178,7 +178,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -243,7 +243,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -270,7 +270,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -311,7 +311,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 index 3fcbe999094a..fce71c9ebd55 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 @@ -112,7 +112,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ Name: rowid │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -127,7 +127,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ├── • RefreshStats │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -146,7 +146,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -154,7 +154,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 index e17436b4a41f..21508bff2e65 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -189,7 +189,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 index 4c2ebdc7985a..c50a09bb6bb6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -189,7 +189,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 index 7d1b3370de05..34563f9219bd 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -144,7 +144,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -189,7 +189,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 index 5a92201888d0..d6b8df73bdbc 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 index 6a68ae27bb22..f77a86224aa0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 index 789ccfb473bc..85acb2f62971 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 @@ -97,15 +97,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -120,7 +120,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 index 7b11b2adbea8..dc28cad3556c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 @@ -97,15 +97,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ │ Name: rowid │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -120,7 +120,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -180,7 +180,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -199,7 +199,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 index a32cd14a4a79..605991761dbe 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -160,11 +160,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -179,7 +179,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -250,7 +250,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ └── • 5 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -258,7 +258,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -291,7 +291,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla index 658bf6eb5c10..305ece90297d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla @@ -88,7 +88,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ └── • 12 Mutation operations │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 2 @@ -108,7 +108,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 3 @@ -127,7 +127,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 4 │ │ IndexID: 4 @@ -137,7 +137,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ TemporaryIndexID: 5 │ │ IsSecondaryIndex: true │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 5 │ │ IndexID: 5 @@ -217,11 +217,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ │ │ └── • 4 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 5 │ │ │ TableID: 104 │ │ │ @@ -423,11 +423,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ └── • 2 Validation operations │ │ -│ ├── • ValidateUniqueIndex +│ ├── • ValidateIndex │ │ IndexID: 2 │ │ TableID: 104 │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 4 │ TableID: 104 │ @@ -544,7 +544,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ └── • 10 Mutation operations │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -558,11 +558,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -571,7 +571,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ Name: t_i_key │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -584,7 +584,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -628,7 +628,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -636,7 +636,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -644,7 +644,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -677,7 +677,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 index b8015780a6cf..e4407bca8e1b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 @@ -117,7 +117,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ └── • 11 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -136,7 +136,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -163,7 +163,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -174,7 +174,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 4 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 index a05a87d112cb..1deb26f2577d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 @@ -105,15 +105,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -208,7 +208,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 index 390e1c7313ad..ebdbccebd966 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 @@ -105,15 +105,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -208,7 +208,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 index a9ea1e2d6e7e..c800985d8a4c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 @@ -105,15 +105,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -151,7 +151,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -208,7 +208,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 index d2bcaf787fe6..c4c030afe245 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 @@ -87,19 +87,19 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -171,7 +171,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 11 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -190,7 +190,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -228,7 +228,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 4 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 index 0741274d8906..4016b68bab09 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 @@ -87,19 +87,19 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -171,7 +171,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 11 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -190,7 +190,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -228,7 +228,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 4 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 index 4a4867890106..927cb14c993f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 @@ -87,19 +87,19 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -171,7 +171,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 11 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -190,7 +190,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -228,7 +228,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 4 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index b/pkg/sql/schemachanger/testdata/explain_verbose/create_index index d6fce0cc017b..eea7de5ad320 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index @@ -53,7 +53,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ │ │ └── • 6 Mutation operations │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ IndexID: 2 │ │ SourceIndexID: 1 @@ -61,7 +61,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ │ TemporaryIndexID: 3 │ │ IsSecondaryIndex: true │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ IndexID: 3 │ │ SourceIndexID: 1 @@ -127,7 +127,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 106 │ │ │ @@ -262,7 +262,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 2 │ TableID: 106 │ @@ -309,11 +309,11 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ │ Name: idx1 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -337,7 +337,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 index 092daf5b6130..86cabaec0ba6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 @@ -84,7 +84,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -95,7 +95,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 index 998a11cf73d9..7489570ccefa 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 @@ -61,7 +61,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -82,7 +82,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -119,7 +119,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 index fd913f8c9cea..c6acd3d900ee 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 @@ -61,7 +61,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ │ └── • 6 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -82,7 +82,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -119,7 +119,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 index 6ed9767c61c2..beaa18b5d977 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 @@ -78,7 +78,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -89,7 +89,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -119,7 +119,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 index f029d63c919f..54d274470666 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 @@ -52,11 +52,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -118,7 +118,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 index be9fe54f07ed..9ddd54ae9bfe 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 @@ -52,11 +52,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ @@ -118,7 +118,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 index 822cb4b5d2e8..f543c045ceaf 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 @@ -52,11 +52,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 106 │ │ @@ -118,7 +118,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic index 8e662f1c1ce8..5a1355443e0d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic @@ -54,7 +54,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 7 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -79,7 +79,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 2 @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ IndexID: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 3 @@ -145,7 +145,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 3 │ │ │ TableID: 104 │ │ │ @@ -277,7 +277,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 2 │ TableID: 104 │ @@ -366,11 +366,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 8 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -384,11 +384,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -431,7 +431,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 5 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -439,7 +439,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -497,7 +497,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ └── • 5 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j @@ -515,7 +515,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ IndexID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 index 0c1611b56d99..c3b81437366b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 @@ -73,7 +73,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: j │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -88,7 +88,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -107,7 +107,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 index 11d5b1a9a58c..720bd7aa69b0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 @@ -70,11 +70,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: j │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -89,7 +89,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -131,7 +131,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 index 8c44bc957751..24abffe9040d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 @@ -70,11 +70,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: j │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -89,7 +89,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -131,7 +131,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 index f501a4f9549e..91d15a2b8457 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 @@ -70,11 +70,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: j │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -89,7 +89,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true @@ -131,7 +131,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 index 85ece8dfaea3..d2293056097e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 @@ -64,11 +64,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: j │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -83,7 +83,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -122,7 +122,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -141,7 +141,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 index 3a4de63ffb1f..19d7170dd6dc 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 @@ -64,11 +64,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: j │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -83,7 +83,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -122,7 +122,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -141,7 +141,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 index 284906ab4d9a..24c5fb2d8e11 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 @@ -64,15 +64,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: j │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -122,7 +122,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Rollback: true @@ -141,7 +141,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index index 8a06150c291f..211c38be1462 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index @@ -81,7 +81,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 12 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -106,7 +106,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -115,7 +115,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 3 @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 3 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 4 @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 4 │ │ TableID: 104 │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ @@ -207,7 +207,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 4 │ │ │ TableID: 104 │ │ │ @@ -339,7 +339,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 3 │ TableID: 104 │ @@ -461,15 +461,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 10 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -483,15 +483,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -589,7 +589,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -599,7 +599,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -607,11 +607,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeColumnAbsent + │ ├── • MakeDeleteOnlyColumnAbsent │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -677,7 +677,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ └── • 5 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -695,7 +695,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ IndexID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 index 5f31ae5291de..1a64b34d22b8 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 @@ -123,7 +123,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: t_expr_idx │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -138,7 +138,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 3 │ EventBase: │ Authorization: @@ -153,11 +153,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeAddedSecondaryIndexPublic + ├── • MakeValidatedSecondaryIndexPublic │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -176,7 +176,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 index 652f61dcd90e..ff18edd9f868 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 @@ -120,11 +120,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: t_expr_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -139,7 +139,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -154,11 +154,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 index b3133b1ccfbd..8780e63182d2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 @@ -120,11 +120,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: t_expr_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -139,7 +139,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -154,11 +154,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 index 27352672ec44..75305f85074c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 @@ -120,11 +120,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: t_expr_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -139,7 +139,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -154,11 +154,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -200,7 +200,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 index 15124bf5baa9..f5c008a9b8c9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 @@ -114,11 +114,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: t_expr_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -133,7 +133,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -148,11 +148,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 index 175cb18b7105..f2aef503eea4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 @@ -114,11 +114,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: t_expr_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -133,7 +133,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -148,11 +148,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 index b93963fecf2d..5557b9fe4010 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 @@ -114,15 +114,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: t_expr_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -137,7 +137,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -152,7 +152,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -191,7 +191,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 index 5b2b6ab091bc..a0f1ddbb1454 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -226,15 +226,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -249,7 +249,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -264,7 +264,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -276,7 +276,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -300,7 +300,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -356,7 +356,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -364,7 +364,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -372,7 +372,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -405,7 +405,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 index 9186c2f61c6f..c0eaee2a9066 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -226,15 +226,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -249,7 +249,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -264,7 +264,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -276,7 +276,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -300,7 +300,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -356,7 +356,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -364,7 +364,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -372,7 +372,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -405,7 +405,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 index f01dd3e1afa0..73d67d8a171a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -226,7 +226,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -250,7 +250,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -262,11 +262,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -281,7 +281,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -296,7 +296,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -308,7 +308,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -356,7 +356,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ └── • 7 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -364,7 +364,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -372,7 +372,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -405,7 +405,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 index ba9bb2692ae3..541fe9166177 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 @@ -208,7 +208,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -217,15 +217,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -240,7 +240,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -255,7 +255,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -267,11 +267,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -334,7 +334,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ └── • 10 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -362,7 +362,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -374,7 +374,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -382,7 +382,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -415,7 +415,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 index 387275cbcdda..4f97701c3fee 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 @@ -208,7 +208,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -217,15 +217,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -240,7 +240,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -255,7 +255,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -267,11 +267,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -334,7 +334,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ └── • 10 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -362,7 +362,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -374,7 +374,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -382,7 +382,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -415,7 +415,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 index 5b5c96c5330d..e20ed5ab0262 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 @@ -208,7 +208,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -217,19 +217,19 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -244,7 +244,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -259,7 +259,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -271,7 +271,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -334,7 +334,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ └── • 10 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -362,7 +362,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -374,7 +374,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -382,7 +382,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -415,7 +415,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 index 53a839f64532..bb76f5950c8c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 @@ -145,7 +145,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ Name: t_expr_k_idx │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 4 │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 4 │ EventBase: │ Authorization: @@ -183,11 +183,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeAddedSecondaryIndexPublic + ├── • MakeValidatedSecondaryIndexPublic │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 index 6ee0613afe60..dc2b7fa6c9e9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 @@ -139,11 +139,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -158,7 +158,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -173,11 +173,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -222,7 +222,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 index b8ed987eebca..17e59e8eeba8 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 @@ -139,11 +139,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -158,7 +158,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -173,11 +173,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -222,7 +222,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 index 4e96bf19135b..dadb92dfa36f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 @@ -139,7 +139,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -158,11 +158,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -177,7 +177,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -192,7 +192,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -222,7 +222,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 index f598f063b814..249edd36155d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 @@ -130,11 +130,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -149,7 +149,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -164,11 +164,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -213,7 +213,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -232,7 +232,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 index 7c490e64c6e7..02b9ed6e89fb 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 @@ -130,11 +130,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -149,7 +149,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -164,11 +164,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -213,7 +213,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -232,7 +232,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 index 66485e5a98ee..6a36eeeb9e49 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 @@ -130,15 +130,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -213,7 +213,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -232,7 +232,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 index 6945884481ad..8044afb414be 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 @@ -130,15 +130,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -213,7 +213,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -232,7 +232,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 index b3ef595e4989..7d0b1e228184 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 @@ -223,7 +223,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -232,11 +232,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ Name: crdb_internal_index_3_name_placeholder │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -251,7 +251,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -266,7 +266,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -278,7 +278,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -302,7 +302,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true @@ -314,7 +314,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 5 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 6 │ │ TableID: 104 │ │ @@ -354,7 +354,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ └── • 5 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -362,7 +362,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -395,7 +395,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 index e9d348da5af5..f709fd531b1c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 14 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -118,7 +118,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -127,7 +127,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 3 @@ -147,7 +147,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 4 @@ -166,7 +166,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 4 │ │ TableID: 104 │ │ @@ -234,7 +234,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 4 │ │ │ TableID: 104 │ │ │ @@ -369,7 +369,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 3 │ TableID: 104 │ @@ -518,15 +518,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 10 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -540,15 +540,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -652,7 +652,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -662,7 +662,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -670,11 +670,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeColumnAbsent + │ ├── • MakeDeleteOnlyColumnAbsent │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -743,7 +743,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ └── • 5 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -761,7 +761,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ IndexID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 index 98355ab0bfb7..ffdbe5230385 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 @@ -52,7 +52,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 4 │ │ │ TableID: 104 │ │ │ @@ -187,7 +187,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ │ │ └── • 1 Validation operation │ │ │ -│ │ └── • ValidateUniqueIndex +│ │ └── • ValidateIndex │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -280,7 +280,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ │ │ └── • 12 Mutation operations │ │ │ -│ │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly +│ │ ├── • MakePublicPrimaryIndexWriteOnly │ │ │ IndexID: 1 │ │ │ TableID: 104 │ │ │ @@ -294,7 +294,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ Name: t_pkey │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedPrimaryIndexPublic +│ │ ├── • MakeValidatedPrimaryIndexPublic │ │ │ EventBase: │ │ │ Authorization: │ │ │ UserName: root @@ -306,7 +306,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ IndexID: 3 │ │ │ TableID: 104 │ │ │ -│ │ ├── • MakeAddedIndexBackfilling +│ │ ├── • MakeAbsentIndexBackfilling │ │ │ Index: │ │ │ ConstraintID: 4 │ │ │ IndexID: 5 @@ -316,7 +316,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ TemporaryIndexID: 6 │ │ │ IsSecondaryIndex: true │ │ │ -│ │ ├── • MakeAddedTempIndexDeleteOnly +│ │ ├── • MakeAbsentTempIndexDeleteOnly │ │ │ Index: │ │ │ ConstraintID: 4 │ │ │ IndexID: 6 @@ -366,7 +366,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 6 │ │ │ TableID: 104 │ │ │ @@ -501,7 +501,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 5 │ TableID: 104 │ @@ -647,15 +647,15 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ │ └── • 10 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -664,19 +664,19 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ │ Name: idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 6 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 5 │ │ TableID: 104 │ │ @@ -801,7 +801,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ └── • 13 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -834,7 +834,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -844,7 +844,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ @@ -852,7 +852,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ IndexID: 4 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 6 │ TableID: 104 │ @@ -860,7 +860,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ IndexID: 6 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: @@ -872,7 +872,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ SubWorkID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index index 5810bda195ca..e349221ff49f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index @@ -81,7 +81,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ │ └── • 11 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 3 │ │ TableID: 106 │ │ @@ -106,7 +106,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ Name: crdb_internal_column_3_name_placeholder │ │ TableID: 106 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 5 │ │ IndexID: 4 @@ -133,7 +133,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ Ordinal: 1 │ │ TableID: 106 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 6 │ │ IndexID: 5 @@ -204,7 +204,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 5 │ │ │ TableID: 106 │ │ │ @@ -342,7 +342,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 4 │ TableID: 106 │ @@ -467,11 +467,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ │ └── • 8 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 3 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 106 │ │ @@ -485,11 +485,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ Name: test_pkey │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -538,7 +538,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ │ └── • 5 Mutation operations │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 5 │ │ TableID: 106 │ │ @@ -546,7 +546,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 106 │ │ @@ -622,7 +622,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE t.public.test DROP COLUMN pi @@ -644,7 +644,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ ColumnID: 3 │ TableID: 106 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 3 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 index 5391e33b684f..f7bbecc3592c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 @@ -115,7 +115,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: pi │ TableID: 106 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 3 │ EventBase: │ Authorization: @@ -130,7 +130,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -149,7 +149,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 4 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 index df55845e823b..7bc5c26c5bd5 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: pi │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -173,7 +173,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 index f26bc911df0e..5cc425ddcd64 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: pi │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -173,7 +173,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 index 171f547fdc30..4c03715f610e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 @@ -106,11 +106,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: pi │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -125,7 +125,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 106 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true @@ -173,7 +173,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 index b2cb52476125..f0be2556bc39 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 @@ -94,11 +94,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: pi │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -113,7 +113,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 106 │ │ @@ -164,7 +164,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -183,7 +183,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 4 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 index 1562e5a63836..d5b85e3a1b5c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 @@ -94,11 +94,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: pi │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -113,7 +113,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 106 │ │ @@ -164,7 +164,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -183,7 +183,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 4 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 index 380806d10abc..742f9e6beefa 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 @@ -94,15 +94,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: pi │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 106 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 5 │ │ TableID: 106 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -164,7 +164,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ StatementForDropJob: │ Rollback: true @@ -183,7 +183,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 4 │ TableID: 106 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 5 │ TableID: 106 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index index c8c9f37a11c4..be692fb4230f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index @@ -69,7 +69,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 9 Mutation operations │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -78,7 +78,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 3 @@ -92,7 +92,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ IndexID: 3 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 4 @@ -105,7 +105,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ IndexID: 4 │ │ TableID: 104 │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -169,7 +169,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 4 │ │ │ TableID: 104 │ │ │ @@ -301,7 +301,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 3 │ TableID: 104 │ @@ -417,11 +417,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ └── • 9 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -435,15 +435,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -516,7 +516,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j @@ -526,7 +526,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -534,7 +534,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -598,7 +598,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ └── • 5 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j @@ -616,7 +616,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ IndexID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 index 980fe2806d24..89b69a62a863 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 @@ -100,7 +100,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: t_j_idx │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -115,11 +115,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeAddedSecondaryIndexPublic + ├── • MakeValidatedSecondaryIndexPublic │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -138,7 +138,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 index 5faeff013fe5..864b60de5b25 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: t_j_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -162,7 +162,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 index 07de05e2f41f..7742727afb0b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: t_j_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -162,7 +162,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 index 63635aaa4d0e..444f52a52df2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 @@ -97,11 +97,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: t_j_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -116,11 +116,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -162,7 +162,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 index 91fa031e34ba..0948e5ac9a39 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 @@ -91,11 +91,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: t_j_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -110,11 +110,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 index 531eeed2f096..9fc07b92f272 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 @@ -91,11 +91,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: t_j_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -110,11 +110,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 index b08fc74cfabf..3d25f638fa4f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 @@ -91,15 +91,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: t_j_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -114,7 +114,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -153,7 +153,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index index c038dab96c5a..f02413822d0b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index @@ -42,7 +42,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ │ └── • 5 Mutation operations │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -51,7 +51,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ @@ -168,11 +168,11 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -255,7 +255,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Statement: DROP INDEX defaultdb.public.t@idx CASCADE @@ -265,7 +265,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ IndexID: 2 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 3 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index index 786eecf6eec0..366f957d65ac 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index @@ -42,7 +42,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ │ └── • 5 Mutation operations │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -51,7 +51,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ @@ -143,11 +143,11 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ │ └── • 4 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -235,7 +235,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Statement: DROP INDEX defaultdb.public.t@idx CASCADE @@ -245,7 +245,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ IndexID: 2 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 3 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index index 115b5238b578..2dfb0ddfd0b6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index @@ -27,7 +27,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ │ └── • 2 Mutation operations │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ │ │ └── • 3 Mutation operations │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -142,7 +142,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: │ Statement: DROP INDEX defaultdb.public.t@idx CASCADE diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 index 4a4fc7d46250..493ab48cafb9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 @@ -171,7 +171,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ Name: t_expr_k_idx │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ @@ -179,7 +179,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 4 │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 2 │ EventBase: │ Authorization: @@ -194,11 +194,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeAddedSecondaryIndexPublic + ├── • MakeValidatedSecondaryIndexPublic │ IndexID: 2 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 3 │ EventBase: │ Authorization: @@ -233,7 +233,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ├── • RefreshStats │ TableID: 104 │ - ├── • MakeColumnPublic + ├── • MakeWriteOnlyColumnPublic │ ColumnID: 4 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 index 25c8b0d4fa72..ab6fdf17af3d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 @@ -168,11 +168,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -187,11 +187,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -226,7 +226,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -264,7 +264,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 index 190e513440f0..392724ee59e3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 @@ -168,11 +168,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -187,11 +187,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -210,7 +210,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -226,7 +226,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -264,7 +264,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 index c7795d8dda12..e7751a1ddf26 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true @@ -187,11 +187,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -206,11 +206,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -226,7 +226,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -264,7 +264,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ └── • 4 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 index 8e6c0750b9ec..696da1167f4d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 @@ -162,11 +162,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -181,15 +181,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -205,7 +205,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -255,7 +255,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -274,7 +274,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 index 5c5c537c3e9e..239839e33769 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 @@ -162,11 +162,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -181,15 +181,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -205,7 +205,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -255,7 +255,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -274,7 +274,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 index 4f5bf853dd85..cb92e2656f3e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 @@ -162,15 +162,15 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ │ Name: t_expr_k_idx │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 2 │ │ EventBase: │ │ Authorization: @@ -185,11 +185,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeAddedSecondaryIndexPublic + │ ├── • MakeValidatedSecondaryIndexPublic │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 3 │ │ EventBase: │ │ Authorization: @@ -205,7 +205,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • RefreshStats │ │ TableID: 104 │ │ - │ ├── • MakeColumnPublic + │ ├── • MakeWriteOnlyColumnPublic │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -255,7 +255,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ └── • 6 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 3 │ StatementForDropJob: │ Rollback: true @@ -274,7 +274,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 3 │ TableID: 104 │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 4 │ TableID: 104 │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 index e9d348da5af5..f709fd531b1c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 14 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ @@ -118,7 +118,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: crdb_internal_column_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeDroppedNonPrimaryIndexDeleteAndWriteOnly +│ ├── • MakePublicSecondaryIndexWriteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ @@ -127,7 +127,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: crdb_internal_index_2_name_placeholder │ │ TableID: 104 │ │ -│ ├── • MakeAddedIndexBackfilling +│ ├── • MakeAbsentIndexBackfilling │ │ Index: │ │ ConstraintID: 2 │ │ IndexID: 3 @@ -147,7 +147,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeAddedTempIndexDeleteOnly +│ ├── • MakeAbsentTempIndexDeleteOnly │ │ Index: │ │ ConstraintID: 3 │ │ IndexID: 4 @@ -166,7 +166,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Kind: 2 │ │ TableID: 104 │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 4 │ │ TableID: 104 │ │ @@ -234,7 +234,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 4 │ │ │ TableID: 104 │ │ │ @@ -369,7 +369,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 3 │ TableID: 104 │ @@ -518,15 +518,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ └── • 10 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -540,15 +540,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -652,7 +652,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -662,7 +662,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -670,11 +670,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeColumnAbsent + │ ├── • MakeDeleteOnlyColumnAbsent │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -743,7 +743,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ └── • 5 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -761,7 +761,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ IndexID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 index 95d5a1e10703..e5d4e43418b0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 @@ -30,7 +30,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ │ └── • 3 Mutation operations │ │ -│ ├── • MakeDroppedColumnDeleteAndWriteOnly +│ ├── • MakePublicColumnWriteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ @@ -98,7 +98,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ │ │ │ └── • 3 Mutation operations │ │ │ -│ │ ├── • MakeAddedIndexDeleteAndWriteOnly +│ │ ├── • MakeDeleteOnlyIndexWriteOnly │ │ │ IndexID: 4 │ │ │ TableID: 104 │ │ │ @@ -230,7 +230,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ │ └── • 1 Validation operation │ │ -│ └── • ValidateUniqueIndex +│ └── • ValidateIndex │ IndexID: 3 │ TableID: 104 │ @@ -397,19 +397,19 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ │ └── • 12 Mutation operations │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 3 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedColumnDeleteOnly + │ ├── • MakeWriteOnlyColumnDeleteOnly │ │ ColumnID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedPrimaryIndexDeleteAndWriteOnly + │ ├── • MakePublicPrimaryIndexWriteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ @@ -429,15 +429,15 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ Name: t_pkey │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • MakeAddedPrimaryIndexPublic + │ ├── • MakeValidatedPrimaryIndexPublic │ │ EventBase: │ │ Authorization: │ │ UserName: root @@ -541,7 +541,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ SubWorkID: 1 │ │ TargetStatus: 1 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -551,7 +551,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ IndexID: 2 │ │ TableID: 104 │ │ - │ ├── • CreateGcJobForIndex + │ ├── • CreateGCJobForIndex │ │ IndexID: 4 │ │ TableID: 104 │ │ @@ -559,11 +559,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ IndexID: 4 │ │ TableID: 104 │ │ - │ ├── • MakeDroppedIndexDeleteOnly + │ ├── • MakeWriteOnlyIndexDeleteOnly │ │ IndexID: 1 │ │ TableID: 104 │ │ - │ ├── • MakeColumnAbsent + │ ├── • MakeDeleteOnlyColumnAbsent │ │ ColumnID: 4 │ │ EventBase: │ │ Authorization: @@ -693,7 +693,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ └── • 8 Mutation operations │ - ├── • CreateGcJobForIndex + ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE @@ -719,7 +719,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ ColumnID: 3 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: @@ -731,7 +731,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ SubWorkID: 1 │ TableID: 104 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 3 │ EventBase: │ Authorization: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema index 9f7f7a8f84c5..98677c5d4128 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema @@ -19,7 +19,7 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ └── • 1 Mutation operation │ │ │ └── • MarkDescriptorAsSyntheticallyDropped -│ DescID: 106 +│ DescriptorID: 106 │ ├── • PreCommitPhase │ │ @@ -75,7 +75,7 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ └── • 6 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 106 +│ │ DescriptorID: 106 │ │ │ ├── • RemoveSchemaParent │ │ Parent: diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table index df6b8b729c5c..40dfc4842067 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table @@ -57,7 +57,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ └── • 1 Mutation operation │ │ │ └── • MarkDescriptorAsSyntheticallyDropped -│ DescID: 107 +│ DescriptorID: 107 │ ├── • PreCommitPhase │ │ @@ -338,7 +338,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ └── • 6 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped -│ │ DescID: 107 +│ │ DescriptorID: 107 │ │ │ ├── • RemoveAllTableComments │ │ TableID: 107 @@ -492,12 +492,12 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ SubWorkID: 1 │ TargetStatus: 1 │ - ├── • CreateGcJobForTable + ├── • CreateGCJobForTable │ StatementForDropJob: │ Statement: DROP TABLE db.sc.t │ TableID: 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 1 │ EventBase: │ Authorization: @@ -509,7 +509,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ SubWorkID: 1 │ TableID: 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 2 │ EventBase: │ Authorization: @@ -521,7 +521,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ SubWorkID: 1 │ TableID: 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 3 │ EventBase: │ Authorization: @@ -533,7 +533,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ SubWorkID: 1 │ TableID: 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967295 │ EventBase: │ Authorization: @@ -545,7 +545,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ SubWorkID: 1 │ TableID: 107 │ - ├── • MakeColumnAbsent + ├── • MakeDeleteOnlyColumnAbsent │ ColumnID: 4294967294 │ EventBase: │ Authorization: diff --git a/pkg/sql/testdata/index_mutations/delete_preserving_delete b/pkg/sql/testdata/index_mutations/delete_preserving_delete index db6e214429db..45ba98072737 100644 --- a/pkg/sql/testdata/index_mutations/delete_preserving_delete +++ b/pkg/sql/testdata/index_mutations/delete_preserving_delete @@ -11,7 +11,7 @@ CREATE TABLE ti ( ); ---- -mutate-index ti index_to_mutate DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index ti index_to_mutate WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -38,7 +38,7 @@ CREATE TABLE tpi ( ); ---- -mutate-index tpi partial DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tpi partial WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -73,7 +73,7 @@ CREATE TABLE tei ( ) ---- -mutate-index tei t_a_plus_b_idx DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tei t_a_plus_b_idx WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -100,7 +100,7 @@ CREATE TABLE tii ( ) ---- -mutate-index tii inverted DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tii inverted WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -131,7 +131,7 @@ CREATE TABLE tmi ( ) ---- -mutate-index tmi inverted DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tmi inverted WRITE_ONLY use_delete_preserving_encoding=true ---- statement diff --git a/pkg/sql/testdata/index_mutations/delete_preserving_unique_index b/pkg/sql/testdata/index_mutations/delete_preserving_unique_index index 137a5353f18c..b0d52f7b46c0 100644 --- a/pkg/sql/testdata/index_mutations/delete_preserving_unique_index +++ b/pkg/sql/testdata/index_mutations/delete_preserving_unique_index @@ -11,7 +11,7 @@ CREATE TABLE ti ( ); ---- -mutate-index ti index_to_mutate DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index ti index_to_mutate WRITE_ONLY use_delete_preserving_encoding=true ---- statement diff --git a/pkg/sql/testdata/index_mutations/delete_preserving_update b/pkg/sql/testdata/index_mutations/delete_preserving_update index 6f1805770797..9103921a5607 100644 --- a/pkg/sql/testdata/index_mutations/delete_preserving_update +++ b/pkg/sql/testdata/index_mutations/delete_preserving_update @@ -11,7 +11,7 @@ CREATE TABLE ti ( ); ---- -mutate-index ti index_to_mutate DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index ti index_to_mutate WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -39,7 +39,7 @@ CREATE TABLE tpi ( ); ---- -mutate-index tpi partial DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tpi partial WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -102,7 +102,7 @@ CREATE TABLE tei ( ) ---- -mutate-index tei t_a_plus_b_idx DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tei t_a_plus_b_idx WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -140,7 +140,7 @@ CREATE TABLE tii ( ) ---- -mutate-index tii inverted DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tii inverted WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -176,7 +176,7 @@ CREATE TABLE tmi ( ) ---- -mutate-index tmi inverted DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tmi inverted WRITE_ONLY use_delete_preserving_encoding=true ---- statement diff --git a/pkg/sql/testdata/index_mutations/delete_preserving_upsert b/pkg/sql/testdata/index_mutations/delete_preserving_upsert index a934a90b0571..b4f906536b2e 100644 --- a/pkg/sql/testdata/index_mutations/delete_preserving_upsert +++ b/pkg/sql/testdata/index_mutations/delete_preserving_upsert @@ -11,7 +11,7 @@ CREATE TABLE ti ( ); ---- -mutate-index ti index_to_mutate DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index ti index_to_mutate WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -39,7 +39,7 @@ CREATE TABLE tpi ( ); ---- -mutate-index tpi partial DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tpi partial WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -102,7 +102,7 @@ CREATE TABLE tei ( ) ---- -mutate-index tei t_a_plus_b_idx DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tei t_a_plus_b_idx WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -148,7 +148,7 @@ CREATE TABLE tii ( ) ---- -mutate-index tii inverted DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tii inverted WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -183,7 +183,7 @@ CREATE TABLE tmi ( ) ---- -mutate-index tmi inverted DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tmi inverted WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -213,7 +213,7 @@ CREATE TABLE tui ( ); ---- -mutate-index tui index_to_mutate DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index tui index_to_mutate WRITE_ONLY use_delete_preserving_encoding=true ---- statement @@ -246,7 +246,7 @@ CREATE TABLE mcf ( ); ---- -mutate-index mcf multi_fam DELETE_AND_WRITE_ONLY use_delete_preserving_encoding=true +mutate-index mcf multi_fam WRITE_ONLY use_delete_preserving_encoding=true ---- statement diff --git a/pkg/sql/testdata/index_mutations/merging b/pkg/sql/testdata/index_mutations/merging index 139d949f72a7..fa61b84e2ca2 100644 --- a/pkg/sql/testdata/index_mutations/merging +++ b/pkg/sql/testdata/index_mutations/merging @@ -18,7 +18,7 @@ INSERT INTO ti VALUES (1, 1), (2, 2), (4, 4) mutate-index ti test_index_to_mutate MERGING ---- -# Insert that would conflict in DELETE_AND_WRITE_ONLY does not conflict +# Insert that would conflict in WRITE_ONLY does not conflict kvtrace INSERT INTO ti VALUES (3, 1) ---- diff --git a/pkg/sql/tests/rename_column_test.go b/pkg/sql/tests/rename_column_test.go index 2225f4db8079..994e3fd20528 100644 --- a/pkg/sql/tests/rename_column_test.go +++ b/pkg/sql/tests/rename_column_test.go @@ -40,7 +40,7 @@ func TestRenameColumnDuringConcurrentMutation(t *testing.T) { const ( _ eventType = iota - publishDeleteAndWriteOnly + publishWriteOnly backfill resume ) @@ -67,7 +67,7 @@ func TestRenameColumnDuringConcurrentMutation(t *testing.T) { Knobs: base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforePublishWriteAndDelete: func() { - maybeBlockOnEvent(publishDeleteAndWriteOnly) + maybeBlockOnEvent(publishWriteOnly) }, RunBeforeBackfill: func() error { maybeBlockOnEvent(backfill) @@ -96,7 +96,7 @@ func TestRenameColumnDuringConcurrentMutation(t *testing.T) { name string evType eventType }{ - {"publishDeleteAndWriteOnly", publishDeleteAndWriteOnly}, + {"publishWriteOnly", publishWriteOnly}, {"backfill", backfill}, {"resume", resume}, } {