forked from cockroachdb/cockroach
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sql/schemachanger/scrun: add validation in makeState
This addresses a TODO and has a test. It also fixes a bug in the testing infrastructure whereby we were using the wrong protocol buffer message type to deserialize session data. Release note: None
- Loading branch information
Showing
9 changed files
with
360 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| // Copyright 2022 The Cockroach Authors. | ||
| // | ||
| // Use of this software is governed by the Business Source License | ||
| // included in the file licenses/BSL.txt. | ||
| // | ||
| // As of the Change Date specified in that file, in accordance with | ||
| // the Business Source License, use of this software will be governed | ||
| // by the Apache License, Version 2.0, included in the file | ||
| // licenses/APL.txt. | ||
|
|
||
| package scrun | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/catalog" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scexec" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb" | ||
| "github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // fakeCatalog is a fake implementation of scexec.Catalog for testing makeState. | ||
| type fakeCatalog struct { | ||
| descs map[descpb.ID]catalog.Descriptor | ||
| scexec.Catalog | ||
| } | ||
|
|
||
| func (fc fakeCatalog) MustReadImmutableDescriptors( | ||
| ctx context.Context, ids ...descpb.ID, | ||
| ) ([]catalog.Descriptor, error) { | ||
| ret := make([]catalog.Descriptor, len(ids)) | ||
| for i, id := range ids { | ||
| d, ok := fc.descs[id] | ||
| if !ok { | ||
| panic("boom") | ||
| } | ||
| ret[i] = d | ||
| } | ||
| return ret, nil | ||
| } | ||
|
|
||
| // TestMakeState tests some validation checking in the makeState function. | ||
| func TestMakeState(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
|
|
||
| ctx := context.Background() | ||
|
|
||
| for _, tc := range []struct { | ||
| name string | ||
| ids []descpb.ID | ||
| rollback bool | ||
| jobID jobspb.JobID | ||
| descriptors []catalog.Descriptor | ||
| expErr string | ||
| }{ | ||
| { | ||
| name: "missing job ID", | ||
| jobID: 1, | ||
| ids: []descpb.ID{2}, | ||
| expErr: `descriptor "foo" \(2\): missing job ID in schema changer state`, | ||
| descriptors: []catalog.Descriptor{ | ||
| tabledesc.NewBuilder(&descpb.TableDescriptor{ | ||
| Name: "foo", | ||
| ID: 2, | ||
| DeclarativeSchemaChangerState: &scpb.DescriptorState{ | ||
| Authorization: scpb.Authorization{ | ||
| UserName: "user1", | ||
| AppName: "app1", | ||
| }, | ||
| }, | ||
| }).BuildImmutable(), | ||
| }, | ||
| }, | ||
| { | ||
| name: "mismatched job ID", | ||
| jobID: 1, | ||
| ids: []descpb.ID{2}, | ||
| expErr: `descriptor "foo" \(2\): job ID mismatch: expected 1, got 2`, | ||
| descriptors: []catalog.Descriptor{ | ||
| tabledesc.NewBuilder(&descpb.TableDescriptor{ | ||
| Name: "foo", | ||
| ID: 2, | ||
| DeclarativeSchemaChangerState: &scpb.DescriptorState{ | ||
| JobID: 2, | ||
| Authorization: scpb.Authorization{ | ||
| UserName: "user1", | ||
| AppName: "app1", | ||
| }, | ||
| }, | ||
| }).BuildImmutable(), | ||
| }, | ||
| }, | ||
| { | ||
| name: "missing authorization", | ||
| jobID: 1, | ||
| ids: []descpb.ID{2}, | ||
| expErr: `descriptor "foo" \(2\): missing authorization in schema changer state`, | ||
| descriptors: []catalog.Descriptor{ | ||
| tabledesc.NewBuilder(&descpb.TableDescriptor{ | ||
| Name: "foo", | ||
| ID: 2, | ||
| DeclarativeSchemaChangerState: &scpb.DescriptorState{ | ||
| JobID: 1, | ||
| }, | ||
| }).BuildImmutable(), | ||
| }, | ||
| }, | ||
| { | ||
| name: "mismatched authorization", | ||
| jobID: 1, | ||
| ids: []descpb.ID{2, 3}, | ||
| expErr: `descriptor "bar" \(3\): authorization mismatch: expected {user1 app1}, got {user2 app1}`, | ||
| descriptors: []catalog.Descriptor{ | ||
| tabledesc.NewBuilder(&descpb.TableDescriptor{ | ||
| Name: "foo", | ||
| ID: 2, | ||
| DeclarativeSchemaChangerState: &scpb.DescriptorState{ | ||
| JobID: 1, | ||
| Authorization: scpb.Authorization{ | ||
| UserName: "user1", | ||
| AppName: "app1", | ||
| }, | ||
| }, | ||
| }).BuildImmutable(), | ||
| tabledesc.NewBuilder(&descpb.TableDescriptor{ | ||
| Name: "bar", | ||
| ID: 3, | ||
| DeclarativeSchemaChangerState: &scpb.DescriptorState{ | ||
| JobID: 1, | ||
| Authorization: scpb.Authorization{ | ||
| UserName: "user2", | ||
| AppName: "app1", | ||
| }, | ||
| }, | ||
| }).BuildImmutable(), | ||
| }, | ||
| }, | ||
| } { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| cat := fakeCatalog{ | ||
| descs: map[descpb.ID]catalog.Descriptor{}, | ||
| } | ||
| for _, d := range tc.descriptors { | ||
| cat.descs[d.GetID()] = d | ||
| } | ||
| _, err := makeState(ctx, 1, tc.ids, true, func( | ||
| ctx context.Context, f func(context.Context, scexec.Catalog) error) error { | ||
| return f(ctx, cat) | ||
| }) | ||
| if tc.expErr == "" { | ||
| require.NoError(t, err) | ||
| } else { | ||
| require.Regexp(t, tc.expErr, err) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.