Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

schemachanger,*: introduce new schema changer #58979

Merged
merged 15 commits into from
Feb 2, 2021
Merged

schemachanger,*: introduce new schema changer #58979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
de5f8e7
sql/catalog: add a DescriptorIDSet in the image of ColumnIDSet
ajwerner Jan 25, 2021
a1decc6
schemachanger/scpb: introduce protobufs for schemachanger state
ajwerner Jan 25, 2021
957b1c8
schemachanger/scop: introduce schema changer operations
ajwerner Jan 25, 2021
697d609
schemachanger/scgraph: add library for schema change plan graphs
ajwerner Jan 25, 2021
7a5993f
schemachanger/scbuild: add library to convert AST nodes to schema ele…
ajwerner Jan 25, 2021
0d1b8fe
schemachanger/scplan: add library to plan schema changes
ajwerner Jan 25, 2021
40f58fc
schemachange/scexec: add library to execute schema change operations
ajwerner Jan 25, 2021
cd76842
sql: add an adapter to the index backfiller for use in scexec
ajwerner Jan 25, 2021
0f003e1
schemachanger/scjob,jobs: add a job to execute new schema changes
ajwerner Jan 25, 2021
c0bb7c0
sql: hook up new schema change to connExecutor
ajwerner Jan 25, 2021
249b43e
sql: explicitly pass a context to QueueJob
ajwerner Jan 25, 2021
f157c66
sql/rowexec: move code used only for testing to test file
ajwerner Jan 25, 2021
7542652
sql/logictest: add new_schema_changer test file
ajwerner Jan 25, 2021
b09e19a
schemachanger/scgraphviz: library to generate graphviz graphs
ajwerner Jan 25, 2021
a719fda
sql: hook up graphviz for schema changes to EXPLAIN (DDL)
ajwerner Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions DEPS.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,14 @@ def go_deps():
sum = "h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=",
version = "v1.0.0",
)
go_repository(
name = "com_github_emicklei_dot",
build_file_proto_mode = "disable_global",
importpath = "github.com/emicklei/dot",
sum = "h1:XDBW0Xco1QNyRb33cqLe10cT04yMWL1XpCZfa98Q6Og=",
version = "v0.15.0",
)

go_repository(
name = "com_github_envoyproxy_go_control_plane",
build_file_proto_mode = "disable_global",
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/settings/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@
<tr><td><code>trace.debug.enable</code></td><td>boolean</td><td><code>false</code></td><td>if set, traces for recent requests can be seen at https://<ui>/debug/requests</td></tr>
<tr><td><code>trace.lightstep.token</code></td><td>string</td><td><code></code></td><td>if set, traces go to Lightstep using this token</td></tr>
<tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'); ignored if trace.lightstep.token is set</td></tr>
<tr><td><code>version</code></td><td>version</td><td><code>20.2-16</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
<tr><td><code>version</code></td><td>version</td><td><code>20.2-18</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
</tbody>
</table>
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ require (
github.com/edsrzf/mmap-go v1.0.0
github.com/elastic/gosigar v0.10.0
github.com/elazarl/go-bindata-assetfs v1.0.0
github.com/emicklei/dot v0.15.0
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a
github.com/frankban/quicktest v1.7.3 // indirect
github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@ github.com/elastic/gosigar v0.10.0 h1:bPIzW1Qkut7n9uwvPAXbnLDVEd45TV5ZwxYZAVX/zE
github.com/elastic/gosigar v0.10.0/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs=
github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
github.com/emicklei/dot v0.15.0 h1:XDBW0Xco1QNyRb33cqLe10cT04yMWL1XpCZfa98Q6Og=
github.com/emicklei/dot v0.15.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
Expand Down
7 changes: 6 additions & 1 deletion pkg/clusterversion/cockroach_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ const (
// using the replicated legacy TruncatedState. It's also used in asserting
// that no replicated truncated state representation is found.
PostTruncatedAndRangeAppliedStateMigration
// NewSchemaChanger enables the new schema changer.
NewSchemaChanger

// Step (1): Add new versions here.
)
Expand Down Expand Up @@ -355,7 +357,10 @@ var versionsSingleton = keyedVersions([]keyedVersion{
Key: PostTruncatedAndRangeAppliedStateMigration,
Version: roachpb.Version{Major: 20, Minor: 2, Internal: 16},
},

{
Key: NewSchemaChanger,
Version: roachpb.Version{Major: 20, Minor: 2, Internal: 18},
},
// Step (2): Add new versions here.
})

Expand Down
5 changes: 3 additions & 2 deletions pkg/clusterversion/key_string.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions pkg/jobs/jobs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,9 +1963,10 @@ func TestJobInTxn(t *testing.T) {
if !ok {
return nil, nil, nil, false, nil
}
fn := func(_ context.Context, _ []sql.PlanNode, _ chan<- tree.Datums) error {
fn := func(ctx context.Context, _ []sql.PlanNode, _ chan<- tree.Datums) error {
var err error
job, err = execCtx.ExtendedEvalContext().QueueJob(
ctx,
jobs.Record{
Description: st.String(),
Details: jobspb.BackupDetails{},
Expand Down Expand Up @@ -1998,9 +1999,10 @@ func TestJobInTxn(t *testing.T) {
if !ok {
return nil, nil, nil, false, nil
}
fn := func(_ context.Context, _ []sql.PlanNode, _ chan<- tree.Datums) error {
fn := func(ctx context.Context, _ []sql.PlanNode, _ chan<- tree.Datums) error {
var err error
job, err = execCtx.ExtendedEvalContext().QueueJob(
ctx,
jobs.Record{
Description: "RESTORE",
Details: jobspb.RestoreDetails{},
Expand Down
2 changes: 2 additions & 0 deletions pkg/jobs/jobspb/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ proto_library(
deps = [
"//pkg/roachpb:roachpb_proto",
"//pkg/sql/catalog/descpb:descpb_proto",
"//pkg/sql/schemachanger/scpb:scpb_proto",
"//pkg/util/hlc:hlc_proto",
"@com_github_cockroachdb_errors//errorspb:errorspb_proto",
"@com_github_gogo_protobuf//gogoproto:gogo_proto",
Expand All @@ -44,6 +45,7 @@ go_proto_library(
"//pkg/roachpb",
"//pkg/security", # keep
"//pkg/sql/catalog/descpb",
"//pkg/sql/schemachanger/scpb",
"//pkg/sql/sem/tree", # keep
"//pkg/util/hlc",
"@com_github_cockroachdb_errors//errorspb",
Expand Down
Loading