diff --git a/docs/generated/eventlog.md b/docs/generated/eventlog.md index 122138045989..60e59e456ed7 100644 --- a/docs/generated/eventlog.md +++ b/docs/generated/eventlog.md @@ -647,8 +647,8 @@ An event of type `alter_database_add_region` is recorded when a region is added | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the database. | yes | -| `RegionName` | The region being added. | yes | +| `DatabaseName` | The name of the database. | no | +| `RegionName` | The region being added. | no | #### Common fields @@ -671,8 +671,8 @@ AlterDatabaseAddRegion is recorded when a region is added to a database. | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the database. | yes | -| `RegionName` | The region being dropped. | yes | +| `DatabaseName` | The name of the database. | no | +| `RegionName` | The region being dropped. | no | #### Common fields @@ -695,8 +695,8 @@ An event of type `alter_database_placement` is recorded when the database placem | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the database. | yes | -| `Placement` | The new placement policy. | yes | +| `DatabaseName` | The name of the database. | no | +| `Placement` | The new placement policy. | no | #### Common fields @@ -719,8 +719,8 @@ An event of type `alter_database_primary_region` is recorded when a primary regi | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the database. | yes | -| `PrimaryRegionName` | The new primary region. | yes | +| `DatabaseName` | The name of the database. | no | +| `PrimaryRegionName` | The new primary region. | no | #### Common fields @@ -766,8 +766,8 @@ An event of type `alter_database_survival_goal` is recorded when the survival go | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the database. | yes | -| `SurvivalGoal` | The new survival goal | yes | +| `DatabaseName` | The name of the database. | no | +| `SurvivalGoal` | The new survival goal | no | #### Common fields @@ -791,7 +791,7 @@ altered. | Field | Description | Sensitive | |--|--|--| -| `FunctionName` | Name of the affected function. | yes | +| `FunctionName` | Name of the affected function. | no | #### Common fields @@ -814,8 +814,8 @@ An event of type `alter_index` is recorded when an index is altered. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the affected index. | yes | -| `IndexName` | The name of the affected index. | yes | +| `TableName` | The name of the table containing the affected index. | no | +| `IndexName` | The name of the affected index. | no | | `MutationID` | The mutation ID for the asynchronous job that is processing the index update. | no | @@ -839,8 +839,8 @@ AlterIndex is recorded when an index visibility is altered. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the affected index. | yes | -| `IndexName` | The name of the affected index. | yes | +| `TableName` | The name of the table containing the affected index. | no | +| `IndexName` | The name of the affected index. | no | | `NotVisible` | Set true if index is not visible. NOTE: THIS FIELD IS DEPRECATED in favor of invisibility. | no | | `Invisibility` | The new invisibility of the affected index. | no | @@ -865,7 +865,7 @@ An event of type `alter_sequence` is recorded when a sequence is altered. | Field | Description | Sensitive | |--|--|--| -| `SequenceName` | The name of the affected sequence. | yes | +| `SequenceName` | The name of the affected sequence. | no | #### Common fields @@ -888,9 +888,9 @@ An event of type `alter_table` is recorded when a table is altered. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the affected table. | yes | +| `TableName` | The name of the affected table. | no | | `MutationID` | The mutation ID for the asynchronous job that is processing the index update, if any. | no | -| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | yes | +| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | no | #### Common fields @@ -913,7 +913,7 @@ EventAlterType is recorded when a user-defined type is altered. | Field | Description | Sensitive | |--|--|--| -| `TypeName` | The name of the affected type. | yes | +| `TypeName` | The name of the affected type. | no | #### Common fields @@ -936,8 +936,8 @@ An event of type `comment_on_column` is recorded when a column is commented. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the affected column. | yes | -| `ColumnName` | The affected column. | yes | +| `TableName` | The name of the table containing the affected column. | no | +| `ColumnName` | The affected column. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -962,8 +962,8 @@ An event of type `comment_on_constraint` is recorded when an constraint is comme | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the affected constraint. | yes | -| `ConstraintName` | The name of the affected constraint. | yes | +| `TableName` | The name of the table containing the affected constraint. | no | +| `ConstraintName` | The name of the affected constraint. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -988,7 +988,7 @@ CommentOnTable is recorded when a database is commented. | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the affected database. | yes | +| `DatabaseName` | The name of the affected database. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -1013,8 +1013,8 @@ An event of type `comment_on_index` is recorded when an index is commented. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the affected index. | yes | -| `IndexName` | The name of the affected index. | yes | +| `TableName` | The name of the table containing the affected index. | no | +| `IndexName` | The name of the affected index. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -1038,7 +1038,7 @@ An event of type `comment_on_index` is recorded when an index is commented. | Field | Description | Sensitive | |--|--|--| -| `SchemaName` | Name of the affected schema. | yes | +| `SchemaName` | Name of the affected schema. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -1063,7 +1063,7 @@ An event of type `comment_on_table` is recorded when a table is commented. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the affected table. | yes | +| `TableName` | The name of the affected table. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -1088,7 +1088,7 @@ An event of type `comment_on_type` is recorded when a type is commented. | Field | Description | Sensitive | |--|--|--| -| `TypeName` | The name of the affected type. | yes | +| `TypeName` | The name of the affected type. | no | | `Comment` | The new comment. | yes | | `NullComment` | Set to true if the comment was removed entirely. | no | @@ -1113,7 +1113,7 @@ An event of type `create_database` is recorded when a database is created. | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the new database. | yes | +| `DatabaseName` | The name of the new database. | no | #### Common fields @@ -1136,7 +1136,7 @@ An event of type `create_function` is recorded when a user-defined function is c | Field | Description | Sensitive | |--|--|--| -| `FunctionName` | Name of the created function. | yes | +| `FunctionName` | Name of the created function. | no | | `IsReplace` | If the new function is a replace of an existing function. | no | @@ -1160,8 +1160,8 @@ An event of type `create_index` is recorded when an index is created. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the new index. | yes | -| `IndexName` | The name of the new index. | yes | +| `TableName` | The name of the table containing the new index. | no | +| `IndexName` | The name of the new index. | no | | `MutationID` | The mutation ID for the asynchronous job that is processing the index update. | no | @@ -1185,8 +1185,8 @@ An event of type `create_schema` is recorded when a schema is created. | Field | Description | Sensitive | |--|--|--| -| `SchemaName` | The name of the new schema. | yes | -| `Owner` | The name of the owner for the new schema. | yes | +| `SchemaName` | The name of the new schema. | no | +| `Owner` | The name of the owner for the new schema. | no | #### Common fields @@ -1209,8 +1209,8 @@ An event of type `create_sequence` is recorded when a sequence is created. | Field | Description | Sensitive | |--|--|--| -| `SequenceName` | The name of the new sequence. | yes | -| `Owner` | The name of the owner for the new sequence. | yes | +| `SequenceName` | The name of the new sequence. | no | +| `Owner` | The name of the owner for the new sequence. | no | #### Common fields @@ -1237,7 +1237,7 @@ Events of this type are only collected when the cluster setting | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table for which the statistics were created. | yes | +| `TableName` | The name of the table for which the statistics were created. | no | #### Common fields @@ -1260,8 +1260,8 @@ An event of type `create_table` is recorded when a table is created. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the new table. | yes | -| `Owner` | The name of the owner for the new table. | yes | +| `TableName` | The name of the new table. | no | +| `Owner` | The name of the owner for the new table. | no | #### Common fields @@ -1284,8 +1284,8 @@ An event of type `create_type` is recorded when a user-defined type is created. | Field | Description | Sensitive | |--|--|--| -| `TypeName` | The name of the new type. | yes | -| `Owner` | The name of the owner for the new type. | yes | +| `TypeName` | The name of the new type. | no | +| `Owner` | The name of the owner for the new type. | no | #### Common fields @@ -1308,8 +1308,8 @@ An event of type `create_view` is recorded when a view is created. | Field | Description | Sensitive | |--|--|--| -| `ViewName` | The name of the new view. | yes | -| `Owner` | The name of the owner of the new view. | yes | +| `ViewName` | The name of the new view. | no | +| `Owner` | The name of the owner of the new view. | no | | `ViewQuery` | The SQL selection clause used to define the view. | yes | @@ -1333,8 +1333,8 @@ An event of type `drop_database` is recorded when a database is dropped. | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The name of the affected database. | yes | -| `DroppedSchemaObjects` | The names of the schemas dropped by a cascade operation. | yes | +| `DatabaseName` | The name of the affected database. | no | +| `DroppedSchemaObjects` | The names of the schemas dropped by a cascade operation. | no | #### Common fields @@ -1357,7 +1357,7 @@ An event of type `drop_function` is recorded when a user-defined function is dro | Field | Description | Sensitive | |--|--|--| -| `FunctionName` | Name of the created function. | yes | +| `FunctionName` | Name of the dropped function. | no | #### Common fields @@ -1380,10 +1380,10 @@ An event of type `drop_index` is recorded when an index is dropped. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the table containing the affected index. | yes | -| `IndexName` | The name of the affected index. | yes | +| `TableName` | The name of the table containing the affected index. | no | +| `IndexName` | The name of the affected index. | no | | `MutationID` | The mutation ID for the asynchronous job that is processing the index update. | no | -| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | yes | +| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | no | #### Common fields @@ -1406,7 +1406,7 @@ An event of type `drop_schema` is recorded when a schema is dropped. | Field | Description | Sensitive | |--|--|--| -| `SchemaName` | The name of the affected schema. | yes | +| `SchemaName` | The name of the affected schema. | no | #### Common fields @@ -1429,7 +1429,7 @@ An event of type `drop_sequence` is recorded when a sequence is dropped. | Field | Description | Sensitive | |--|--|--| -| `SequenceName` | The name of the affected sequence. | yes | +| `SequenceName` | The name of the affected sequence. | no | #### Common fields @@ -1452,8 +1452,8 @@ An event of type `drop_table` is recorded when a table is dropped. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the affected table. | yes | -| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | yes | +| `TableName` | The name of the affected table. | no | +| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | no | #### Common fields @@ -1476,7 +1476,7 @@ An event of type `drop_type` is recorded when a user-defined type is dropped. | Field | Description | Sensitive | |--|--|--| -| `TypeName` | The name of the affected type. | yes | +| `TypeName` | The name of the affected type. | no | #### Common fields @@ -1499,8 +1499,8 @@ An event of type `drop_view` is recorded when a view is dropped. | Field | Description | Sensitive | |--|--|--| -| `ViewName` | The name of the affected view. | yes | -| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | yes | +| `ViewName` | The name of the affected view. | no | +| `CascadeDroppedViews` | The names of the views dropped as a result of a cascade operation. | no | #### Common fields @@ -1587,8 +1587,8 @@ An event of type `rename_database` is recorded when a database is renamed. | Field | Description | Sensitive | |--|--|--| -| `DatabaseName` | The old name of the affected database. | yes | -| `NewDatabaseName` | The new name of the affected database. | yes | +| `DatabaseName` | The old name of the affected database. | no | +| `NewDatabaseName` | The new name of the affected database. | no | #### Common fields @@ -1611,8 +1611,8 @@ An event of type `rename_function` is recorded when a user-defined function is r | Field | Description | Sensitive | |--|--|--| -| `FunctionName` | The old name of the affected function. | yes | -| `NewFunctionName` | The new name of the affected function. | yes | +| `FunctionName` | The old name of the affected function. | no | +| `NewFunctionName` | The new name of the affected function. | no | #### Common fields @@ -1635,8 +1635,8 @@ An event of type `rename_schema` is recorded when a schema is renamed. | Field | Description | Sensitive | |--|--|--| -| `SchemaName` | The old name of the affected schema. | yes | -| `NewSchemaName` | The new name of the affected schema. | yes | +| `SchemaName` | The old name of the affected schema. | no | +| `NewSchemaName` | The new name of the affected schema. | no | #### Common fields @@ -1659,8 +1659,8 @@ An event of type `rename_table` is recorded when a table, sequence or view is re | Field | Description | Sensitive | |--|--|--| -| `TableName` | The old name of the affected table. | yes | -| `NewTableName` | The new name of the affected table. | yes | +| `TableName` | The old name of the affected table. | no | +| `NewTableName` | The new name of the affected table. | no | #### Common fields @@ -1683,8 +1683,8 @@ An event of type `rename_type` is recorded when a user-defined type is renamed. | Field | Description | Sensitive | |--|--|--| -| `TypeName` | The old name of the affected type. | yes | -| `NewTypeName` | The new name of the affected type. | yes | +| `TypeName` | The old name of the affected type. | no | +| `NewTypeName` | The new name of the affected type. | no | #### Common fields @@ -1708,7 +1708,7 @@ encounters a problem and is reversed. | Field | Description | Sensitive | |--|--|--| -| `Error` | The error encountered that caused the schema change to be reversed. The specific format of the error is variable and can change across releases without warning. | yes | +| `Error` | The error encountered that caused the schema change to be reversed. The specific format of the error is variable and can change across releases without warning. | partially | | `SQLSTATE` | The SQLSTATE code for the error. | no | | `LatencyNanos` | The amount of time the schema change job took before being reverted. | no | @@ -1730,9 +1730,9 @@ An event of type `set_schema` is recorded when a table, view, sequence or type's | Field | Description | Sensitive | |--|--|--| -| `DescriptorName` | The old name of the affected descriptor. | yes | -| `NewDescriptorName` | The new name of the affected descriptor. | yes | -| `DescriptorType` | The descriptor type being changed (table, view, sequence, type). | yes | +| `DescriptorName` | The old name of the affected descriptor. | no | +| `NewDescriptorName` | The new name of the affected descriptor. | no | +| `DescriptorType` | The descriptor type being changed (table, view, sequence, type). | no | #### Common fields @@ -1755,7 +1755,7 @@ An event of type `truncate_table` is recorded when a table is truncated. | Field | Description | Sensitive | |--|--|--| -| `TableName` | The name of the affected table. | yes | +| `TableName` | The name of the affected table. | no | #### Common fields @@ -1784,7 +1784,7 @@ patch releases without advance notice. |--|--|--| | `ParentID` | | no | | `ParentSchemaID` | | no | -| `Name` | | yes | +| `Name` | | no | | `Force` | | no | | `ForceNotice` | | yes | @@ -1815,7 +1815,7 @@ patch releases without advance notice. |--|--|--| | `ParentID` | | no | | `ParentSchemaID` | | no | -| `Name` | | yes | +| `Name` | | no | | `Force` | | no | | `ForceNotice` | | yes | @@ -1873,7 +1873,7 @@ patch releases without advance notice. |--|--|--| | `ParentID` | | no | | `ParentSchemaID` | | no | -| `Name` | | yes | +| `Name` | | no | | `PreviousID` | | no | | `Force` | | no | | `FailedValidation` | | no | diff --git a/docs/generated/settings/settings-for-tenants.txt b/docs/generated/settings/settings-for-tenants.txt index b1fe3e24708f..5eee965fc0a2 100644 --- a/docs/generated/settings/settings-for-tenants.txt +++ b/docs/generated/settings/settings-for-tenants.txt @@ -271,6 +271,7 @@ sql.insights.anomaly_detection.memory_limit byte size 1.0 MiB the maximum amount sql.insights.execution_insights_capacity integer 1000 the size of the per-node store of execution insights application sql.insights.high_retry_count.threshold integer 10 the number of retries a slow statement must have undergone for its high retry count to be highlighted as a potential problem application sql.insights.latency_threshold duration 100ms amount of time after which an executing statement is considered slow. Use 0 to disable. application +sql.log.redact_names.enabled boolean false if set, schema object identifers are redacted in SQL statements that appear in event logs application sql.log.slow_query.experimental_full_table_scans.enabled boolean false when set to true, statements that perform a full table/index scan will be logged to the slow query log even if they do not meet the latency threshold. Must have the slow query log enabled for this setting to have any effect. application sql.log.slow_query.internal_queries.enabled boolean false when set to true, internal queries which exceed the slow query log threshold are logged to a separate log. Must have the slow query log enabled for this setting to have any effect. application sql.log.slow_query.latency_threshold duration 0s when set to non-zero, log statements whose service latency exceeds the threshold to a secondary logger on each node application diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html index 9f52ffe7e320..4b251df5a3a6 100644 --- a/docs/generated/settings/settings.html +++ b/docs/generated/settings/settings.html @@ -222,6 +222,7 @@
sql.insights.execution_insights_capacity
integer1000the size of the per-node store of execution insightsServerless/Dedicated/Self-Hosted
sql.insights.high_retry_count.threshold
integer10the number of retries a slow statement must have undergone for its high retry count to be highlighted as a potential problemServerless/Dedicated/Self-Hosted
sql.insights.latency_threshold
duration100msamount of time after which an executing statement is considered slow. Use 0 to disable.Serverless/Dedicated/Self-Hosted +
sql.log.redact_names.enabled
booleanfalseif set, schema object identifers are redacted in SQL statements that appear in event logsServerless/Dedicated/Self-Hosted
sql.log.slow_query.experimental_full_table_scans.enabled
booleanfalsewhen set to true, statements that perform a full table/index scan will be logged to the slow query log even if they do not meet the latency threshold. Must have the slow query log enabled for this setting to have any effect.Serverless/Dedicated/Self-Hosted
sql.log.slow_query.internal_queries.enabled
booleanfalsewhen set to true, internal queries which exceed the slow query log threshold are logged to a separate log. Must have the slow query log enabled for this setting to have any effect.Serverless/Dedicated/Self-Hosted
sql.log.slow_query.latency_threshold
duration0swhen set to non-zero, log statements whose service latency exceeds the threshold to a secondary logger on each nodeServerless/Dedicated/Self-Hosted diff --git a/pkg/ccl/auditloggingccl/audit_logging_test.go b/pkg/ccl/auditloggingccl/audit_logging_test.go index d77ffa35f04d..e17d4e47a796 100644 --- a/pkg/ccl/auditloggingccl/audit_logging_test.go +++ b/pkg/ccl/auditloggingccl/audit_logging_test.go @@ -355,7 +355,7 @@ func TestReducedAuditConfig(t *testing.T) { // Run a query on the new connection. The new connection will cause the reduced audit config to be re-computed. // The user now has a corresponding audit setting. We use a new query here to differentiate. - testRunner2.Exec(t, `GRANT SELECT ON TABLE u TO root`) + testRunner2.Exec(t, `ALTER TABLE u ADD COLUMN y STRING DEFAULT 'foo'`) log.FlushFiles() @@ -363,14 +363,12 @@ func TestReducedAuditConfig(t *testing.T) { 0, math.MaxInt64, 10000, - regexp.MustCompile(`GRANT SELECT ON TABLE ‹u› TO root`), + regexp.MustCompile(`ALTER TABLE u ADD COLUMN y STRING DEFAULT ‹'foo'›`), log.WithMarkedSensitiveData, ) - if err != nil { t.Fatal(err) } - if len(entries) != 1 { t.Fatal(errors.Newf("unexpected number of entries; expected: %d found: %d", 1, len(entries))) } diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain index e004791b05b1..dfa9c82a26cd 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 12 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain index 090408371ce1..63365b471e98 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain index f07bff2e4bd4..5f86a0bf63ae 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain index 5d26a70294d2..6973bfe02335 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain index 69b92b84f871..957f1eba14b5 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain index 7d27954d0a92..f12c1b193714 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain index 555ca23a54c6..36f4d0fab3b9 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain @@ -8,7 +8,7 @@ CREATE INDEX idx PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX idx ON defaultdb.public.t (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/admin_audit_log_test.go b/pkg/sql/admin_audit_log_test.go index 3ee178afd823..897f040a059a 100644 --- a/pkg/sql/admin_audit_log_test.go +++ b/pkg/sql/admin_audit_log_test.go @@ -139,7 +139,7 @@ func TestAdminAuditLogTransaction(t *testing.T) { db.Exec(t, `SET CLUSTER SETTING sql.log.admin_audit.enabled = true;`) db.Exec(t, ` BEGIN; -CREATE TABLE t(); +CREATE TABLE t(a INT8 PRIMARY KEY DEFAULT 2); SELECT * FROM t; SELECT 1; COMMIT; @@ -155,11 +155,11 @@ COMMIT; }, { "select-*-from-table-query", - `"EventType":"admin_query","Statement":"SELECT * FROM ‹\"\"›.‹\"\"›.‹t›"`, + `"EventType":"admin_query","Statement":"SELECT * FROM \"\".\"\".t"`, }, { "create-table-query", - `"EventType":"admin_query","Statement":"CREATE TABLE ‹defaultdb›.public.‹t› ()"`, + `"EventType":"admin_query","Statement":"CREATE TABLE defaultdb.public.t (a INT8 PRIMARY KEY DEFAULT ‹2›)"`, }, } @@ -222,7 +222,7 @@ func TestAdminAuditLogMultipleTransactions(t *testing.T) { if _, err := testuser.Exec(` BEGIN; -CREATE TABLE t(); +CREATE TABLE t(a INT8 PRIMARY KEY DEFAULT 2); SELECT * FROM t; SELECT 1; COMMIT; @@ -240,11 +240,11 @@ COMMIT; }, { "select-*-from-table-query", - `"EventType":"admin_query","Statement":"SELECT * FROM ‹\"\"›.‹\"\"›.‹t›"`, + `"EventType":"admin_query","Statement":"SELECT * FROM \"\".\"\".t"`, }, { "create-table-query", - `"EventType":"admin_query","Statement":"CREATE TABLE ‹defaultdb›.public.‹t› ()"`, + `"EventType":"admin_query","Statement":"CREATE TABLE defaultdb.public.t (a INT8 PRIMARY KEY DEFAULT ‹2›)"`, }, } diff --git a/pkg/sql/catalog/internal/validate/schema_changer_state.go b/pkg/sql/catalog/internal/validate/schema_changer_state.go index 088c7116d2a9..8a07ed65e7f3 100644 --- a/pkg/sql/catalog/internal/validate/schema_changer_state.go +++ b/pkg/sql/catalog/internal/validate/schema_changer_state.go @@ -113,7 +113,7 @@ func validateSchemaChangerState(d catalog.Descriptor, vea catalog.ValidationErro statementRanks.Add(int(s.StatementRank)) if _, ok := statementsExpected[s.StatementRank]; !ok { report(errors.Errorf("unexpected statement %d (%s)", - s.StatementRank, s.Statement.Statement)) + s.StatementRank, s.Statement.RedactedStatement)) } } diff --git a/pkg/sql/catalog/internal/validate/schema_changer_state_test.go b/pkg/sql/catalog/internal/validate/schema_changer_state_test.go index 92aa75ba88b8..f58807dfe573 100644 --- a/pkg/sql/catalog/internal/validate/schema_changer_state_test.go +++ b/pkg/sql/catalog/internal/validate/schema_changer_state_test.go @@ -100,7 +100,8 @@ func TestValidateSchemaChangerState(t *testing.T) { RelevantStatements: []scpb.DescriptorState_Statement{ { Statement: scpb.Statement{ - Statement: "ALTER TABLE a RENAME TO b", + Statement: "ALTER TABLE a RENAME TO b", + RedactedStatement: "ALTER TABLE a RENAME TO b", }, StatementRank: 0, }, diff --git a/pkg/sql/catalog/redact/redact.go b/pkg/sql/catalog/redact/redact.go index a75cefe69a55..91b588b40e9b 100644 --- a/pkg/sql/catalog/redact/redact.go +++ b/pkg/sql/catalog/redact/redact.go @@ -82,7 +82,7 @@ func redactTableDescriptor(d *descpb.TableDescriptor) (errs []error) { if scs := d.DeclarativeSchemaChangerState; scs != nil { for i := range scs.RelevantStatements { stmt := &scs.RelevantStatements[i] - stmt.Statement.Statement = stmt.Statement.RedactedStatement + stmt.Statement.Statement = stmt.Statement.RedactedStatement.StripMarkers() } for i := range scs.Targets { t := &scs.Targets[i] @@ -219,7 +219,7 @@ func redactFunctionDescriptor(desc *descpb.FunctionDescriptor) (errs []error) { if scs := desc.DeclarativeSchemaChangerState; scs != nil { for i := range scs.RelevantStatements { stmt := &scs.RelevantStatements[i] - stmt.Statement.Statement = stmt.Statement.RedactedStatement + stmt.Statement.Statement = stmt.Statement.RedactedStatement.StripMarkers() } for i := range scs.Targets { t := &scs.Targets[i] diff --git a/pkg/sql/conn_executor_exec.go b/pkg/sql/conn_executor_exec.go index 287e684a5d6e..952b16e4cb42 100644 --- a/pkg/sql/conn_executor_exec.go +++ b/pkg/sql/conn_executor_exec.go @@ -2211,7 +2211,7 @@ func (ex *connExecutor) handleTxnRowsGuardrails( *alreadyLogged = shouldLog } if shouldLog { - commonSQLEventDetails := ex.planner.getCommonSQLEventDetails(defaultRedactionOptions) + commonSQLEventDetails := ex.planner.getCommonSQLEventDetails() var event logpb.EventPayload if ex.executorType == executorTypeInternal { if isRead { diff --git a/pkg/sql/event_log.go b/pkg/sql/event_log.go index bca393a0ca71..dce5e8867d2d 100644 --- a/pkg/sql/event_log.go +++ b/pkg/sql/event_log.go @@ -21,7 +21,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/isql" "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scbuild" "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scrun" - "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sessiondata" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/log/eventpb" @@ -156,33 +155,10 @@ type eventLogOptions struct { // If verboseTraceLevel is non-zero, its value is used as value for // the vmodule filter. See exec_log for an example use. verboseTraceLevel log.Level - - // Additional redaction options, if necessary. - rOpts redactionOptions -} - -// redactionOptions contains instructions on how to redact the SQL -// events. -type redactionOptions struct { - omitSQLNameRedaction bool } -func (ro *redactionOptions) toFlags() tree.FmtFlags { - if ro.omitSQLNameRedaction { - return tree.FmtOmitNameRedaction - } - return tree.FmtSimple -} - -var defaultRedactionOptions = redactionOptions{ - omitSQLNameRedaction: false, -} - -func (p *planner) getCommonSQLEventDetails(opt redactionOptions) eventpb.CommonSQLEventDetails { - redactableStmt := formatStmtKeyAsRedactableString( - p.extendedEvalCtx.VirtualSchemas, p.stmt.AST, - p.extendedEvalCtx.Context.Annotations, opt.toFlags(), p, - ) +func (p *planner) getCommonSQLEventDetails() eventpb.CommonSQLEventDetails { + redactableStmt := p.FormatAstAsRedactableString(p.stmt.AST, p.extendedEvalCtx.Context.Annotations) commonSQLEventDetails := eventpb.CommonSQLEventDetails{ Statement: redactableStmt, Tag: p.stmt.AST.StatementTag(), @@ -210,7 +186,7 @@ func (p *planner) logEventsWithOptions( p.extendedEvalCtx.ExecCfg, p.InternalSQLTxn(), 1+depth, opts, - p.getCommonSQLEventDetails(opts.rOpts), + p.getCommonSQLEventDetails(), entries...) } diff --git a/pkg/sql/event_log_test.go b/pkg/sql/event_log_test.go index e3b0cadfe572..fe8f0851ef10 100644 --- a/pkg/sql/event_log_test.go +++ b/pkg/sql/event_log_test.go @@ -147,21 +147,21 @@ func TestPerfLogging(t *testing.T) { { query: `INSERT INTO t VALUES (1, pg_sleep(0.256), 'x')`, errRe: ``, - logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*‹t› VALUES \(‹1›, pg_sleep\(‹0.256›\), ‹'x'›\)","Tag":"INSERT","User":"root"`, + logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*\.t VALUES \(‹1›, pg_sleep\(‹0.256›\), ‹'x'›\)","Tag":"INSERT","User":"root"`, logExpected: true, channel: channel.SQL_PERF, }, { query: `INSERT INTO t VALUES (1, pg_sleep(0.256), 'x')`, errRe: `duplicate key`, - logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*‹t› VALUES \(‹1›, ‹pg_sleep›\(‹0.256›\), ‹'x'›\)","Tag":"INSERT","User":"root"`, + logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*\.t VALUES \(‹1›, pg_sleep\(‹0.256›\), ‹'x'›\)","Tag":"INSERT","User":"root"`, logExpected: true, channel: channel.SQL_PERF, }, { query: `INSERT INTO t VALUES (2, pg_sleep(0.256), 'x')`, errRe: ``, - logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*‹t› VALUES \(‹2›, pg_sleep\(‹0.256›\), ‹'x'›\)","Tag":"INSERT","User":"root","ExecMode":"exec","NumRows":1`, + logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*\.t VALUES \(‹2›, pg_sleep\(‹0.256›\), ‹'x'›\)","Tag":"INSERT","User":"root","ExecMode":"exec","NumRows":1`, logExpected: true, channel: channel.SQL_PERF, }, @@ -175,7 +175,7 @@ func TestPerfLogging(t *testing.T) { { query: `INSERT INTO t VALUES (4, pg_sleep(0.256), repeat('x', 1024))`, errRe: ``, - logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*‹t› VALUES \(‹4›, pg_sleep\(‹0.256›\), repeat\(‹'x'›, ‹1024›\)\)","Tag":"INSERT","User":"root","ExecMode":"exec","NumRows":1`, + logRe: `"EventType":"slow_query","Statement":"INSERT INTO .*\.t VALUES \(‹4›, pg_sleep\(‹0.256›\), repeat\(‹'x'›, ‹1024›\)\)","Tag":"INSERT","User":"root","ExecMode":"exec","NumRows":1`, logExpected: true, channel: channel.SQL_PERF, }, @@ -189,7 +189,7 @@ func TestPerfLogging(t *testing.T) { { query: `SELECT *, pg_sleep(0.064) FROM t`, errRe: ``, - logRe: `"EventType":"slow_query","Statement":"SELECT \*, pg_sleep\(‹0.064›\) FROM .*‹t›","Tag":"SELECT","User":"root","ExecMode":"exec","NumRows":4`, + logRe: `"EventType":"slow_query","Statement":"SELECT \*, pg_sleep\(‹0.064›\) FROM .*\.t","Tag":"SELECT","User":"root","ExecMode":"exec","NumRows":4`, logExpected: true, channel: channel.SQL_PERF, }, @@ -504,14 +504,14 @@ func TestPerfLogging(t *testing.T) { { query: `SELECT * FROM t WHERE i = 6`, errRe: ``, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› = ‹6›","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i = ‹6›","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*`, logExpected: false, channel: channel.SQL_PERF, }, { query: `SELECT * FROM t WHERE i IN (6, 7, 8)`, errRe: ``, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› IN \(‹6›, ‹7›, ‹8›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":3`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i IN \(‹6›, ‹7›, ‹8›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":3`, logExpected: true, channel: channel.SQL_PERF, }, @@ -520,7 +520,7 @@ func TestPerfLogging(t *testing.T) { cleanup: `COMMIT`, query: `SELECT * FROM t WHERE i = 6; SELECT * FROM t WHERE i = 7; SELECT * FROM t WHERE i = 8;`, errRe: ``, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› = ‹8›","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":3`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i = ‹8›","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":3`, logExpected: true, channel: channel.SQL_PERF, }, @@ -529,14 +529,14 @@ func TestPerfLogging(t *testing.T) { cleanup: `RESET transaction_rows_read_log`, query: `SELECT * FROM t WHERE i IN (6, 7)`, errRe: ``, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› IN \(‹6›, ‹7›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":2`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i IN \(‹6›, ‹7›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":2`, logExpected: true, channel: channel.SQL_PERF, }, { query: `SELECT * FROM t WHERE i IN (6, 7, 8, 9)`, errRe: `pq: txn has read 4 rows, which is above the limit: TxnID .* SessionID .*`, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› IN \(‹6›, ‹7›, ‹8›, ‹9›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":4`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i IN \(‹6›, ‹7›, ‹8›, ‹9›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":4`, logExpected: true, channel: channel.SQL_PERF, }, @@ -545,7 +545,7 @@ func TestPerfLogging(t *testing.T) { cleanup: `ROLLBACK`, query: `SELECT * FROM t WHERE i IN (6, 7); SELECT * FROM t WHERE i IN (8, 9)`, errRe: `pq: txn has read 4 rows, which is above the limit: TxnID .* SessionID .*`, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› IN \(‹8›, ‹9›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":4`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i IN \(‹8›, ‹9›\)","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*,"NumRows":4`, logExpected: true, channel: channel.SQL_PERF, }, @@ -554,7 +554,7 @@ func TestPerfLogging(t *testing.T) { cleanup: `RESET transaction_rows_read_err`, query: `SELECT * FROM t WHERE i = 6 OR i = 7`, errRe: `pq: txn has read 2 rows, which is above the limit: TxnID .* SessionID .*`, - logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*‹t› WHERE ‹i› = ‹6› OR ‹i› = ‹7›","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*`, + logRe: `"EventType":"txn_rows_read_limit","Statement":"SELECT \* FROM .*\.t WHERE i = ‹6› OR ‹i› = ‹7›","Tag":"SELECT","User":"root","TxnID":.*,"SessionID":.*`, logExpected: false, channel: channel.SQL_PERF, }, diff --git a/pkg/sql/exec_log.go b/pkg/sql/exec_log.go index 1ecb31dd94ab..7acd58e11fe4 100644 --- a/pkg/sql/exec_log.go +++ b/pkg/sql/exec_log.go @@ -436,7 +436,7 @@ func (p *planner) maybeLogStatementInternal( SchemaChangerMode: p.curPlan.instrumentation.schemaChangerMode.String(), } - p.logOperationalEventsOnlyExternally(ctx, sampledQuery) + p.logEventsOnlyExternally(ctx, sampledQuery) } } @@ -532,17 +532,3 @@ func (p *planner) logEventsOnlyExternally(ctx context.Context, entries ...logpb. eventLogOptions{dst: LogExternally}, entries...) } - -// logOperationalEventsOnlyExternally is a helper that sets redaction -// options to omit SQL Name redaction. This is used when logging to -// the telemetry channel when we want additional metadata available. -func (p *planner) logOperationalEventsOnlyExternally( - ctx context.Context, entries ...logpb.EventPayload, -) { - // The API contract for logEventsWithOptions() is that it returns - // no error when system.eventlog is not written to. - _ = p.logEventsWithOptions(ctx, - 2, /* depth: we want to use the caller location */ - eventLogOptions{dst: LogExternally, rOpts: redactionOptions{omitSQLNameRedaction: true}}, - entries...) -} diff --git a/pkg/sql/exec_util.go b/pkg/sql/exec_util.go index d43e7de8b3c7..b5cb8de5439b 100644 --- a/pkg/sql/exec_util.go +++ b/pkg/sql/exec_util.go @@ -3894,19 +3894,35 @@ func scrubStmtStatKey(vt VirtualTabler, key string, ns eval.ClientNoticeSender) return f.CloseAndGetString(), true } +var redactNamesInSQLStatementLog = settings.RegisterBoolSetting( + settings.ApplicationLevel, + "sql.log.redact_names.enabled", + "if set, schema object identifers are redacted in SQL statements that appear in event logs", + false, + settings.WithPublic, +) + +// FormatAstAsRedactableString implements scbuild.AstFormatter +func (p *planner) FormatAstAsRedactableString( + statement tree.Statement, annotations *tree.Annotations, +) redact.RedactableString { + fs := tree.FmtSimple | tree.FmtAlwaysQualifyTableNames | tree.FmtMarkRedactionNode + if !redactNamesInSQLStatementLog.Get(&p.extendedEvalCtx.Settings.SV) { + fs = fs | tree.FmtOmitNameRedaction + } + return formatStmtKeyAsRedactableString(statement, annotations, fs) +} + // formatStmtKeyAsRedactableString given an AST node this function will fully // qualify names using annotations to format it out into a redactable string. +// Object names are not redacted, but constants and datums are. func formatStmtKeyAsRedactableString( - vt VirtualTabler, - rootAST tree.Statement, - ann *tree.Annotations, - fs tree.FmtFlags, - ns eval.ClientNoticeSender, + rootAST tree.Statement, ann *tree.Annotations, fs tree.FmtFlags, ) redact.RedactableString { f := tree.NewFmtCtx( - tree.FmtAlwaysQualifyTableNames|tree.FmtMarkRedactionNode|fs, + fs, tree.FmtAnnotations(ann), - tree.FmtReformatTableNames(hideNonVirtualTableNameFunc(vt, ns))) + ) f.FormatNode(rootAST) formattedRedactableStatementString := f.CloseAndGetString() return redact.RedactableString(formattedRedactableStatementString) diff --git a/pkg/sql/opt/exec/execbuilder/testdata/show_trace b/pkg/sql/opt/exec/execbuilder/testdata/show_trace index 9f944fd6af09..aae387398e24 100644 --- a/pkg/sql/opt/exec/execbuilder/testdata/show_trace +++ b/pkg/sql/opt/exec/execbuilder/testdata/show_trace @@ -165,7 +165,7 @@ query TT $trace_query ---- sql query rows affected: 0 -commit sql txn CPut /Table/3/1/109/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 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 > 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 > columns: nullable:false default_expr:"unique_rowid()" hidden:true 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:4 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 invisibility:0 > next_index_id:2 privileges: users: owner_proto:"root" version:3 > next_mutation_id:1 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:PUBLIC current_statuses:PUBLIC target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 target_ranks:23 target_ranks:24 target_ranks:25 target_ranks:26 target_ranks:27 target_ranks:28 target_ranks:29 target_ranks:30 relevant_statements: > authorization: name_mapping: > drop_time:... replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"TABLE t.public.kv" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:2 import_start_wall_time:0 schema_locked:false import_epoch:0 import_type:IMPORT_WITH_START_TIME_ONLY > +commit sql txn CPut /Table/3/1/109/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 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 > 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 > columns: nullable:false default_expr:"unique_rowid()" hidden:true 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:4 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 invisibility:0 > next_index_id:2 privileges: users: owner_proto:"root" version:3 > next_mutation_id:1 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:PUBLIC current_statuses:PUBLIC target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 target_ranks:23 target_ranks:24 target_ranks:25 target_ranks:26 target_ranks:27 target_ranks:28 target_ranks:29 target_ranks:30 relevant_statements: > authorization: name_mapping: > drop_time:... replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"TABLE t.public.kv" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:2 import_start_wall_time:0 schema_locked:false import_epoch:0 import_type:IMPORT_WITH_START_TIME_ONLY > commit sql txn Del /NamespaceTable/30/1/106/107/"kv2"/4/1 statement ok @@ -194,7 +194,7 @@ query TT $trace_query ---- sql query rows affected: 0 -commit sql txn CPut /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 invisibility:0 > next_index_id:4 privileges: users: owner_proto:"root" version:3 > 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 invisibility:0 > state:WRITE_ONLY direction:DROP mutation_id:2 rollback:false > next_mutation_id:2 format_version:3 state:PUBLIC offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:PUBLIC > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata:<> target_status:PUBLIC > current_statuses:PUBLIC current_statuses:PUBLIC current_statuses:PUBLIC current_statuses:VALIDATED current_statuses:PUBLIC current_statuses:PUBLIC current_statuses:PUBLIC target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 relevant_statements: > authorization: name_mapping: columns: columns: columns: families: indexes: > > 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 schema_locked:false import_epoch:0 import_type:IMPORT_WITH_START_TIME_ONLY > +commit sql txn CPut /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 invisibility:0 > next_index_id:4 privileges: users: owner_proto:"root" version:3 > 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 invisibility:0 > state:WRITE_ONLY direction:DROP mutation_id:2 rollback:false > next_mutation_id:2 format_version:3 state:PUBLIC offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:PUBLIC > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata:<> target_status:PUBLIC > current_statuses:PUBLIC current_statuses:PUBLIC current_statuses:PUBLIC current_statuses:VALIDATED current_statuses:PUBLIC current_statuses:PUBLIC current_statuses:PUBLIC target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 relevant_statements: > authorization: name_mapping: columns: columns: columns: families: indexes: > > 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 schema_locked:false import_epoch:0 import_type:IMPORT_WITH_START_TIME_ONLY > statement ok SET tracing = on,kv,results; DROP TABLE t.kv @@ -206,7 +206,7 @@ query TT $trace_query ---- sql query rows affected: 0 -commit sql txn CPut /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 invisibility:0 > next_index_id:4 privileges: users: owner_proto:"root" version:3 > next_mutation_id:2 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:PUBLIC current_statuses:PUBLIC target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 target_ranks:23 target_ranks:24 target_ranks:25 relevant_statements: > authorization: name_mapping: > drop_time:... 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 schema_locked:false import_epoch:0 import_type:IMPORT_WITH_START_TIME_ONLY > +commit sql txn CPut /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 invisibility:0 > next_index_id:4 privileges: users: owner_proto:"root" version:3 > next_mutation_id:2 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true element_creation_metadata: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:PUBLIC current_statuses:PUBLIC target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 target_ranks:23 target_ranks:24 target_ranks:25 relevant_statements: > authorization: name_mapping: > drop_time:... 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 schema_locked:false import_epoch:0 import_type:IMPORT_WITH_START_TIME_ONLY > commit sql txn Del /NamespaceTable/30/1/106/107/"kv"/4/1 # Check that session tracing does not inhibit the fast path for inserts & diff --git a/pkg/sql/schema_change_plan_node.go b/pkg/sql/schema_change_plan_node.go index 9c5b8f901f98..8fdeea97af79 100644 --- a/pkg/sql/schema_change_plan_node.go +++ b/pkg/sql/schema_change_plan_node.go @@ -33,18 +33,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/cockroachdb/redact" ) -// FormatAstAsRedactableString implements scbuild.AstFormatter -func (p *planner) FormatAstAsRedactableString( - statement tree.Statement, annotations *tree.Annotations, -) redact.RedactableString { - return formatStmtKeyAsRedactableString(p.getVirtualTabler(), - statement, - annotations, tree.FmtSimple, p) -} - // SchemaChange provides the planNode for the new schema changer. func (p *planner) SchemaChange(ctx context.Context, stmt tree.Statement) (planNode, error) { err := checkSchemaChangeEnabled(ctx, p.ExecCfg(), p.stmt.AST.StatementTag()) diff --git a/pkg/sql/schema_changer.go b/pkg/sql/schema_changer.go index 321b35547a91..cfb268f818aa 100644 --- a/pkg/sql/schema_changer.go +++ b/pkg/sql/schema_changer.go @@ -65,6 +65,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" + "github.com/cockroachdb/redact" ) var schemaChangeJobMaxRetryBackoff = settings.RegisterDurationSetting( @@ -2237,7 +2238,7 @@ func (sc *SchemaChanger) maybeReverseMutations(ctx context.Context, causingError sc.descID, sc.mutationID, &eventpb.ReverseSchemaChange{ - Error: fmt.Sprintf("%+v", causingError), + Error: redact.Sprintf("%+v", causingError), SQLSTATE: pgerror.GetPGCode(causingError).String(), LatencyNanos: timeutil.Since(startTime).Nanoseconds(), }) diff --git a/pkg/sql/schemachanger/scbuild/build.go b/pkg/sql/schemachanger/scbuild/build.go index 9cbf5368ec5c..2530d2401fa0 100644 --- a/pkg/sql/schemachanger/scbuild/build.go +++ b/pkg/sql/schemachanger/scbuild/build.go @@ -105,8 +105,7 @@ func Build( { an.ValidateAnnotations() currentStatementID := uint32(len(els.statements) - 1) - els.statements[currentStatementID].RedactedStatement = string( - dependencies.AstFormatter().FormatAstAsRedactableString(an.GetStatement(), &an.annotation)) + els.statements[currentStatementID].RedactedStatement = dependencies.AstFormatter().FormatAstAsRedactableString(an.GetStatement(), &an.annotation) } // Generate returned state. diff --git a/pkg/sql/schemachanger/scbuild/event_log.go b/pkg/sql/schemachanger/scbuild/event_log.go index fe46844b9441..de239678851a 100644 --- a/pkg/sql/schemachanger/scbuild/event_log.go +++ b/pkg/sql/schemachanger/scbuild/event_log.go @@ -70,7 +70,7 @@ func makeEventLogCallback( descID := screl.GetDescID(lt.target.Element()) stmtID := lt.target.Metadata.StatementID details := eventpb.CommonSQLEventDetails{ - Statement: redact.RedactableString(ts.Statements[stmtID].RedactedStatement), + Statement: ts.Statements[stmtID].RedactedStatement, Tag: ts.Statements[stmtID].StatementTag, User: ts.Authorization.UserName, DescriptorID: uint32(descID), diff --git a/pkg/sql/schemachanger/scexec/exec_deferred_mutation.go b/pkg/sql/schemachanger/scexec/exec_deferred_mutation.go index 3617630afeee..9a4ede9480e5 100644 --- a/pkg/sql/schemachanger/scexec/exec_deferred_mutation.go +++ b/pkg/sql/schemachanger/scexec/exec_deferred_mutation.go @@ -18,7 +18,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb" "github.com/cockroachdb/cockroach/pkg/sql/sem/catid" "github.com/cockroachdb/errors" - "github.com/cockroachdb/redact" ) type deferredState struct { @@ -120,7 +119,7 @@ func MakeDeclarativeSchemaChangeJobRecord( // but that's a possibly ambiguous value and not what the old // schema changer used. It's probably that the right thing to use // is the redactable string with the redaction markers. - stmtStrs[i] = redact.RedactableString(stmt.RedactedStatement).StripMarkers() + stmtStrs[i] = stmt.RedactedStatement.StripMarkers() } // The description being all the statements might seem a bit suspect, but // it's what the old schema changer does, so it's what we'll do. diff --git a/pkg/sql/schemachanger/schemachanger_test.go b/pkg/sql/schemachanger/schemachanger_test.go index 445406c1f7ef..5a9b52379e66 100644 --- a/pkg/sql/schemachanger/schemachanger_test.go +++ b/pkg/sql/schemachanger/schemachanger_test.go @@ -168,7 +168,9 @@ func TestSchemaChangerJobErrorDetails(t *testing.T) { require.EqualValues(t, [][]string{{"1"}}, results) const eventLogErrorQuery = `SELECT (info::JSONB)->>'Error' FROM system.eventlog WHERE "eventType" = 'reverse_schema_change'` results = tdb.QueryStr(t, eventLogErrorQuery) - require.EqualValues(t, [][]string{{"boom"}}, results) + require.Equal(t, 1, len(results)) + require.Equal(t, 1, len(results[0])) + require.Regexp(t, `^boom`, results[0][0]) } func TestInsertDuringAddColumnNotWritingToCurrentPrimaryIndex(t *testing.T) { diff --git a/pkg/sql/schemachanger/scpb/BUILD.bazel b/pkg/sql/schemachanger/scpb/BUILD.bazel index 0aa2452eba33..bd1c885bb6db 100644 --- a/pkg/sql/schemachanger/scpb/BUILD.bazel +++ b/pkg/sql/schemachanger/scpb/BUILD.bazel @@ -26,6 +26,7 @@ go_library( "//pkg/util/debugutil", "//pkg/util/protoutil", "@com_github_cockroachdb_errors//:errors", + "@com_github_cockroachdb_redact//:redact", # keep ], ) diff --git a/pkg/sql/schemachanger/scpb/scpb.proto b/pkg/sql/schemachanger/scpb/scpb.proto index 0f774936ec97..e51ec01223d3 100644 --- a/pkg/sql/schemachanger/scpb/scpb.proto +++ b/pkg/sql/schemachanger/scpb/scpb.proto @@ -102,7 +102,7 @@ message TargetState { message Statement { string statement = 1; - string redacted_statement = 2; + string redacted_statement = 2 [(gogoproto.casttype) = "github.com/cockroachdb/redact.RedactableString"]; string statement_tag = 3; } diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel index d003ee23a5a0..17121219cdac 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel @@ -96,7 +96,6 @@ go_library( "//pkg/util/protoutil", "//pkg/util/timeutil", "@com_github_cockroachdb_errors//:errors", - "@com_github_cockroachdb_redact//:redact", ], ) diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go b/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go index c461b8121389..8d0870285492 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go @@ -14,12 +14,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb" "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl" "github.com/cockroachdb/errors" - "github.com/cockroachdb/redact" ) func statementForDropJob(e scpb.Element, md *opGenContext) scop.StatementForDropJob { stmtID := md.Targets[md.elementToTarget[e]].Metadata.StatementID - stmt := redact.RedactableString(md.Statements[stmtID].RedactedStatement).StripMarkers() + stmt := md.Statements[stmtID].RedactedStatement.StripMarkers() switch e.(type) { case *scpb.PrimaryIndex: stmt = "removed primary index; " + stmt diff --git a/pkg/sql/schemachanger/scplan/plan_explain.go b/pkg/sql/schemachanger/scplan/plan_explain.go index 0509a505cdf4..077071091789 100644 --- a/pkg/sql/schemachanger/scplan/plan_explain.go +++ b/pkg/sql/schemachanger/scplan/plan_explain.go @@ -410,14 +410,14 @@ func (p Plan) rootNodeLabel() string { sb.WriteString("rolling back ") } lastStmt := p.Statements[len(p.Statements)-1].RedactedStatement - sb.WriteString(strings.TrimSuffix(lastStmt, ";")) + sb.WriteString(strings.TrimSuffix(string(lastStmt), ";")) if len(p.Statements) > 1 { sb.WriteString("; following ") for i, stmt := range p.Statements[:len(p.Statements)-1] { if i > 0 { sb.WriteString("; ") } - sb.WriteString(strings.TrimSuffix(stmt.RedactedStatement, ";")) + sb.WriteString(strings.TrimSuffix(string(stmt.RedactedStatement), ";")) } } sb.WriteString(";") diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check index 6240a7de58d4..d06665e0ba75 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check @@ -57,7 +57,7 @@ PreCommitPhase stage 2 of 2 with 4 MutationType ops RunningStatus: PostCommitPhase stage 1 of 2 with 1 ValidationType op pending Statements: - statement: ALTER TABLE t ADD CHECK (i > 0) - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›) + redactedstatement: ALTER TABLE defaultdb.public.t ADD CHECK (i > ‹0›) statementtag: ALTER TABLE PostCommitPhase stage 1 of 2 with 1 ValidationType op transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check_udf b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check_udf index 9673c3223819..b4060cbd4c53 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check_udf +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check_udf @@ -72,7 +72,7 @@ PreCommitPhase stage 2 of 2 with 6 MutationType ops RunningStatus: PostCommitPhase stage 1 of 2 with 1 ValidationType op pending Statements: - statement: ALTER TABLE t ADD CONSTRAINT check_b CHECK (f(b) > 1) - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹check_b› CHECK (‹f›(‹b›) > ‹1›) + redactedstatement: ALTER TABLE defaultdb.public.t ADD CONSTRAINT check_b CHECK (f(b) > ‹1›) statementtag: ALTER TABLE PostCommitPhase stage 1 of 2 with 1 ValidationType op transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column index 5c93b9ee4010..9c26a651b0a2 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column @@ -118,7 +118,7 @@ PreCommitPhase stage 2 of 2 with 9 MutationType ops RunningStatus: PostCommitPhase stage 1 of 1 with 1 MutationType op pending Statements: - statement: ALTER TABLE defaultdb.foo ADD COLUMN j defaultdb.footyp - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› ADD COLUMN ‹j› ‹defaultdb›.‹footyp› + redactedstatement: ALTER TABLE defaultdb.public.foo ADD COLUMN j defaultdb.footyp statementtag: ALTER TABLE PostCommitPhase stage 1 of 1 with 5 MutationType ops transitions: @@ -344,7 +344,7 @@ PreCommitPhase stage 2 of 2 with 14 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 3 MutationType ops pending Statements: - statement: ALTER TABLE defaultdb.foo ADD COLUMN j INT8 NOT NULL DEFAULT 123 - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹123› + redactedstatement: ALTER TABLE defaultdb.public.foo ADD COLUMN j INT8 NOT NULL DEFAULT ‹123› statementtag: ALTER TABLE PostCommitPhase stage 1 of 7 with 5 MutationType ops transitions: @@ -806,10 +806,10 @@ PreCommitPhase stage 2 of 2 with 20 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 3 MutationType ops pending Statements: - statement: ALTER TABLE defaultdb.foo ADD COLUMN j INT8 DEFAULT 123 - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› ADD COLUMN ‹j› INT8 DEFAULT ‹123› + redactedstatement: ALTER TABLE defaultdb.public.foo ADD COLUMN j INT8 DEFAULT ‹123› statementtag: ALTER TABLE - statement: ALTER TABLE defaultdb.foo ADD COLUMN k INT8 DEFAULT 456 - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› ADD COLUMN ‹k› INT8 DEFAULT ‹456› + redactedstatement: ALTER TABLE defaultdb.public.foo ADD COLUMN k INT8 DEFAULT ‹456› statementtag: ALTER TABLE PostCommitPhase stage 1 of 7 with 5 MutationType ops transitions: @@ -1173,7 +1173,7 @@ PreCommitPhase stage 2 of 2 with 13 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 2 MutationType ops pending Statements: - statement: ALTER TABLE defaultdb.foo ADD COLUMN a INT8 AS (i + 1) STORED - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› ADD COLUMN ‹a› INT8 AS (‹i› + ‹1›) STORED + redactedstatement: ALTER TABLE defaultdb.public.foo ADD COLUMN a INT8 AS (i + ‹1›) STORED statementtag: ALTER TABLE PostCommitPhase stage 1 of 7 with 4 MutationType ops transitions: @@ -1506,10 +1506,10 @@ PreCommitPhase stage 2 of 2 with 11 MutationType ops RunningStatus: PostCommitPhase stage 1 of 1 with 2 MutationType ops pending Statements: - statement: ALTER TABLE defaultdb.foo ADD COLUMN a INT8 - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› ADD COLUMN ‹a› INT8 + redactedstatement: ALTER TABLE defaultdb.public.foo ADD COLUMN a INT8 statementtag: ALTER TABLE - statement: ALTER TABLE defaultdb.bar ADD COLUMN b INT8 - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹bar› ADD COLUMN ‹b› INT8 + redactedstatement: ALTER TABLE defaultdb.public.bar ADD COLUMN b INT8 statementtag: ALTER TABLE PostCommitPhase stage 1 of 1 with 5 MutationType ops transitions: @@ -1681,7 +1681,7 @@ PreCommitPhase stage 2 of 2 with 10 MutationType ops RunningStatus: PostCommitPhase stage 1 of 15 with 1 MutationType op pending Statements: - statement: ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) + redactedstatement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) statementtag: ALTER TABLE PostCommitPhase stage 1 of 15 with 3 MutationType ops transitions: @@ -2186,7 +2186,7 @@ PreCommitPhase stage 2 of 2 with 14 MutationType ops RunningStatus: PostCommitPhase stage 1 of 15 with 2 MutationType ops pending Statements: - statement: ALTER TABLE defaultdb.baz ADD COLUMN g INT8 UNIQUE DEFAULT 1 - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹baz› ADD COLUMN ‹g› INT8 UNIQUE DEFAULT ‹1› + redactedstatement: ALTER TABLE defaultdb.public.baz ADD COLUMN g INT8 UNIQUE DEFAULT ‹1› statementtag: ALTER TABLE PostCommitPhase stage 1 of 15 with 4 MutationType ops transitions: 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 ecd7e5ad5046..fd1197ee98a7 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key @@ -210,7 +210,7 @@ PreCommitPhase stage 2 of 2 with 17 MutationType ops RunningStatus: PostCommitPhase stage 1 of 15 with 1 MutationType op pending Statements: - statement: ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (k) - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹k›) + redactedstatement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (k) statementtag: ALTER TABLE PostCommitPhase stage 1 of 15 with 3 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column index 8cfc72501a34..8a96327cb763 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column @@ -348,7 +348,7 @@ PreCommitPhase stage 2 of 2 with 18 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 1 MutationType op pending Statements: - statement: ALTER TABLE defaultdb.foo DROP COLUMN v1 CASCADE - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE + redactedstatement: ALTER TABLE defaultdb.public.foo DROP COLUMN v1 CASCADE statementtag: ALTER TABLE PostCommitPhase stage 1 of 7 with 6 MutationType ops transitions: @@ -1676,7 +1676,7 @@ PreCommitPhase stage 2 of 2 with 18 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 1 MutationType op pending Statements: - statement: ALTER TABLE defaultdb.foo DROP COLUMN v2 CASCADE - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE + redactedstatement: ALTER TABLE defaultdb.public.foo DROP COLUMN v2 CASCADE statementtag: ALTER TABLE PostCommitPhase stage 1 of 7 with 7 MutationType ops transitions: @@ -2913,7 +2913,7 @@ PreCommitPhase stage 2 of 2 with 15 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 1 MutationType op pending Statements: - statement: ALTER TABLE defaultdb.foo DROP COLUMN udfcol - redactedstatement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹udfcol› + redactedstatement: ALTER TABLE defaultdb.public.foo DROP COLUMN udfcol statementtag: ALTER TABLE PostCommitPhase stage 1 of 7 with 4 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/create_index b/pkg/sql/schemachanger/scplan/testdata/create_index index 31de2abc367c..0b196b28260a 100644 --- a/pkg/sql/schemachanger/scplan/testdata/create_index +++ b/pkg/sql/schemachanger/scplan/testdata/create_index @@ -157,7 +157,7 @@ PreCommitPhase stage 2 of 2 with 13 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 1 MutationType op pending Statements: - statement: CREATE INDEX id1 ON defaultdb.t1 (id, name) STORING (money) - redactedstatement: CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) + redactedstatement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) statementtag: CREATE INDEX PostCommitPhase stage 1 of 7 with 3 MutationType ops transitions: @@ -589,7 +589,7 @@ PreCommitPhase stage 2 of 2 with 11 MutationType ops RunningStatus: PostCommitPhase stage 1 of 7 with 1 MutationType op pending Statements: - statement: CREATE INVERTED INDEX CONCURRENTLY id1 ON defaultdb.t1 (id, name gin_trgm_ops) - redactedstatement: CREATE INVERTED INDEX CONCURRENTLY ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name› gin_trgm_ops) + redactedstatement: CREATE INVERTED INDEX CONCURRENTLY id1 ON defaultdb.public.t1 (id, name gin_trgm_ops) statementtag: CREATE INDEX PostCommitPhase stage 1 of 7 with 3 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_database b/pkg/sql/schemachanger/scplan/testdata/drop_database index cc48d18fab5a..b97e65111112 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_database +++ b/pkg/sql/schemachanger/scplan/testdata/drop_database @@ -2292,7 +2292,7 @@ PreCommitPhase stage 2 of 2 with 257 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 17 MutationType ops pending Statements: - statement: DROP DATABASE db1 CASCADE - redactedstatement: DROP DATABASE ‹db1› CASCADE + redactedstatement: DROP DATABASE db1 CASCADE statementtag: DROP DATABASE PostCommitNonRevertiblePhase stage 1 of 1 with 32 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_function b/pkg/sql/schemachanger/scplan/testdata/drop_function index 9ae99aa455b3..0c402e8c145e 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_function +++ b/pkg/sql/schemachanger/scplan/testdata/drop_function @@ -187,7 +187,7 @@ PreCommitPhase stage 2 of 2 with 20 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 1 MutationType op pending Statements: - statement: DROP FUNCTION f - redactedstatement: DROP FUNCTION ‹""›.‹""›.‹f› + redactedstatement: DROP FUNCTION ""."".f statementtag: DROP FUNCTION PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_index b/pkg/sql/schemachanger/scplan/testdata/drop_index index 40b860263a4d..cd90a6a79835 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_index +++ b/pkg/sql/schemachanger/scplan/testdata/drop_index @@ -52,7 +52,7 @@ PreCommitPhase stage 2 of 2 with 3 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 4 MutationType ops pending Statements: - statement: DROP INDEX idx1 CASCADE - redactedstatement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx1› CASCADE + redactedstatement: DROP INDEX defaultdb.public.t1@idx1 CASCADE statementtag: DROP INDEX PostCommitNonRevertiblePhase stage 1 of 2 with 6 MutationType ops transitions: @@ -209,7 +209,7 @@ PreCommitPhase stage 2 of 2 with 5 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 6 MutationType ops pending Statements: - statement: DROP INDEX idx2 CASCADE - redactedstatement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx2› CASCADE + redactedstatement: DROP INDEX defaultdb.public.t1@idx2 CASCADE statementtag: DROP INDEX PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops transitions: @@ -431,7 +431,7 @@ PreCommitPhase stage 2 of 2 with 6 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 3 with 9 MutationType ops pending Statements: - statement: DROP INDEX idx3 CASCADE - redactedstatement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx3› CASCADE + redactedstatement: DROP INDEX defaultdb.public.t1@idx3 CASCADE statementtag: DROP INDEX PostCommitNonRevertiblePhase stage 1 of 3 with 11 MutationType ops transitions: @@ -867,7 +867,7 @@ PreCommitPhase stage 2 of 2 with 23 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 5 MutationType ops pending Statements: - statement: DROP INDEX idx4 CASCADE - redactedstatement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE + redactedstatement: DROP INDEX defaultdb.public.t1@idx4 CASCADE statementtag: DROP INDEX PostCommitNonRevertiblePhase stage 1 of 2 with 7 MutationType ops transitions: @@ -1482,7 +1482,7 @@ PreCommitPhase stage 2 of 2 with 37 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 6 MutationType ops pending Statements: - statement: DROP INDEX v2@idx CASCADE - redactedstatement: DROP INDEX ‹defaultdb›.public.‹v2›@‹idx› CASCADE + redactedstatement: DROP INDEX defaultdb.public.v2@idx CASCADE statementtag: DROP INDEX PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_schema b/pkg/sql/schemachanger/scplan/testdata/drop_schema index f0d5158637cc..a4c87b12b083 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_schema +++ b/pkg/sql/schemachanger/scplan/testdata/drop_schema @@ -3440,7 +3440,7 @@ PreCommitPhase stage 2 of 2 with 195 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops pending Statements: - statement: DROP SCHEMA defaultdb.sc1 CASCADE - redactedstatement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + redactedstatement: DROP SCHEMA defaultdb.sc1 CASCADE statementtag: DROP SCHEMA PostCommitNonRevertiblePhase stage 1 of 1 with 23 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_sequence b/pkg/sql/schemachanger/scplan/testdata/drop_sequence index 616bbda4ce0b..323e87da386d 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_sequence +++ b/pkg/sql/schemachanger/scplan/testdata/drop_sequence @@ -88,7 +88,7 @@ PreCommitPhase stage 2 of 2 with 8 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 1 MutationType op pending Statements: - statement: DROP SEQUENCE defaultdb.sq1 - redactedstatement: DROP SEQUENCE ‹defaultdb›.public.‹sq1› + redactedstatement: DROP SEQUENCE defaultdb.public.sq1 statementtag: DROP SEQUENCE PostCommitNonRevertiblePhase stage 1 of 1 with 3 MutationType ops transitions: @@ -246,7 +246,7 @@ PreCommitPhase stage 2 of 2 with 14 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 1 MutationType op pending Statements: - statement: DROP SEQUENCE defaultdb.sq1 CASCADE - redactedstatement: DROP SEQUENCE ‹defaultdb›.public.‹sq1› CASCADE + redactedstatement: DROP SEQUENCE defaultdb.public.sq1 CASCADE statementtag: DROP SEQUENCE PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_table b/pkg/sql/schemachanger/scplan/testdata/drop_table index 8ac763eb3513..ed6f6cc78ef6 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_table +++ b/pkg/sql/schemachanger/scplan/testdata/drop_table @@ -1161,7 +1161,7 @@ PreCommitPhase stage 2 of 2 with 127 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops pending Statements: - statement: DROP TABLE defaultdb.shipments CASCADE - redactedstatement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE + redactedstatement: DROP TABLE defaultdb.public.shipments CASCADE statementtag: DROP TABLE PostCommitNonRevertiblePhase stage 1 of 1 with 15 MutationType ops transitions: @@ -2479,7 +2479,7 @@ PreCommitPhase stage 2 of 2 with 7 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 43 MutationType ops pending Statements: - statement: DROP TABLE defaultdb.customers CASCADE - redactedstatement: DROP TABLE ‹defaultdb›.public.‹customers› CASCADE + redactedstatement: DROP TABLE defaultdb.public.customers CASCADE statementtag: DROP TABLE PostCommitNonRevertiblePhase stage 1 of 2 with 47 MutationType ops transitions: @@ -3703,7 +3703,7 @@ PreCommitPhase stage 2 of 2 with 59 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 3 MutationType ops pending Statements: - statement: DROP TABLE defaultdb.greeter - redactedstatement: DROP TABLE ‹defaultdb›.public.‹greeter› + redactedstatement: DROP TABLE defaultdb.public.greeter statementtag: DROP TABLE PostCommitNonRevertiblePhase stage 1 of 1 with 7 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_type b/pkg/sql/schemachanger/scplan/testdata/drop_type index 8deccbc90389..03b8a1cf336a 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_type +++ b/pkg/sql/schemachanger/scplan/testdata/drop_type @@ -178,7 +178,7 @@ PreCommitPhase stage 2 of 2 with 18 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending Statements: - statement: DROP TYPE defaultdb.typ - redactedstatement: DROP TYPE ‹defaultdb›.‹public›.‹typ› + redactedstatement: DROP TYPE defaultdb.public.typ statementtag: DROP TYPE PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops transitions: @@ -505,7 +505,7 @@ PreCommitPhase stage 2 of 2 with 19 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending Statements: - statement: DROP TYPE defaultdb.ctyp - redactedstatement: DROP TYPE ‹defaultdb›.‹public›.‹ctyp› + redactedstatement: DROP TYPE defaultdb.public.ctyp statementtag: DROP TYPE PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_view b/pkg/sql/schemachanger/scplan/testdata/drop_view index 75bf80b9bef6..6e0181e8dee3 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_view +++ b/pkg/sql/schemachanger/scplan/testdata/drop_view @@ -206,7 +206,7 @@ PreCommitPhase stage 2 of 2 with 22 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 1 MutationType op pending Statements: - statement: DROP VIEW defaultdb.v1 - redactedstatement: DROP VIEW ‹defaultdb›.public.‹v1› + redactedstatement: DROP VIEW defaultdb.public.v1 statementtag: DROP VIEW PostCommitNonRevertiblePhase stage 1 of 1 with 4 MutationType ops transitions: @@ -1501,7 +1501,7 @@ PreCommitPhase stage 2 of 2 with 125 MutationType ops RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops pending Statements: - statement: DROP VIEW defaultdb.v1 CASCADE - redactedstatement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + redactedstatement: DROP VIEW defaultdb.public.v1 CASCADE statementtag: DROP VIEW PostCommitNonRevertiblePhase stage 1 of 1 with 14 MutationType ops transitions: diff --git a/pkg/sql/schemachanger/scrun/scrun.go b/pkg/sql/schemachanger/scrun/scrun.go index 2c84a84c55f9..0420556dfad5 100644 --- a/pkg/sql/schemachanger/scrun/scrun.go +++ b/pkg/sql/schemachanger/scrun/scrun.go @@ -260,7 +260,7 @@ func makePostCommitPlan( // Revert the schema change and write about it in the event log. state.Rollback() return logSchemaChangeEvents(ctx, eventLogger, state, &eventpb.ReverseSchemaChange{ - Error: fmt.Sprintf("%v", rollbackCause), + Error: redact.Sprintf("%+v", rollbackCause), SQLSTATE: pgerror.GetPGCode(rollbackCause).String(), LatencyNanos: timeutil.Since(jobStartTime).Nanoseconds(), }) diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_1_of_7.explain index 0bff5f8e9346..e3bfabc3e9e1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_1_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_2_of_7.explain index 086cbbcecb6e..4b3d06b664b8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_2_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_3_of_7.explain index afd607ebb17d..833562d26140 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_3_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_4_of_7.explain index eaa83a5e03b0..9e5fe11c46f8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_4_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_5_of_7.explain index da8e0aaaab44..b4fcf4e245c5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_5_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_6_of_7.explain index 76841b9aff74..e3ada092ed6c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_6_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_7_of_7.explain index f865fe7fb411..080bb7862c8c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column/add_column__rollback_7_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO db.public.tbl VALUES(-3); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_1_of_7.explain index d6be8ee1d95e..8e1c6858e398 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_1_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_2_of_7.explain index b19aa084e72b..4311b316f11e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_2_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_3_of_7.explain index d284c29d2ccc..cbf22efe0dd1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_3_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_4_of_7.explain index b191b12adf97..940bccfa0138 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_4_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_5_of_7.explain index 4d5ce4161587..b2015537d245 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_5_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_6_of_7.explain index 530288fcaee3..c024a4030a7a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_6_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_7_of_7.explain index 5bf3fa959796..829ff2be0d4b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq/add_column_default_seq__rollback_7_of_7.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_10_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_10_of_15.explain index e774e8f8891c..a3f644fe8b4e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_10_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_10_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_11_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_11_of_15.explain index b115bd9cf26b..247f098fe4ce 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_11_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_11_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_12_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_12_of_15.explain index be32c43828f5..e3cfe0a9f2df 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_12_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_12_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_13_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_13_of_15.explain index 2d75556a13e7..cf37eacd9859 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_13_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_13_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_14_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_14_of_15.explain index a236d5be634a..713045135fc1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_14_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_14_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_15_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_15_of_15.explain index 62d69aaad716..4f4211ea9b8c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_15_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_15_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_1_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_1_of_15.explain index 7132643b4fcb..e80124666f53 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_1_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_1_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_2_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_2_of_15.explain index 492e6d5dc118..322c45981244 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_2_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_2_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_3_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_3_of_15.explain index f233e3eea68e..f7f86715bbbd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_3_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_3_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_4_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_4_of_15.explain index 12cc9d93c2c7..e994dc1846ef 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_4_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_4_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_5_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_5_of_15.explain index 946cb0d54c03..99958d4e988c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_5_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_5_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_6_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_6_of_15.explain index ff3a61a63240..22f6f263a732 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_6_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_6_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_7_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_7_of_15.explain index 72a0b5aa8c7d..b98346adba38 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_7_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_7_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_8_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_8_of_15.explain index 0c5083102b28..000f1067012f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_8_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_8_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_9_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_9_of_15.explain index c83ac88dd218..98f66fded9fd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_9_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique/add_column_default_unique__rollback_9_of_15.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (DDL) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_1_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_1_of_8.explain index b38fce0ee04c..e4838da4cdd0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_1_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_1_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 1 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_2_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_2_of_8.explain index 4717e4c0ccc7..ea7061960422 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_2_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_2_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 2 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_3_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_3_of_8.explain index 4e165281660f..cbd2ac378212 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_3_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_3_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 3 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_4_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_4_of_8.explain index 247a107abc18..48ebb35800c1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_4_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_4_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 4 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_5_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_5_of_8.explain index 9989170ada31..b463e7b3d19b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_5_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_5_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 5 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_6_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_6_of_8.explain index 85a9076b24fb..67db870248a2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_6_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_6_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 6 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_7_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_7_of_8.explain index 990486bf3c22..df3bf8cf40b5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_7_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_7_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 7 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_8_of_8.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_8_of_8.explain index 93449f7c8f21..2c678da3fb43 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_8_of_8.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_unique_not_null/add_column_default_unique_not_null__rollback_8_of_8.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 8 of 8; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL UNIQUE; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL UNIQUE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default/add_column_no_default__rollback_1_of_1.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default/add_column_no_default__rollback_1_of_1.explain index d9fb71e1d220..5f34ed970954 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default/add_column_no_default__rollback_1_of_1.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default/add_column_no_default__rollback_1_of_1.explain @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT; EXPLAIN (DDL) rollback at post-commit stage 1 of 1; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 4 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_1_of_2.explain index d2662f18b3ff..18c3ea490533 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_1_of_2.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT AS (NULL::INT) VIRTUAL NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹NULL›::INT8) VIRTUAL; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (‹NULL›::INT8) VIRTUAL; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_2_of_2.explain index b76e9f227b84..c2474cf5ef0b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_virtual_not_null/add_column_virtual_not_null__rollback_2_of_2.explain @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT AS (NULL::INT) VIRTUAL NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹NULL›::INT8) VIRTUAL; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (‹NULL›::INT8) VIRTUAL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_1_of_7.explain index 92a439e81f66..713ddb56499e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_1_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_2_of_7.explain index ab52427b1f90..a1dc0318acf6 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_2_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_3_of_7.explain index 0d63ba8298c5..5bf50b91d77d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_3_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_4_of_7.explain index be9647fa2f4f..e405283001e2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_4_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_5_of_7.explain index 88cf536a0d5d..9a561ec36b2b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_5_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_6_of_7.explain index 3ba80b16980c..d19b566588b8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_6_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_7_of_7.explain index 9dddc073c167..510652ba77f6 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored/add_column_with_stored__rollback_7_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_1_of_7.explain index 60390501370e..f67a2fb6dcaa 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_1_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_2_of_7.explain index 438529df59a0..a33b122a411c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_2_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_3_of_7.explain index 9d47666b6726..7f0e03686834 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_3_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_4_of_7.explain index 1eb4310a8fd3..8180cb16635e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_4_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_5_of_7.explain index 4757f49e2c75..2e8d619c81f7 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_5_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_6_of_7.explain index 8aa3c3cacbf5..046565113c10 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_6_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_7_of_7.explain index 418df3706b70..5c41924373f1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_with_stored_family/add_column_with_stored_family__rollback_7_of_7.explain @@ -8,7 +8,7 @@ INSERT INTO db.public.tbl VALUES (-1, -1),(-2, -2),(-3, -3), (-7, -7); ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL AS (k) STORED CREATE FAMILY bob; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL AS (‹k›) STORED CREATE FAMILY ‹bob›; +Schema change plan for rolling back ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL AS (k) STORED CREATE FAMILY bob; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_1_of_2.explain index ab2a63d8f60b..a0b8bc3d3ed5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_1_of_2.explain @@ -6,7 +6,7 @@ CREATE FUNCTION f(b INT) RETURNS INT LANGUAGE SQL AS $$ SELECT b + 1 $$; ALTER TABLE t ADD CONSTRAINT check_b CHECK (f(b) > 1); EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹check_b› CHECK (‹f›(‹b›) > ‹1›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CONSTRAINT check_b CHECK (f(b) > ‹1›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_2_of_2.explain index b1c6809d7c68..3d4c68d16baf 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_udf/alter_table_add_check_udf__rollback_2_of_2.explain @@ -6,7 +6,7 @@ CREATE FUNCTION f(b INT) RETURNS INT LANGUAGE SQL AS $$ SELECT b + 1 $$; ALTER TABLE t ADD CONSTRAINT check_b CHECK (f(b) > 1); EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹check_b› CHECK (‹f›(‹b›) > ‹1›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CONSTRAINT check_b CHECK (f(b) > ‹1›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_1_of_2.explain index 9919e4025e1d..c1a034a16237 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_1_of_2.explain @@ -7,7 +7,7 @@ ALTER TABLE t ADD CHECK (i > 0) ---; EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CHECK (i > ‹0›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_2_of_2.explain index 08236f40d26d..b277a4776608 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_vanilla/alter_table_add_check_vanilla__rollback_2_of_2.explain @@ -7,7 +7,7 @@ ALTER TABLE t ADD CHECK (i > 0) ---; EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CHECK (i > ‹0›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_1_of_2.explain index dc214e05e63f..c3d78120b89a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_1_of_2.explain @@ -7,7 +7,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CHECK ((i > nextval(‹'s'›)) OR (j::typ = ‹'a'›)); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_2_of_2.explain index 5454d258eb57..faa90d9f322d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_check_with_seq_and_udt/alter_table_add_check_with_seq_and_udt__rollback_2_of_2.explain @@ -7,7 +7,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CHECK ((i > nextval(‹'s'›)) OR (j::typ = ‹'a'›)); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_1_of_2.explain index c1608ae6eab1..67db7cc3bf1a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_1_of_2.explain @@ -8,7 +8,7 @@ INSERT INTO t1 (i) VALUES(-1), (-2), (-3); ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t1 ADD CONSTRAINT t1_i_fkey FOREIGN KEY (i) REFERENCES defaultdb.public.t2 (i); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_2_of_2.explain index 5bc2926a1d39..94c34c9de4dd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_foreign_key/alter_table_add_foreign_key__rollback_2_of_2.explain @@ -8,7 +8,7 @@ INSERT INTO t1 (i) VALUES(-1), (-2), (-3); ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t1 ADD CONSTRAINT t1_i_fkey FOREIGN KEY (i) REFERENCES defaultdb.public.t2 (i); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_10_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_10_of_15.explain index ca41e0080f3a..c9620fa4cc40 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_10_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_10_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_11_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_11_of_15.explain index 4157ba348ed2..e47fc9afced4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_11_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_11_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_12_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_12_of_15.explain index df47d86d04b7..d34a35317e00 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_12_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_12_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_13_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_13_of_15.explain index 47c4e3d7e2ae..28d77d7945d1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_13_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_13_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_14_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_14_of_15.explain index 9ad806053ca8..38c502005b0d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_14_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_14_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_15_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_15_of_15.explain index 7f761aef668a..d1f054c83bf4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_15_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_15_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_1_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_1_of_15.explain index d759474127cf..45bcb952825c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_1_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_1_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_2_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_2_of_15.explain index 611797b37ff9..a3d86f188191 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_2_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_2_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_3_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_3_of_15.explain index bfc530666db9..da1d922bf033 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_3_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_3_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_4_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_4_of_15.explain index e0e579d942ca..43a762172ce5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_4_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_4_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_5_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_5_of_15.explain index e52f5fbff7d3..47f96be5cea4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_5_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_5_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_6_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_6_of_15.explain index 698bd394e2b4..0604f719d277 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_6_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_6_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_7_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_7_of_15.explain index 26ea02016c11..30c5593471a8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_7_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_7_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_8_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_8_of_15.explain index 09d40d2172fb..d49ccc157e82 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_8_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_8_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_9_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_9_of_15.explain index 51c09177449c..39491f22d8ab 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_9_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid/alter_table_add_primary_key_drop_rowid__rollback_9_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_10_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_10_of_15.explain index 42f041ca55d0..b1e91d0cac3e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_10_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_10_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_11_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_11_of_15.explain index 069f207c0eaa..c1761577c75e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_11_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_11_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_12_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_12_of_15.explain index bfbb632fa4f3..d10eb59d947b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_12_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_12_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_13_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_13_of_15.explain index 7284cb144c5e..f4a6621bb955 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_13_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_13_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_14_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_14_of_15.explain index ded4c8763801..fe3b98c431d3 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_14_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_14_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_15_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_15_of_15.explain index 88185b66e054..6765fb397b6b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_15_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_15_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_1_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_1_of_15.explain index 31996cc10ea3..bc95746a399c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_1_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_1_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_2_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_2_of_15.explain index b3b21f25bbc0..4749ef4cdf9d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_2_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_2_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_3_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_3_of_15.explain index e452f29f0f9c..7b97d6504201 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_3_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_3_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_4_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_4_of_15.explain index 0e0b390403e6..c75f190bd64e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_4_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_4_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_5_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_5_of_15.explain index 712a22701b8f..3dfeb0dd070e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_5_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_5_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_6_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_6_of_15.explain index 82f5dfbd4e12..a012c99ff27b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_6_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_6_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_7_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_7_of_15.explain index 23de473a4a53..29f99e4e938d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_7_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_7_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_8_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_8_of_15.explain index 732929a4375a..23f5bbbc78c8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_8_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_8_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_9_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_9_of_15.explain index 8ccf519375d5..3e0264031fa0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_9_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid_with_secondary_idx/alter_table_add_primary_key_drop_rowid_with_secondary_idx__rollback_9_of_15.explain @@ -6,7 +6,7 @@ CREATE INDEX idx_b ON t(b); alter table t add primary key (a); EXPLAIN (DDL) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_1_of_2.explain index a9aa17b98532..ca18da51eeed 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_1_of_2.explain @@ -7,7 +7,7 @@ INSERT INTO t(i, j) VALUES(-1, -1), (-2, -2), (-3, -3); ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CONSTRAINT unique_j UNIQUE WITHOUT INDEX (j); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_2_of_2.explain index 21811ee7be9b..311689b1dd37 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_unique_without_index/alter_table_add_unique_without_index__rollback_2_of_2.explain @@ -7,7 +7,7 @@ INSERT INTO t(i, j) VALUES(-1, -1), (-2, -2), (-3, -3); ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD CONSTRAINT unique_j UNIQUE WITHOUT INDEX (j); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_1_of_2.explain index bd32fd5628a4..11454e72d74f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_1_of_2.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT); ALTER TABLE t ALTER COLUMN j SET NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER COLUMN ‹j› SET NOT NULL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER COLUMN j SET NOT NULL; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_2_of_2.explain index 5931fc75ba06..5c139d271edc 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_column_set_not_null/alter_table_alter_column_set_not_null__rollback_2_of_2.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT); ALTER TABLE t ALTER COLUMN j SET NOT NULL; EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER COLUMN ‹j› SET NOT NULL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER COLUMN j SET NOT NULL; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_10_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_10_of_15.explain index 4bc1b8994d1d..229da45b88ad 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_10_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_10_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_11_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_11_of_15.explain index 3d61d882a45f..cb6a6ad1b33d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_11_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_11_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_12_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_12_of_15.explain index 1b59c7eb1762..08df3a47ab47 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_12_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_12_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_13_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_13_of_15.explain index 9731168ae47b..22e2cc045ee8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_13_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_13_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_14_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_14_of_15.explain index 4a3c6a666aa6..fa23dfc483af 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_14_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_14_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_15_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_15_of_15.explain index 79719c69a008..55cac4f3236f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_15_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_15_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_1_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_1_of_15.explain index a8927ec83ea8..ba4c1b21b33a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_1_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_1_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_2_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_2_of_15.explain index 51454915cdb5..1ef9a11be4e2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_2_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_2_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_3_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_3_of_15.explain index 51a1af5d1d4a..5ac65b9b7038 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_3_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_3_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_4_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_4_of_15.explain index 2edbafcd838d..89643c904b70 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_4_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_4_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_5_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_5_of_15.explain index 3394a035b489..ec15653992cf 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_5_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_5_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_6_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_6_of_15.explain index 28fabdc584d9..fd4507633f3d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_6_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_6_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_7_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_7_of_15.explain index 01fd4ab930f3..782a68b864cd 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_7_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_7_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_8_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_8_of_15.explain index 26a98fb915b1..6954cd115a81 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_8_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_8_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_9_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_9_of_15.explain index c123efc1437c..f16f6a093762 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_9_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid/alter_table_alter_primary_key_drop_rowid__rollback_9_of_15.explain @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (DDL) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_10_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_10_of_16.explain index 3131736fad25..cee2e458ee6d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_10_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_10_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 10 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_11_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_11_of_16.explain index 49b04c7bbdee..6c63f7cd81f7 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_11_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_11_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 11 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_12_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_12_of_16.explain index bd265404b7ce..580195508499 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_12_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_12_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 12 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_13_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_13_of_16.explain index 34e712d79371..6bb7dfed8c5e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_13_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_13_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 13 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_14_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_14_of_16.explain index fab022270c54..a70ff09dafea 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_14_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_14_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 14 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_15_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_15_of_16.explain index 9d7ab708407d..122b58bd0411 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_15_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_15_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 15 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_16_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_16_of_16.explain index b3e5a9bca932..de518253e874 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_16_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_16_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 16 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_1_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_1_of_16.explain index 947351d6b62c..8d15575d0179 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_1_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_1_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 1 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_2_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_2_of_16.explain index 6d58b5e5efa7..f193273eaff2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_2_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_2_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 2 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_3_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_3_of_16.explain index 2e68aac0ea22..cba891f87f7d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_3_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_3_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 3 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_4_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_4_of_16.explain index c4872b5074a7..a196c7adfc3f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_4_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_4_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 4 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_5_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_5_of_16.explain index 3bb7e58fe46f..f89d028fc2be 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_5_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_5_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 5 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_6_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_6_of_16.explain index e3805fcb3bef..c3d42961c2bc 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_6_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_6_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 6 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_7_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_7_of_16.explain index 5b3a74f5949c..be0397767970 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_7_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_7_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 7 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_8_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_8_of_16.explain index 5f6536df8238..8411f82b53ae 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_8_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_8_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 8 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_9_of_16.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_9_of_16.explain index b4f8d2e723be..a44cefc18f57 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_9_of_16.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_using_hash/alter_table_alter_primary_key_using_hash__rollback_9_of_16.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH (bucket_count=3); EXPLAIN (DDL) rollback at post-commit stage 9 of 16; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›) USING HASH WITH ('bucket_count' = ‹3›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) USING HASH WITH ('bucket_count' = ‹3›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_10_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_10_of_15.explain index 9526efece226..e583887aa279 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_10_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_10_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_11_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_11_of_15.explain index e38fed786f6f..29cb987d0479 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_11_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_11_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_12_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_12_of_15.explain index 1960059b85b7..2c4065534ea5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_12_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_12_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_13_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_13_of_15.explain index f96196cc2a6b..9a1e3cda2bb3 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_13_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_13_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_14_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_14_of_15.explain index c4c357babfe0..1db9e4597878 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_14_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_14_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_15_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_15_of_15.explain index 8966dd4374bf..8edc233fabe8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_15_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_15_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_1_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_1_of_15.explain index ffa98044e6fc..0db0be293186 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_1_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_1_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 28 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_2_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_2_of_15.explain index 8bf1626a4bb3..2a043af478ec 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_2_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_2_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_3_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_3_of_15.explain index 1f57f756312d..76bdd86808a4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_3_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_3_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_4_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_4_of_15.explain index 6cbb52cf92f1..b9ac5d818908 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_4_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_4_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_5_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_5_of_15.explain index 9e27a3028f3b..59d17381d64b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_5_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_5_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_6_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_6_of_15.explain index da49690970e2..2ebfbb97aafe 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_6_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_6_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_7_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_7_of_15.explain index b2fbcba16820..cfe665f4b368 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_7_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_7_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_8_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_8_of_15.explain index 039c616b8864..119e7fb60044 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_8_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_8_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 24 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_9_of_15.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_9_of_15.explain index 62eaa4a4254c..e105042191f2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_9_of_15.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla/alter_table_alter_primary_key_vanilla__rollback_9_of_15.explain @@ -9,7 +9,7 @@ CREATE INDEX ON t(k); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (DDL) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_1_of_7.explain index 52aa112ffdbe..4c401c1ec55a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_1_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_2_of_7.explain index 8cdc253ab7b3..f81a1489bb43 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_2_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_3_of_7.explain index 5ed6253edf2b..15b81f651035 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_3_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_4_of_7.explain index 007c6076923e..db00875f763e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_4_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_5_of_7.explain index 7fb3779a7a88..1d06a2e9537f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_5_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_6_of_7.explain index 4c5db44de12e..1935a392899c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_6_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_7_of_7.explain index a611d411e7ff..a1c7a75d0751 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_drop_add_same_col_implicit/alter_table_drop_add_same_col_implicit__rollback_7_of_7.explain @@ -5,7 +5,7 @@ create table t(i int); alter table t drop column i, add column i bool; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹i›, ADD COLUMN ‹i› BOOL; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN i, ADD COLUMN i BOOL; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_10_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_10_of_31.explain index 58ff552ef5a1..f3394e7f8425 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_10_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_10_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 10 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_11_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_11_of_31.explain index 0b7940230674..2c59e19eadb0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_11_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_11_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 11 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_12_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_12_of_31.explain index 6af4488aebec..8d545f9c76fc 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_12_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_12_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 12 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_13_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_13_of_31.explain index 11c2ddf677f2..c63a8b1a16f8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_13_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_13_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 13 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_14_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_14_of_31.explain index d15ce3099b85..13507e4164a5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_14_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_14_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 14 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_15_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_15_of_31.explain index 2d59f1045160..96bc03353626 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_15_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_15_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 15 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_16_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_16_of_31.explain index 933aeebb52dc..4760ee8803d9 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_16_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_16_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 16 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_17_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_17_of_31.explain index 34537eee488c..48a1952734f0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_17_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_17_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 17 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_18_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_18_of_31.explain index a4920425602a..6a63509438de 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_18_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_18_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 18 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_19_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_19_of_31.explain index 0b3fce2fd59c..d1c377d3e885 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_19_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_19_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 19 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_1_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_1_of_31.explain index 1289f39bbd32..d195f5c297e1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_1_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_1_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 1 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_20_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_20_of_31.explain index e74eb850ff90..e13d5a610c40 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_20_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_20_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 20 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_21_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_21_of_31.explain index 3e29ddf740c9..6d749f31b64d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_21_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_21_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 21 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_22_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_22_of_31.explain index ce598144a11f..fb28e07014b4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_22_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_22_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 22 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_23_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_23_of_31.explain index 7b06b4609d01..22e709b9e5e7 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_23_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_23_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 23 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_24_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_24_of_31.explain index 0bf0fd00ad26..21d2f3a670e4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_24_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_24_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 24 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_25_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_25_of_31.explain index d0cd24a9f6e9..ca94a9153a45 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_25_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_25_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 25 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_26_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_26_of_31.explain index 81c9deb4ce9f..a00b064942a2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_26_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_26_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 26 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_27_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_27_of_31.explain index ce596919cae5..28f01161df9c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_27_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_27_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 27 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_28_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_28_of_31.explain index ec9a0ed0bd82..cebfbcc98aff 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_28_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_28_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 28 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_29_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_29_of_31.explain index 0f2ee3047a08..aa614aad755f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_29_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_29_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 29 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_2_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_2_of_31.explain index 4f7c576e2372..4d5b03dae0ed 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_2_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_2_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 2 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_30_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_30_of_31.explain index 15fe348ac424..c093de1e414d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_30_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_30_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 30 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_31_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_31_of_31.explain index cb53e86965f7..a9d22039be4c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_31_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_31_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 31 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_3_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_3_of_31.explain index 93113d5a9e57..11450310e094 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_3_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_3_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 3 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_4_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_4_of_31.explain index 4494a29fb6bb..8ca93de6a46f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_4_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_4_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 4 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_5_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_5_of_31.explain index 90fd1495c0ca..ea25cd95bbd9 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_5_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_5_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 5 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_6_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_6_of_31.explain index 0ddfd756a528..1f6bc17b6694 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_6_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_6_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 6 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_7_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_7_of_31.explain index 7829da1920e9..d0f11d347b11 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_7_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_7_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 7 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_8_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_8_of_31.explain index e0b9804ee9bb..a48a9b43eb69 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_8_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_8_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 8 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_9_of_31.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_9_of_31.explain index 7ca118558a8c..da682beedb33 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_9_of_31.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_multiple_commands/alter_table_multiple_commands__rollback_9_of_31.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL, k INT, FAMILY "primary" (i, j ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT DEFAULT 30, ADD COLUMN q INT, DROP COLUMN q; EXPLAIN (DDL) rollback at post-commit stage 9 of 31; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›), DROP COLUMN ‹k›, ADD COLUMN ‹p› INT8 DEFAULT ‹30›, ADD COLUMN ‹q› INT8, DROP COLUMN ‹q›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j), DROP COLUMN k, ADD COLUMN p INT8 DEFAULT ‹30›, ADD COLUMN q INT8, DROP COLUMN q; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_1_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_1_of_2.explain index 127557481f5d..579901ff776a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_1_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_1_of_2.explain @@ -6,7 +6,7 @@ ALTER TABLE t ADD CHECK (i > 0) NOT VALID; ALTER TABLE t VALIDATE CONSTRAINT check_i; EXPLAIN (DDL) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› VALIDATE CONSTRAINT ‹check_i›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t VALIDATE CONSTRAINT check_i; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_2_of_2.explain b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_2_of_2.explain index 424d9d1a9ac9..9d4e39d3406e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_2_of_2.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_validate_constraint/alter_table_validate_constraint__rollback_2_of_2.explain @@ -6,7 +6,7 @@ ALTER TABLE t ADD CHECK (i > 0) NOT VALID; ALTER TABLE t VALIDATE CONSTRAINT check_i; EXPLAIN (DDL) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› VALIDATE CONSTRAINT ‹check_i›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t VALIDATE CONSTRAINT check_i; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_1_of_7.explain index c7d4b30ef69c..eb0cbfc7ec7d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_1_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_2_of_7.explain index 29066423115c..bca64452e214 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_2_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_3_of_7.explain index a40400517f04..dcc7f65bc177 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_3_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_4_of_7.explain index a2c12adf2c9d..1229d4b55dba 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_4_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_5_of_7.explain index 979c913c68e5..bfe89e45fc05 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_5_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_6_of_7.explain index d9760b2b3eda..d452c0cc707a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_6_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_7_of_7.explain index e4b393c51ed4..a2dfe60f808e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_function_in_txn/create_function_in_txn__rollback_7_of_7.explain @@ -6,7 +6,7 @@ CREATE FUNCTION t() RETURNS INT LANGUAGE SQL AS $$ SELECT 1 $$; CREATE UNIQUE INDEX idx ON t(b); EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹b›); following CREATE FUNCTION ‹defaultdb›.‹public›.‹t›() +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (b); following CREATE FUNCTION defaultdb.public.t() RETURNS INT8 LANGUAGE SQL AS $$SELECT ‹1›;$$; diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain index fd3b2ed43032..106cc8fd25b5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_1_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain index b5ef1886e42a..a7e886266078 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_2_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain index f4310bfa571b..588803024179 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_3_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain index b026eab477eb..5e8c25db641e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_4_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain index 38dd4aef4915..1640045b146e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_5_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain index f2e29da4de16..224e83239dbc 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_6_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain index af8ba3c2087b..a0a6d3dce12d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index/create_index__rollback_7_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_1_of_7.explain index 9b1c72dcca79..50c3735f7bd0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_1_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 14 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_2_of_7.explain index 60bbac6ac730..59f38aa41dc6 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_2_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_3_of_7.explain index c5c0f0cc3f8e..f6adba75d292 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_3_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_4_of_7.explain index 73da1a2e9811..5e67ea73f36b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_4_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_5_of_7.explain index 2913a424ca8c..b471c14f7619 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_5_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_6_of_7.explain index b32ba9c266b2..80cba6fe2619 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_6_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_7_of_7.explain index d4302d4f7297..5f444e4f2d88 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index_create_schema_separate_statements/create_index_create_schema_separate_statements__rollback_7_of_7.explain @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX idx ON t(j) WHERE (i > 0); CREATE SCHEMA sc; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE SCHEMA ‹defaultdb›.‹sc›; following CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹j›) WHERE (‹i› > ‹0›); +Schema change plan for rolling back CREATE SCHEMA defaultdb.sc; following CREATE UNIQUE INDEX idx ON defaultdb.public.t (j) WHERE (i > ‹0›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain index 58cc05de2719..251cd3d4c661 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_1_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 25 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain index bfa43be82439..9a8a066c097b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_2_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain index b8faeec1baf7..b3f7cbb67502 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_3_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain index be5f694147ee..71a8fbc1bb84 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_4_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain index 360bb5bbb4d8..c835a59dc589 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_5_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain index 4ce78840a7c7..a9da13b7230e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_6_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain index 7041fd273531..cb0dae41f70b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_sequence_add_column/create_sequence_add_column__rollback_7_of_7.explain @@ -6,7 +6,7 @@ CREATE SEQUENCE sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32 ALTER TABLE t ADD COLUMN j INT DEFAULT nextval('sq1'); EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD COLUMN ‹j› INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE ‹defaultdb›.public.‹sq1› MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t ADD COLUMN j INT8 DEFAULT nextval(‹'sq1'›); following CREATE SEQUENCE defaultdb.public.sq1 MINVALUE 1 MAXVALUE 9223372036854775807 INCREMENT 1 START 32; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 12 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_1_of_7.explain index 40c8e5e8f578..3e2c34d3743c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_1_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_2_of_7.explain index 66275ed18f99..2fa23c910817 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_2_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_3_of_7.explain index 151b4b6fc6ac..22d5841859b2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_3_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_4_of_7.explain index e59ac881f96f..c556814b7fdf 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_4_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_5_of_7.explain index fe366b855eeb..847224c62734 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_5_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_6_of_7.explain index 52a6fa3f74fe..3871cdb22ad0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_6_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_7_of_7.explain index 8000e602ffa5..fca81e8ab575 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic/drop_column_basic__rollback_7_of_7.explain @@ -10,7 +10,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_1_of_7.explain index 0383241353f0..e8ae2003cbf2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_1_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_2_of_7.explain index f9c1a898a6b4..5fa2ae919e0b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_2_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_3_of_7.explain index 661af8da569f..4a0085b6020e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_3_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_4_of_7.explain index 678b204e102e..640555502a5a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_4_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_5_of_7.explain index d5bbdd08fde2..37e1573df0c8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_5_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_6_of_7.explain index c5fb74046d79..6cdfd235b15c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_6_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_7_of_7.explain index cd42c735b8a3..1177cde7e364 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index/drop_column_computed_index__rollback_7_of_7.explain @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_1_of_7.explain index 720e61531f71..9382c7e88557 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_1_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_2_of_7.explain index 3ac2fe0f990a..ca426ba2d81e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_2_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_3_of_7.explain index 06301eb14a2d..ac8d16b1a644 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_3_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_4_of_7.explain index 4ccbe4b7074e..bc4e7e3153be 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_4_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_5_of_7.explain index 0f21a43c637b..f2febd897781 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_5_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_6_of_7.explain index 394cdf2133be..1b91c7f4bec8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_6_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_7_of_7.explain index b8a590b9d8fd..1a673f4a72a9 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements/drop_column_create_index_separate_statements__rollback_7_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back CREATE UNIQUE INDEX idx ON defaultdb.public.t (k); following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_1_of_7.explain index b492518725fe..692801b47c9e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_1_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_2_of_7.explain index d413c60c2da2..eab43e4c2b96 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_2_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_3_of_7.explain index 3599f40b4adf..7f444bd19c22 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_3_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_4_of_7.explain index fc5064f94394..93f7c232c4d4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_4_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_5_of_7.explain index a5fa30c05a65..02c771bf0eef 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_5_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_6_of_7.explain index d1b51055cf20..9dc83010d1d2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_6_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_7_of_7.explain index 36246851cdda..7b8aee2e18c9 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_sequence_owner/drop_column_sequence_owner__rollback_7_of_7.explain @@ -11,7 +11,7 @@ INSERT INTO t VALUES(-3); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_1_of_7.explain index 1d1b4a45b694..98f752af009d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_1_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_2_of_7.explain index f9e83698ae0f..27035120ffb7 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_2_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_3_of_7.explain index f6058cf010fc..a1fdb63856e4 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_3_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_4_of_7.explain index 99a227dd9ace..871f22cabfd5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_4_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_5_of_7.explain index 5635d0919504..f834ad974435 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_5_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_6_of_7.explain index 575ebe0b2f6a..38586fe94d65 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_6_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_7_of_7.explain index 4143b9bf306f..79814c99f79e 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index/drop_column_unique_index__rollback_7_of_7.explain @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE t.public.test DROP COLUMN pi; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_1_of_7.explain index cc395f7762b5..52b1b0701002 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_1_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_2_of_7.explain index fa32a03ad028..c6a2e02fe437 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_2_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_3_of_7.explain index a57ccc35a1fc..9c11c27906ec 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_3_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_4_of_7.explain index 0161fb6fd65a..fcd109fe5b10 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_4_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_5_of_7.explain index 27254a6a2c7e..21644cef910d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_5_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_6_of_7.explain index 3bf8d72ed44a..aaa9ddff0f8b 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_6_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_7_of_7.explain index 1a057a081c74..3b9dfa7398e7 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index/drop_column_with_index__rollback_7_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_1_of_7.explain index f6df419216f5..7b48cb841638 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_1_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_2_of_7.explain index 2df3df1e5beb..07c245580380 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_2_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_3_of_7.explain index 24783f607296..4e3884680f85 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_3_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_4_of_7.explain index 3c5cd98ce72f..761a5e988644 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_4_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_5_of_7.explain index 1ff954da1104..5c12f02013d1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_5_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_6_of_7.explain index 4f320257d7c5..c24d4f7ce340 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_6_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_7_of_7.explain index 9be2863260f4..626c58317011 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_partial_index/drop_column_with_partial_index__rollback_7_of_7.explain @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j) WHERE i >=0); ALTER TABLE t DROP COLUMN j; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN j; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_1_of_7.explain index 1b016ea0e80f..51b4ff6b0bb1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_1_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_2_of_7.explain index e1f70ef6b96c..c450770c0eb8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_2_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_3_of_7.explain index a9d285a758ae..e4f6487a38b9 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_3_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_4_of_7.explain index 04ba5ed81786..318ee6193748 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_4_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_5_of_7.explain index c72174a098de..5ee732e542ce 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_5_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_6_of_7.explain index 0bc3b971c7d5..9489361d768a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_6_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_7_of_7.explain index c8534a5cf513..c9865a111e7d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_udf_default/drop_column_with_udf_default__rollback_7_of_7.explain @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, b INT DEFAULT f()); ALTER TABLE t DROP COLUMN b; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹b›; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN b; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_1_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_1_of_7.explain index 99e33d569fd0..4ad217289668 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_1_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_1_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_2_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_2_of_7.explain index 522a394a61d6..a9d26e126bf3 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_2_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_2_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_3_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_3_of_7.explain index 8536a24cfca6..4d5891c0efdb 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_3_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_3_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_4_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_4_of_7.explain index 6f5e6ec38c8c..f4cf305acdc1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_4_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_4_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_5_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_5_of_7.explain index 9d450e104583..862e44373a5a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_5_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_5_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_6_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_6_of_7.explain index 949211c0ca47..f3edf8f7efdf 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_6_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_6_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_7_of_7.explain b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_7_of_7.explain index 2610d2ffc1c4..65c474036fb5 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_7_of_7.explain +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements/drop_multiple_columns_separate_statements__rollback_7_of_7.explain @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (DDL) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE defaultdb.public.t DROP COLUMN k CASCADE; following ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/telemetry_logging_test.go b/pkg/sql/telemetry_logging_test.go index 53308d089ee4..d20e453d8851 100644 --- a/pkg/sql/telemetry_logging_test.go +++ b/pkg/sql/telemetry_logging_test.go @@ -819,6 +819,7 @@ func TestTelemetryLoggingInternalConsoleEnabled(t *testing.T) { st.SetTime(stubTime) defer s.Stopper().Stop(context.Background()) + sqlDB.SetMaxOpenConns(1) db := sqlutils.MakeSQLRunner(sqlDB) db.Exec(t, `SET CLUSTER SETTING sql.telemetry.query_sampling.enabled = true;`) // Set query internal to `false` to guarantee that if an entry qith `internal-console` is showing @@ -853,7 +854,7 @@ func TestTelemetryLoggingInternalConsoleEnabled(t *testing.T) { }, } - query := `SELECT count(*) FROM crdb_internal.statement_statistics` + query := `SELECT count(*) FROM defaultdb.crdb_internal.statement_statistics` for _, tc := range testData { db.Exec(t, `SET application_name = $1`, tc.appName) db.Exec(t, `SET CLUSTER SETTING sql.telemetry.query_sampling.internal_console.enabled = $1;`, tc.logInternalConsole) diff --git a/pkg/util/log/eventpb/ddl_events.proto b/pkg/util/log/eventpb/ddl_events.proto index 54327de3d4ba..ef012a64127b 100644 --- a/pkg/util/log/eventpb/ddl_events.proto +++ b/pkg/util/log/eventpb/ddl_events.proto @@ -34,7 +34,7 @@ message CreateDatabase { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the new database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // DropDatabase is recorded when a database is dropped. @@ -42,9 +42,9 @@ message DropDatabase { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The names of the schemas dropped by a cascade operation. - repeated string dropped_schema_objects = 4 [(gogoproto.jsontag) = ",omitempty"]; + repeated string dropped_schema_objects = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterDatabaseAddRegion is recorded when a region is added to a database. @@ -52,9 +52,9 @@ message AlterDatabaseAddRegion { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The region being added. - string region_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string region_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterDatabaseAddRegion is recorded when a region is added to a database. @@ -62,9 +62,9 @@ message AlterDatabaseDropRegion { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The region being dropped. - string region_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string region_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterDatabasePrimaryRegion is recorded when a primary region is added/modified. @@ -72,9 +72,9 @@ message AlterDatabasePrimaryRegion { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new primary region. - string primary_region_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string primary_region_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterDatabaseSurvivalGoal is recorded when the survival goal is modified. @@ -82,9 +82,9 @@ message AlterDatabaseSurvivalGoal { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new survival goal - string survival_goal = 4 [(gogoproto.jsontag) = ",omitempty"]; + string survival_goal = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterDatabasePlacement is recorded when the database placement is modified. @@ -92,9 +92,9 @@ message AlterDatabasePlacement { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new placement policy. - string placement = 4 [(gogoproto.jsontag) = ",omitempty"]; + string placement = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // RenameDatabase is recorded when a database is renamed. @@ -102,9 +102,9 @@ message RenameDatabase { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The old name of the affected database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new name of the affected database. - string new_database_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string new_database_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // CreateSchema is recorded when a schema is created. @@ -112,9 +112,9 @@ message CreateSchema { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the new schema. - string schema_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string schema_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the owner for the new schema. - string owner = 4 [(gogoproto.jsontag) = ",omitempty"]; + string owner = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // DropSchema is recorded when a schema is dropped. @@ -122,7 +122,7 @@ message DropSchema { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected schema. - string schema_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string schema_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // RenameSchema is recorded when a schema is renamed. @@ -130,9 +130,9 @@ message RenameSchema { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The old name of the affected schema. - string schema_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string schema_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new name of the affected schema. - string new_schema_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string new_schema_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // SetSchema is recorded when a table, view, sequence or type's schema is changed. @@ -140,11 +140,11 @@ message SetSchema { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The old name of the affected descriptor. - string descriptor_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string descriptor_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new name of the affected descriptor. - string new_descriptor_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string new_descriptor_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The descriptor type being changed (table, view, sequence, type). - string descriptor_type = 5 [(gogoproto.jsontag) = ",omitempty"]; + string descriptor_type = 5 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // CreateTable is recorded when a table is created. @@ -152,9 +152,9 @@ message CreateTable { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the new table. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the owner for the new table. - string owner = 4 [(gogoproto.jsontag) = ",omitempty"]; + string owner = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // DropTable is recorded when a table is dropped. @@ -162,9 +162,9 @@ message DropTable { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected table. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The names of the views dropped as a result of a cascade operation. - repeated string cascade_dropped_views = 4 [(gogoproto.jsontag) = ",omitempty"]; + repeated string cascade_dropped_views = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // RenameTable is recorded when a table, sequence or view is renamed. @@ -172,9 +172,9 @@ message RenameTable { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The old name of the affected table. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new name of the affected table. - string new_table_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string new_table_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // TruncateTable is recorded when a table is truncated. @@ -182,7 +182,7 @@ message TruncateTable { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected table. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterTable is recorded when a table is altered. @@ -190,11 +190,11 @@ message AlterTable { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected table. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The mutation ID for the asynchronous job that is processing the index update, if any. uint32 mutation_id = 4 [(gogoproto.customname) = "MutationID", (gogoproto.jsontag) = ",omitempty"]; // The names of the views dropped as a result of a cascade operation. - repeated string cascade_dropped_views = 5 [(gogoproto.jsontag) = ",omitempty"]; + repeated string cascade_dropped_views = 5 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // CommentOnColumn is recorded when a column is commented. @@ -202,9 +202,9 @@ message CommentOnColumn { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the affected column. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The affected column. - string column_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string column_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 5 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -216,7 +216,7 @@ message CommentOnDatabase { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected database. - string database_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string database_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 4 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -227,7 +227,7 @@ message CommentOnSchema { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // Name of the affected schema. - string schema_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string schema_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 4 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -239,7 +239,7 @@ message CommentOnTable { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected table. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 4 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -251,7 +251,7 @@ message CommentOnType { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected type. - string type_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string type_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 4 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -263,9 +263,9 @@ message CommentOnIndex { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the affected index. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the affected index. - string index_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string index_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 5 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -277,9 +277,9 @@ message CommentOnConstraint { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the affected constraint. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the affected constraint. - string constraint_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string constraint_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new comment. string comment = 5 [(gogoproto.jsontag) = ",omitempty"]; // Set to true if the comment was removed entirely. @@ -291,9 +291,9 @@ message CreateIndex { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the new index. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the new index. - string index_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string index_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The mutation ID for the asynchronous job that is processing the index update. uint32 mutation_id = 5 [(gogoproto.customname) = "MutationID", (gogoproto.jsontag) = ",omitempty"]; } @@ -303,13 +303,13 @@ message DropIndex { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the affected index. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the affected index. - string index_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string index_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The mutation ID for the asynchronous job that is processing the index update. uint32 mutation_id = 5 [(gogoproto.customname) = "MutationID", (gogoproto.jsontag) = ",omitempty"]; // The names of the views dropped as a result of a cascade operation. - repeated string cascade_dropped_views = 6; + repeated string cascade_dropped_views = 6 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterIndex is recorded when an index is altered. @@ -317,9 +317,9 @@ message AlterIndex { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the affected index. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the affected index. - string index_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string index_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The mutation ID for the asynchronous job that is processing the index update. uint32 mutation_id = 5 [(gogoproto.customname) = "MutationID", (gogoproto.jsontag) = ",omitempty"]; } @@ -329,9 +329,9 @@ message AlterIndexVisible { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table containing the affected index. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the affected index. - string index_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string index_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // Set true if index is not visible. // NOTE: THIS FIELD IS DEPRECATED in favor of invisibility. bool not_visible = 5 [(gogoproto.jsontag) = ",omitempty", deprecated = true]; @@ -345,9 +345,9 @@ message CreateView { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the new view. - string view_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string view_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the owner of the new view. - string owner = 4 [(gogoproto.jsontag) = ",omitempty"]; + string owner = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The SQL selection clause used to define the view. string view_query = 5 [(gogoproto.jsontag) = ",omitempty"]; } @@ -357,9 +357,9 @@ message DropView { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected view. - string view_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string view_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The names of the views dropped as a result of a cascade operation. - repeated string cascade_dropped_views = 4 [(gogoproto.jsontag) = ",omitempty"]; + repeated string cascade_dropped_views = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } @@ -368,9 +368,9 @@ message CreateSequence { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the new sequence. - string sequence_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string sequence_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the owner for the new sequence. - string owner = 4 [(gogoproto.jsontag) = ",omitempty"]; + string owner = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // DropSequence is recorded when a sequence is dropped. @@ -378,7 +378,7 @@ message DropSequence { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected sequence. - string sequence_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string sequence_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterSequence is recorded when a sequence is altered. @@ -386,7 +386,7 @@ message AlterSequence { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected sequence. - string sequence_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string sequence_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // CommonSchemaChangeDetails contains the fields common to all @@ -418,7 +418,7 @@ message ReverseSchemaChange { CommonSchemaChangeEventDetails sc = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The error encountered that caused the schema change to be reversed. // The specific format of the error is variable and can change across releases without warning. - string error = 4 [(gogoproto.jsontag) = ",omitempty"]; + string error = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cockroachdb/redact.RedactableString", (gogoproto.moretags) = "redact:\"mixed\""]; // The SQLSTATE code for the error. string sqlstate = 5 [(gogoproto.customname) = "SQLSTATE", (gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The amount of time the schema change job took before being reverted. @@ -449,9 +449,9 @@ message CreateType { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the new type. - string type_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string type_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The name of the owner for the new type. - string owner = 5 [(gogoproto.jsontag) = ",omitempty"]; + string owner = 5 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // DropType is recorded when a user-defined type is dropped. @@ -459,7 +459,7 @@ message DropType { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected type. - string type_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string type_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // EventAlterType is recorded when a user-defined type is altered. @@ -467,7 +467,7 @@ message AlterType { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the affected type. - string type_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string type_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // RenameType is recorded when a user-defined type is renamed. @@ -475,9 +475,9 @@ message RenameType { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The old name of the affected type. - string type_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string type_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new name of the affected type. - string new_type_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string new_type_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // CreateStatistics is recorded when statistics are collected for a @@ -489,7 +489,7 @@ message CreateStatistics { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The name of the table for which the statistics were created. - string table_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string table_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // UnsafeUpsertDescriptor is recorded when a descriptor is written @@ -514,7 +514,7 @@ message UnsafeDeleteDescriptor { CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; uint32 parent_id = 3 [(gogoproto.customname) = "ParentID", (gogoproto.jsontag) = ",omitempty"]; uint32 parent_schema_id = 4 [(gogoproto.customname) = "ParentSchemaID", (gogoproto.jsontag) = ",omitempty"]; - string name = 5 [(gogoproto.jsontag) = ",omitempty"]; + string name = 5 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; bool force = 6 [(gogoproto.jsontag) = ",omitempty"]; string force_notice = 7 [(gogoproto.jsontag) = ",omitempty"]; } @@ -530,7 +530,7 @@ message UnsafeUpsertNamespaceEntry { CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; uint32 parent_id = 3 [(gogoproto.customname) = "ParentID", (gogoproto.jsontag) = ",omitempty"]; uint32 parent_schema_id = 4 [(gogoproto.customname) = "ParentSchemaID", (gogoproto.jsontag) = ",omitempty"]; - string name = 5 [(gogoproto.jsontag) = ",omitempty"]; + string name = 5 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; uint32 previous_id = 6 [(gogoproto.customname) = "PreviousID", (gogoproto.jsontag) = ",omitempty"]; bool force = 7 [(gogoproto.jsontag) = ",omitempty"]; bool failed_validation = 8 [(gogoproto.jsontag) = ",omitempty"]; @@ -548,7 +548,7 @@ message UnsafeDeleteNamespaceEntry { CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; uint32 parent_id = 3 [(gogoproto.customname) = "ParentID", (gogoproto.jsontag) = ",omitempty"]; uint32 parent_schema_id = 4 [(gogoproto.customname) = "ParentSchemaID", (gogoproto.jsontag) = ",omitempty"]; - string name = 5 [(gogoproto.jsontag) = ",omitempty"]; + string name = 5 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; bool force = 6 [(gogoproto.jsontag) = ",omitempty"]; string force_notice = 7 [(gogoproto.jsontag) = ",omitempty"]; } @@ -571,7 +571,7 @@ message CreateFunction { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // Name of the created function. - string function_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string function_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // If the new function is a replace of an existing function. bool is_replace = 4 [(gogoproto.jsontag) = ",omitempty"]; } @@ -580,8 +580,8 @@ message CreateFunction { message DropFunction { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; - // Name of the created function. - string function_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + // Name of the dropped function. + string function_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // RenameFunction is recorded when a user-defined function is renamed. @@ -589,9 +589,9 @@ message RenameFunction { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // The old name of the affected function. - string function_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string function_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; // The new name of the affected function. - string new_function_name = 4 [(gogoproto.jsontag) = ",omitempty"]; + string new_function_name = 4 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } // AlterFunctionOptions is recorded when a user-defined function's options are @@ -600,5 +600,5 @@ message AlterFunctionOptions { CommonEventDetails common = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; CommonSQLEventDetails sql = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "", (gogoproto.embed) = true]; // Name of the affected function. - string function_name = 3 [(gogoproto.jsontag) = ",omitempty"]; + string function_name = 3 [(gogoproto.jsontag) = ",omitempty", (gogoproto.moretags) = "redact:\"nonsensitive\""]; } diff --git a/pkg/util/log/eventpb/event_test.go b/pkg/util/log/eventpb/event_test.go index 43bfecf9d1c4..b4e68c4f685f 100644 --- a/pkg/util/log/eventpb/event_test.go +++ b/pkg/util/log/eventpb/event_test.go @@ -18,13 +18,13 @@ func TestEventJSON(t *testing.T) { ev logpb.EventPayload exp string }{ - // Check that sensitive fields get redaction markers. - {&CreateDatabase{DatabaseName: "hello"}, `"DatabaseName":"‹hello›"`}, - {&CreateDatabase{DatabaseName: "he‹llo"}, `"DatabaseName":"‹he?llo›"`}, + // Check that names do not get redaction markers. + {&CreateDatabase{DatabaseName: "hello"}, `"DatabaseName":"hello"`}, + {&CreateDatabase{DatabaseName: "he‹llo"}, `"DatabaseName":"he‹llo"`}, - // Check that strings in arrays are redactable too. + // Check that names in arrays are not redacted either. {&DropDatabase{DatabaseName: "hello", DroppedSchemaObjects: []string{"world", "uni‹verse"}}, - `"DatabaseName":"‹hello›","DroppedSchemaObjects":["‹world›","‹uni?verse›"]`}, + `"DatabaseName":"hello","DroppedSchemaObjects":["world","uni‹verse"]`}, // Check that non-sensitive fields are not redacted. {&ReverseSchemaChange{SQLSTATE: "XXUUU"}, `"SQLSTATE":"XXUUU"`}, @@ -43,7 +43,8 @@ func TestEventJSON(t *testing.T) { {&CreateDatabase{CommonSQLEventDetails: CommonSQLEventDetails{ApplicationName: "myapp"}}, `"ApplicationName":"myapp"`}, // Check that redactable strings get their redaction markers preserved. - {&CreateDatabase{CommonSQLEventDetails: CommonSQLEventDetails{Statement: "CREATE DATABASE ‹foo›"}}, `"Statement":"CREATE DATABASE ‹foo›"`}, + {&CreateDatabase{CommonSQLEventDetails: CommonSQLEventDetails{Statement: "CREATE DATABASE ‹foo›"}}, + `"Statement":"CREATE DATABASE ‹foo›"`}, // Integer and boolean fields are not redactable in any case. {&UnsafeDeleteDescriptor{ParentID: 123, Force: true}, `"ParentID":123,"Force":true`}, diff --git a/pkg/util/log/eventpb/json_encode_generated.go b/pkg/util/log/eventpb/json_encode_generated.go index 3ef3b6424516..09a6eb544dc1 100644 --- a/pkg/util/log/eventpb/json_encode_generated.go +++ b/pkg/util/log/eventpb/json_encode_generated.go @@ -40,9 +40,7 @@ func (m *AlterDatabaseAddRegion) AppendJSONFields(printComma bool, b redact.Reda } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -52,9 +50,7 @@ func (m *AlterDatabaseAddRegion) AppendJSONFields(printComma bool, b redact.Reda } printComma = true b = append(b, "\"RegionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.RegionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.RegionName))) b = append(b, '"') } @@ -74,9 +70,7 @@ func (m *AlterDatabaseDropRegion) AppendJSONFields(printComma bool, b redact.Red } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -86,9 +80,7 @@ func (m *AlterDatabaseDropRegion) AppendJSONFields(printComma bool, b redact.Red } printComma = true b = append(b, "\"RegionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.RegionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.RegionName))) b = append(b, '"') } @@ -142,9 +134,7 @@ func (m *AlterDatabasePlacement) AppendJSONFields(printComma bool, b redact.Reda } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -154,9 +144,7 @@ func (m *AlterDatabasePlacement) AppendJSONFields(printComma bool, b redact.Reda } printComma = true b = append(b, "\"Placement\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Placement))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Placement))) b = append(b, '"') } @@ -176,9 +164,7 @@ func (m *AlterDatabasePrimaryRegion) AppendJSONFields(printComma bool, b redact. } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -188,9 +174,7 @@ func (m *AlterDatabasePrimaryRegion) AppendJSONFields(printComma bool, b redact. } printComma = true b = append(b, "\"PrimaryRegionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.PrimaryRegionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.PrimaryRegionName))) b = append(b, '"') } @@ -222,9 +206,7 @@ func (m *AlterDatabaseSurvivalGoal) AppendJSONFields(printComma bool, b redact.R } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -234,9 +216,7 @@ func (m *AlterDatabaseSurvivalGoal) AppendJSONFields(printComma bool, b redact.R } printComma = true b = append(b, "\"SurvivalGoal\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SurvivalGoal))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SurvivalGoal))) b = append(b, '"') } @@ -313,9 +293,7 @@ func (m *AlterFunctionOptions) AppendJSONFields(printComma bool, b redact.Redact } printComma = true b = append(b, "\"FunctionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.FunctionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.FunctionName))) b = append(b, '"') } @@ -369,9 +347,7 @@ func (m *AlterIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -381,9 +357,7 @@ func (m *AlterIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"IndexName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.IndexName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.IndexName))) b = append(b, '"') } @@ -412,9 +386,7 @@ func (m *AlterIndexVisible) AppendJSONFields(printComma bool, b redact.Redactabl } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -424,9 +396,7 @@ func (m *AlterIndexVisible) AppendJSONFields(printComma bool, b redact.Redactabl } printComma = true b = append(b, "\"IndexName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.IndexName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.IndexName))) b = append(b, '"') } @@ -554,9 +524,7 @@ func (m *AlterSequence) AppendJSONFields(printComma bool, b redact.RedactableByt } printComma = true b = append(b, "\"SequenceName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SequenceName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SequenceName))) b = append(b, '"') } @@ -576,9 +544,7 @@ func (m *AlterTable) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -602,9 +568,7 @@ func (m *AlterTable) AppendJSONFields(printComma bool, b redact.RedactableBytes) b = append(b, ',') } b = append(b, '"') - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(v))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), v)) b = append(b, '"') } b = append(b, ']') @@ -660,9 +624,7 @@ func (m *AlterType) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TypeName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TypeName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TypeName))) b = append(b, '"') } @@ -1206,9 +1168,7 @@ func (m *CommentOnColumn) AppendJSONFields(printComma bool, b redact.RedactableB } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -1218,9 +1178,7 @@ func (m *CommentOnColumn) AppendJSONFields(printComma bool, b redact.RedactableB } printComma = true b = append(b, "\"ColumnName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.ColumnName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.ColumnName))) b = append(b, '"') } @@ -1261,9 +1219,7 @@ func (m *CommentOnConstraint) AppendJSONFields(printComma bool, b redact.Redacta } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -1273,9 +1229,7 @@ func (m *CommentOnConstraint) AppendJSONFields(printComma bool, b redact.Redacta } printComma = true b = append(b, "\"ConstraintName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.ConstraintName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.ConstraintName))) b = append(b, '"') } @@ -1316,9 +1270,7 @@ func (m *CommentOnDatabase) AppendJSONFields(printComma bool, b redact.Redactabl } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -1359,9 +1311,7 @@ func (m *CommentOnIndex) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -1371,9 +1321,7 @@ func (m *CommentOnIndex) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"IndexName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.IndexName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.IndexName))) b = append(b, '"') } @@ -1414,9 +1362,7 @@ func (m *CommentOnSchema) AppendJSONFields(printComma bool, b redact.RedactableB } printComma = true b = append(b, "\"SchemaName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SchemaName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SchemaName))) b = append(b, '"') } @@ -1457,9 +1403,7 @@ func (m *CommentOnTable) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -1500,9 +1444,7 @@ func (m *CommentOnType) AppendJSONFields(printComma bool, b redact.RedactableByt } printComma = true b = append(b, "\"TypeName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TypeName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TypeName))) b = append(b, '"') } @@ -2322,9 +2264,7 @@ func (m *CreateDatabase) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -2344,9 +2284,7 @@ func (m *CreateFunction) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"FunctionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.FunctionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.FunctionName))) b = append(b, '"') } @@ -2375,9 +2313,7 @@ func (m *CreateIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -2387,9 +2323,7 @@ func (m *CreateIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes } printComma = true b = append(b, "\"IndexName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.IndexName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.IndexName))) b = append(b, '"') } @@ -2440,9 +2374,7 @@ func (m *CreateSchema) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"SchemaName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SchemaName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SchemaName))) b = append(b, '"') } @@ -2452,9 +2384,7 @@ func (m *CreateSchema) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"Owner\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Owner))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Owner))) b = append(b, '"') } @@ -2474,9 +2404,7 @@ func (m *CreateSequence) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"SequenceName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SequenceName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SequenceName))) b = append(b, '"') } @@ -2486,9 +2414,7 @@ func (m *CreateSequence) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"Owner\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Owner))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Owner))) b = append(b, '"') } @@ -2508,9 +2434,7 @@ func (m *CreateStatistics) AppendJSONFields(printComma bool, b redact.Redactable } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -2530,9 +2454,7 @@ func (m *CreateTable) AppendJSONFields(printComma bool, b redact.RedactableBytes } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -2542,9 +2464,7 @@ func (m *CreateTable) AppendJSONFields(printComma bool, b redact.RedactableBytes } printComma = true b = append(b, "\"Owner\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Owner))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Owner))) b = append(b, '"') } @@ -2564,9 +2484,7 @@ func (m *CreateType) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TypeName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TypeName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TypeName))) b = append(b, '"') } @@ -2576,9 +2494,7 @@ func (m *CreateType) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"Owner\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Owner))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Owner))) b = append(b, '"') } @@ -2598,9 +2514,7 @@ func (m *CreateView) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"ViewName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.ViewName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.ViewName))) b = append(b, '"') } @@ -2610,9 +2524,7 @@ func (m *CreateView) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"Owner\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Owner))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Owner))) b = append(b, '"') } @@ -2736,9 +2648,7 @@ func (m *DropDatabase) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -2753,9 +2663,7 @@ func (m *DropDatabase) AppendJSONFields(printComma bool, b redact.RedactableByte b = append(b, ',') } b = append(b, '"') - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(v))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), v)) b = append(b, '"') } b = append(b, ']') @@ -2777,9 +2685,7 @@ func (m *DropFunction) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"FunctionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.FunctionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.FunctionName))) b = append(b, '"') } @@ -2799,9 +2705,7 @@ func (m *DropIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -2811,9 +2715,7 @@ func (m *DropIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"IndexName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.IndexName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.IndexName))) b = append(b, '"') } @@ -2837,9 +2739,7 @@ func (m *DropIndex) AppendJSONFields(printComma bool, b redact.RedactableBytes) b = append(b, ',') } b = append(b, '"') - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(v))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), v)) b = append(b, '"') } b = append(b, ']') @@ -2883,9 +2783,7 @@ func (m *DropSchema) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"SchemaName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SchemaName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SchemaName))) b = append(b, '"') } @@ -2905,9 +2803,7 @@ func (m *DropSequence) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"SequenceName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SequenceName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SequenceName))) b = append(b, '"') } @@ -2927,9 +2823,7 @@ func (m *DropTable) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -2944,9 +2838,7 @@ func (m *DropTable) AppendJSONFields(printComma bool, b redact.RedactableBytes) b = append(b, ',') } b = append(b, '"') - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(v))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), v)) b = append(b, '"') } b = append(b, ']') @@ -2968,9 +2860,7 @@ func (m *DropType) AppendJSONFields(printComma bool, b redact.RedactableBytes) ( } printComma = true b = append(b, "\"TypeName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TypeName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TypeName))) b = append(b, '"') } @@ -2990,9 +2880,7 @@ func (m *DropView) AppendJSONFields(printComma bool, b redact.RedactableBytes) ( } printComma = true b = append(b, "\"ViewName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.ViewName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.ViewName))) b = append(b, '"') } @@ -3007,9 +2895,7 @@ func (m *DropView) AppendJSONFields(printComma bool, b redact.RedactableBytes) ( b = append(b, ',') } b = append(b, '"') - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(v))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), v)) b = append(b, '"') } b = append(b, ']') @@ -3988,9 +3874,7 @@ func (m *RenameDatabase) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"DatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DatabaseName))) b = append(b, '"') } @@ -4000,9 +3884,7 @@ func (m *RenameDatabase) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"NewDatabaseName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.NewDatabaseName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.NewDatabaseName))) b = append(b, '"') } @@ -4022,9 +3904,7 @@ func (m *RenameFunction) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"FunctionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.FunctionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.FunctionName))) b = append(b, '"') } @@ -4034,9 +3914,7 @@ func (m *RenameFunction) AppendJSONFields(printComma bool, b redact.RedactableBy } printComma = true b = append(b, "\"NewFunctionName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.NewFunctionName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.NewFunctionName))) b = append(b, '"') } @@ -4056,9 +3934,7 @@ func (m *RenameSchema) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"SchemaName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.SchemaName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.SchemaName))) b = append(b, '"') } @@ -4068,9 +3944,7 @@ func (m *RenameSchema) AppendJSONFields(printComma bool, b redact.RedactableByte } printComma = true b = append(b, "\"NewSchemaName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.NewSchemaName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.NewSchemaName))) b = append(b, '"') } @@ -4090,9 +3964,7 @@ func (m *RenameTable) AppendJSONFields(printComma bool, b redact.RedactableBytes } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -4102,9 +3974,7 @@ func (m *RenameTable) AppendJSONFields(printComma bool, b redact.RedactableBytes } printComma = true b = append(b, "\"NewTableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.NewTableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.NewTableName))) b = append(b, '"') } @@ -4124,9 +3994,7 @@ func (m *RenameType) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"TypeName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TypeName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TypeName))) b = append(b, '"') } @@ -4136,9 +4004,7 @@ func (m *RenameType) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"NewTypeName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.NewTypeName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.NewTypeName))) b = append(b, '"') } @@ -4168,9 +4034,7 @@ func (m *ReverseSchemaChange) AppendJSONFields(printComma bool, b redact.Redacta } printComma = true b = append(b, "\"Error\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Error))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Error))) b = append(b, '"') } @@ -5602,9 +5466,7 @@ func (m *SetSchema) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"DescriptorName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DescriptorName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DescriptorName))) b = append(b, '"') } @@ -5614,9 +5476,7 @@ func (m *SetSchema) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"NewDescriptorName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.NewDescriptorName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.NewDescriptorName))) b = append(b, '"') } @@ -5626,9 +5486,7 @@ func (m *SetSchema) AppendJSONFields(printComma bool, b redact.RedactableBytes) } printComma = true b = append(b, "\"DescriptorType\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.DescriptorType))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.DescriptorType))) b = append(b, '"') } @@ -6213,9 +6071,7 @@ func (m *TruncateTable) AppendJSONFields(printComma bool, b redact.RedactableByt } printComma = true b = append(b, "\"TableName\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.TableName))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.TableName))) b = append(b, '"') } @@ -6301,9 +6157,7 @@ func (m *UnsafeDeleteDescriptor) AppendJSONFields(printComma bool, b redact.Reda } printComma = true b = append(b, "\"Name\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Name))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Name))) b = append(b, '"') } @@ -6362,9 +6216,7 @@ func (m *UnsafeDeleteNamespaceEntry) AppendJSONFields(printComma bool, b redact. } printComma = true b = append(b, "\"Name\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Name))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Name))) b = append(b, '"') } @@ -6478,9 +6330,7 @@ func (m *UnsafeUpsertNamespaceEntry) AppendJSONFields(printComma bool, b redact. } printComma = true b = append(b, "\"Name\":\""...) - b = append(b, redact.StartMarker()...) - b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(redact.EscapeMarkers([]byte(m.Name))))) - b = append(b, redact.EndMarker()...) + b = redact.RedactableBytes(jsonbytes.EncodeString([]byte(b), string(m.Name))) b = append(b, '"') }