Skip to content

Commit 2214ab5

Browse files
andyyang890andyyang890
committed
break dependency from changefeedpb to parser
1 parent 820a24b commit 2214ab5

File tree

9 files changed

+120
-37
lines changed

9 files changed

+120
-37
lines changed

‎pkg/BUILD.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ALL_TESTS = [
3737
"//pkg/ccl/changefeedccl/kvevent:kvevent_test",
3838
"//pkg/ccl/changefeedccl/kvfeed:kvfeed_test",
3939
"//pkg/ccl/changefeedccl/resolvedspan:resolvedspan_test",
40+
"//pkg/ccl/changefeedccl/scheduledchangefeed:scheduledchangefeed_test",
4041
"//pkg/ccl/changefeedccl/schemafeed:schemafeed_test",
4142
"//pkg/ccl/changefeedccl/tableset:tableset_test",
4243
"//pkg/ccl/changefeedccl:changefeedccl_test",
@@ -950,6 +951,8 @@ GO_TARGETS = [
950951
"//pkg/ccl/changefeedccl/mocks:mocks",
951952
"//pkg/ccl/changefeedccl/resolvedspan:resolvedspan",
952953
"//pkg/ccl/changefeedccl/resolvedspan:resolvedspan_test",
954+
"//pkg/ccl/changefeedccl/scheduledchangefeed:scheduledchangefeed",
955+
"//pkg/ccl/changefeedccl/scheduledchangefeed:scheduledchangefeed_test",
953956
"//pkg/ccl/changefeedccl/schemafeed/schematestutils:schematestutils",
954957
"//pkg/ccl/changefeedccl/schemafeed:schemafeed",
955958
"//pkg/ccl/changefeedccl/schemafeed:schemafeed_test",

‎pkg/ccl/changefeedccl/BUILD.bazel‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ go_library(
2727
"parquet_sink_cloudstorage.go",
2828
"protected_timestamps.go",
2929
"retry.go",
30-
"scheduled_changefeed.go",
3130
"schema_registry.go",
3231
"sink.go",
3332
"sink_cloudstorage.go",
@@ -87,8 +86,6 @@ go_library(
8786
"//pkg/kv/kvserver/protectedts/ptpb",
8887
"//pkg/multitenant",
8988
"//pkg/roachpb",
90-
"//pkg/scheduledjobs",
91-
"//pkg/scheduledjobs/schedulebase",
9289
"//pkg/security/username",
9390
"//pkg/server/status",
9491
"//pkg/server/telemetry",
@@ -213,7 +210,6 @@ go_test(
213210
"nemeses_test.go",
214211
"parquet_test.go",
215212
"protected_timestamps_test.go",
216-
"scheduled_changefeed_test.go",
217213
"schema_registry_test.go",
218214
"show_changefeed_jobs_test.go",
219215
"sink_cloudstorage_test.go",
@@ -261,7 +257,6 @@ go_test(
261257
"//pkg/internal/sqlsmith",
262258
"//pkg/jobs",
263259
"//pkg/jobs/jobspb",
264-
"//pkg/jobs/jobstest",
265260
"//pkg/keys",
266261
"//pkg/kv",
267262
"//pkg/kv/kvclient/kvcoord",
@@ -273,8 +268,6 @@ go_test(
273268
"//pkg/kv/kvserver/protectedts/ptpb",
274269
"//pkg/multitenant/tenantcapabilitiespb",
275270
"//pkg/roachpb",
276-
"//pkg/scheduledjobs",
277-
"//pkg/scheduledjobs/schedulebase",
278271
"//pkg/security/securityassets",
279272
"//pkg/security/securitytest",
280273
"//pkg/security/username",
@@ -365,7 +358,6 @@ go_test(
365358
"@com_github_cockroachdb_errors//:errors",
366359
"@com_github_cockroachdb_redact//:redact",
367360
"@com_github_dustin_go_humanize//:go-humanize",
368-
"@com_github_gogo_protobuf//types",
369361
"@com_github_golang_mock//gomock",
370362
"@com_github_ibm_sarama//:sarama",
371363
"@com_github_jackc_pgx_v5//:pgx",

‎pkg/ccl/changefeedccl/changefeedpb/BUILD.bazel‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
44

55
proto_library(
66
name = "changefeedpb_proto",
7-
srcs = [
8-
"changefeed.proto",
9-
"scheduled_changefeed.proto",
10-
],
7+
srcs = ["changefeed.proto"],
118
strip_import_prefix = "/pkg",
129
visibility = ["//visibility:public"],
1310
deps = [
@@ -33,19 +30,9 @@ go_proto_library(
3330

3431
go_library(
3532
name = "changefeedpb",
36-
srcs = [
37-
"changefeed.go",
38-
"marshal.go",
39-
],
33+
srcs = ["changefeed.go"],
4034
embed = [":changefeedpb_go_proto"],
4135
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedpb",
4236
visibility = ["//visibility:public"],
43-
deps = [
44-
"//pkg/cloud",
45-
"//pkg/sql/catalog/descpb",
46-
"//pkg/sql/parser",
47-
"//pkg/sql/sem/tree",
48-
"@com_github_cockroachdb_errors//:errors",
49-
"@com_github_gogo_protobuf//jsonpb",
50-
],
37+
deps = ["//pkg/sql/catalog/descpb"],
5138
)

‎pkg/ccl/changefeedccl/scheduledchangefeed/BUILD.bazel‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
2+
load("@rules_proto//proto:defs.bzl", "proto_library")
3+
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
4+
5+
proto_library(
6+
name = "scheduledchangefeedpb_proto",
7+
srcs = ["scheduled_changefeed.proto"],
8+
strip_import_prefix = "/pkg",
9+
visibility = ["//visibility:public"],
10+
)
11+
12+
go_proto_library(
13+
name = "scheduledchangefeedpb_go_proto",
14+
compilers = ["//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler"],
15+
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/scheduledchangefeedpb",
16+
proto = ":scheduledchangefeedpb_proto",
17+
visibility = ["//visibility:public"],
18+
)
19+
20+
go_proto_library(
21+
name = "scheduledchangefeed_go_proto",
22+
compilers = ["//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler"],
23+
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/scheduledchangefeed",
24+
proto = ":scheduledchangefeedpb_proto",
25+
visibility = ["//visibility:public"],
26+
)
27+
28+
go_library(
29+
name = "scheduledchangefeed",
30+
srcs = [
31+
"marshal.go",
32+
"scheduled_changefeed.go",
33+
],
34+
embed = [":scheduledchangefeed_go_proto"],
35+
importpath = "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/scheduledchangefeed",
36+
visibility = ["//visibility:public"],
37+
deps = [
38+
"//pkg/ccl/changefeedccl/changefeedbase",
39+
"//pkg/ccl/changefeedccl/changefeedvalidators",
40+
"//pkg/ccl/utilccl",
41+
"//pkg/cloud",
42+
"//pkg/clusterversion",
43+
"//pkg/jobs",
44+
"//pkg/jobs/jobspb",
45+
"//pkg/scheduledjobs",
46+
"//pkg/scheduledjobs/schedulebase",
47+
"//pkg/security/username",
48+
"//pkg/server/telemetry",
49+
"//pkg/sql",
50+
"//pkg/sql/catalog/colinfo",
51+
"//pkg/sql/exprutil",
52+
"//pkg/sql/isql",
53+
"//pkg/sql/parser",
54+
"//pkg/sql/pgwire/pgcode",
55+
"//pkg/sql/pgwire/pgerror",
56+
"//pkg/sql/pgwire/pgnotice",
57+
"//pkg/sql/sem/eval",
58+
"//pkg/sql/sem/tree",
59+
"//pkg/sql/types",
60+
"//pkg/util/ctxgroup",
61+
"//pkg/util/log",
62+
"//pkg/util/metric",
63+
"//pkg/util/uuid",
64+
"@com_github_cockroachdb_errors//:errors",
65+
"@com_github_gogo_protobuf//jsonpb",
66+
"@com_github_gogo_protobuf//types",
67+
],
68+
)
69+
70+
go_test(
71+
name = "scheduledchangefeed_test",
72+
srcs = ["scheduled_changefeed_test.go"],
73+
embed = [":scheduledchangefeed"],
74+
deps = [
75+
"//pkg/base",
76+
"//pkg/ccl/changefeedccl/cdctest",
77+
"//pkg/ccl/changefeedccl/changefeedbase",
78+
"//pkg/ccl/utilccl",
79+
"//pkg/jobs",
80+
"//pkg/jobs/jobspb",
81+
"//pkg/jobs/jobstest",
82+
"//pkg/scheduledjobs",
83+
"//pkg/scheduledjobs/schedulebase",
84+
"//pkg/security/username",
85+
"//pkg/sql",
86+
"//pkg/sql/catalog/descs",
87+
"//pkg/sql/execinfra",
88+
"//pkg/sql/parser",
89+
"//pkg/sql/sem/tree",
90+
"//pkg/sql/sessiondata",
91+
"//pkg/testutils",
92+
"//pkg/testutils/serverutils",
93+
"//pkg/testutils/sqlutils",
94+
"//pkg/util/leaktest",
95+
"//pkg/util/log",
96+
"//pkg/util/timeutil",
97+
"@com_github_cockroachdb_errors//:errors",
98+
"@com_github_gogo_protobuf//types",
99+
"@com_github_stretchr_testify//require",
100+
],
101+
)

‎pkg/ccl/changefeedccl/changefeedpb/marshal.go‎ renamed to ‎pkg/ccl/changefeedccl/scheduledchangefeed/marshal.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Use of this software is governed by the CockroachDB Software License
44
// included in the /LICENSE file.
55

6-
package changefeedpb
6+
package scheduledchangefeed
77

88
import (
99
"encoding/json"

‎pkg/ccl/changefeedccl/scheduled_changefeed.go‎ renamed to ‎pkg/ccl/changefeedccl/scheduledchangefeed/scheduled_changefeed.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
// Use of this software is governed by the CockroachDB Software License
44
// included in the /LICENSE file.
55

6-
package changefeedccl
6+
package scheduledchangefeed
77

88
import (
99
"context"
1010
"fmt"
1111
"time"
1212

1313
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
14-
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedpb"
1514
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedvalidators"
1615
"github.com/cockroachdb/cockroach/pkg/ccl/utilccl"
1716
"github.com/cockroachdb/cockroach/pkg/clusterversion"
@@ -124,7 +123,7 @@ func (s *scheduledChangefeedExecutor) GetCreateScheduleStatement(
124123
return "", err
125124
}
126125

127-
args := &changefeedpb.ScheduledChangefeedExecutionArgs{}
126+
args := &ScheduledChangefeedExecutionArgs{}
128127
if err := pbtypes.UnmarshalAny(sj.ExecutionArgs().Args, args); err != nil {
129128
return "", errors.Wrap(err, "un-marshaling args")
130129
}
@@ -216,7 +215,7 @@ func (s *scheduledChangefeedExecutor) executeChangefeed(
216215
// extractChangefeedStatement returns tree.CreateChangefeed node encoded inside
217216
// scheduled job.
218217
func extractChangefeedStatement(sj *jobs.ScheduledJob) (*annotatedChangefeedStatement, error) {
219-
args := &changefeedpb.ScheduledChangefeedExecutionArgs{}
218+
args := &ScheduledChangefeedExecutionArgs{}
220219
if err := pbtypes.UnmarshalAny(sj.ExecutionArgs().Args, args); err != nil {
221220
return nil, errors.Wrap(err, "un-marshaling args")
222221
}
@@ -390,7 +389,7 @@ func makeChangefeedSchedule(
390389

391390
sj.SetScheduleDetails(details)
392391

393-
var args changefeedpb.ScheduledChangefeedExecutionArgs
392+
var args ScheduledChangefeedExecutionArgs
394393
args.ChangefeedStatement = tree.AsStringWithFlags(changefeedNode, tree.FmtParsable|tree.FmtShowPasswords)
395394
any, err := pbtypes.MarshalAny(&args)
396395
if err != nil {

‎pkg/ccl/changefeedccl/changefeedpb/scheduled_changefeed.proto‎ renamed to ‎pkg/ccl/changefeedccl/scheduledchangefeed/scheduled_changefeed.proto‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
// included in the /LICENSE file.
55

66
syntax = "proto3";
7-
package cockroach.ccl.changefeedccl;
8-
option go_package = "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedpb";
7+
package cockroach.ccl.scheduledchangefeed;
8+
option go_package = "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/scheduledchangefeed";
99

10-
// ScheduledExportExecutionArgs is the arguments to the scheduled backup executor.
10+
// ScheduledChangefeedExecutionArgs is the arguments to the scheduled changefeed executor.
1111
message ScheduledChangefeedExecutionArgs {
1212
string changefeed_statement = 1;
1313
}

‎pkg/ccl/changefeedccl/scheduled_changefeed_test.go‎ renamed to ‎pkg/ccl/changefeedccl/scheduledchangefeed/scheduled_changefeed_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Use of this software is governed by the CockroachDB Software License
44
// included in the /LICENSE file.
55

6-
package changefeedccl
6+
package scheduledchangefeed
77

88
import (
99
"context"
@@ -18,7 +18,6 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/base"
1919
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdctest"
2020
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
21-
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedpb"
2221
"github.com/cockroachdb/cockroach/pkg/ccl/utilccl"
2322
"github.com/cockroachdb/cockroach/pkg/jobs"
2423
"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
@@ -165,7 +164,7 @@ func (h *testHelper) createChangefeedSchedule(
165164
}
166165

167166
func getScheduledChangefeedStatement(t *testing.T, arg *jobspb.ExecutionArguments) string {
168-
var scheduledChangefeed changefeedpb.ScheduledChangefeedExecutionArgs
167+
var scheduledChangefeed ScheduledChangefeedExecutionArgs
169168
require.NoError(t, pbtypes.UnmarshalAny(arg.Args, &scheduledChangefeed))
170169
return scheduledChangefeed.ChangefeedStatement
171170
}
@@ -676,7 +675,7 @@ func TestScheduledChangefeedErrors(t *testing.T) {
676675
}
677676

678677
func extractChangefeedNode(sj *jobs.ScheduledJob) (*tree.CreateChangefeed, error) {
679-
args := &changefeedpb.ScheduledChangefeedExecutionArgs{}
678+
args := &ScheduledChangefeedExecutionArgs{}
680679
if err := pbtypes.UnmarshalAny(sj.ExecutionArgs().Args, args); err != nil {
681680
return nil, errors.Wrap(err, "un-marshaling args")
682681
}

‎pkg/gen/protobuf.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ PROTOBUF_SRCS = [
1111
"//pkg/build/bazel/bes:build_event_stream_go_proto",
1212
"//pkg/build:build_go_proto",
1313
"//pkg/ccl/changefeedccl/changefeedpb:changefeedpb_go_proto",
14+
"//pkg/ccl/changefeedccl/scheduledchangefeed:scheduledchangefeed_go_proto",
15+
"//pkg/ccl/changefeedccl/scheduledchangefeed:scheduledchangefeedpb_go_proto",
1416
"//pkg/ccl/sqlproxyccl/tenant:tenant_go_proto",
1517
"//pkg/ccl/utilccl/licenseccl:licenseccl_go_proto",
1618
"//pkg/cloud/cloudpb:cloudpb_go_proto",

0 commit comments

Comments
 (0)