Merge #151416

151416: changefeedccl: import proto schema from changefeedpb repo r=rickystewart a=elizaMkraule

This change updates dependencies and imports the proto schema
from the external changefeedpb repository.

Fixes: #149703


Co-authored-by: Eliza Kraule <[email protected]>

Author: craig[bot]

BUILD.bazel

@@ -54,6 +54,7 @@ exports_files([
 # gazelle:resolve go github.com/cockroachdb/cockroach/pkg/sql/colflow_test //pkg/sql/colflow:colflow_test
 # gazelle:resolve go github.com/cockroachdb/cockroach/pkg/util/caller_test //pkg/util/caller:caller_test
 # gazelle:resolve go github.com/cockroachdb/cockroach/pkg/util/json_test //pkg/util/json:json_test
+# gazelle:resolve go github.com/cockroachdb/changefeedpb @com_github_cockroachdb_changefeedpb//:go_default_library
 # gazelle:resolve go google.golang.org/genproto/googleapis/pubsub/v1 @org_golang_google_genproto//googleapis/pubsub/v1:pubsub
 # gazelle:resolve go google.golang.org/genproto/googleapis/cloud/kms/v1 @org_golang_google_genproto//googleapis/cloud/kms/v1:kms
 # gazelle:resolve go google.golang.org/genproto/googleapis/devtools/build/v1 @org_golang_google_genproto//googleapis/devtools/build/v1:build

DEPS.bzl

@@ -1721,6 +1721,21 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v3/com_github_cockroachdb_apd_v3-v3.2.1.zip",
         ],
     )
+    go_repository(
+        name = "com_github_cockroachdb_changefeedpb",
+        build_directives = [
+            "gazelle:go_proto_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler",
+            "gazelle:go_grpc_compilers  @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+            "gazelle:resolve go go github.com/golang/protobuf/ptypes/timestamp @com_github_golang_protobuf//ptypes/timestamp:go_default_library",
+        ],
+        build_file_proto_mode = "default",
+        importpath = "github.com/cockroachdb/changefeedpb",
+        sha256 = "94533028aec2a4a56b8c5e6ea0e43513dcc160075765cbc6fbe720a0fcafc6a5",
+        strip_prefix = "github.com/cockroachdb/[email protected]",
+        urls = [
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/changefeedpb/com_github_cockroachdb_changefeedpb-v0.0.0-20250807204158-c4f634c8d95c.zip",
+        ],
+    )
     go_repository(
         name = "com_github_cockroachdb_cmux",
         build_file_proto_mode = "disable_global",
@@ -1774,10 +1789,10 @@ def go_deps():
     go_repository(
         name = "com_github_cockroachdb_errors",
         build_directives = [
-            "gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto",
-            "gazelle:resolve proto go gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto",
             "gazelle:go_proto_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler",
-            "gazelle:go_grpc_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+            "gazelle:go_grpc_compilers  @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+            "gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto",
+            "gazelle:resolve proto go   gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto",
         ],
         build_file_proto_mode = "default",
         importpath = "github.com/cockroachdb/errors",
@@ -7548,6 +7563,8 @@ def go_deps():
     go_repository(
         name = "com_github_prometheus_client_model",
         build_directives = [
+            "gazelle:go_proto_compilers @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler",
+            "gazelle:go_grpc_compilers  @com_github_cockroachdb_cockroach//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
             "gazelle:resolve go go github.com/golang/protobuf/ptypes/timestamp @com_github_golang_protobuf//ptypes/timestamp:go_default_library",
         ],
         build_file_proto_mode = "default",

build/bazelutil/distdir_files.bzl

@@ -344,6 +344,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/com_github_cockroachdb_apd-v1.1.0.zip": "fef7ec2fae220f84bfacb17fbfc1b04a666ab7f6fc04f3ff6d2b1e05c380777d",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v3/com_github_cockroachdb_apd_v3-v3.2.1.zip": "6ad54bb71a36fba8ca6725a00d916e51815a4c68de54096313ca6fffda6c87c2",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/bubbletea/com_github_cockroachdb_bubbletea-v0.23.1-bracketed-paste2.zip": "d7916a0e7d8d814566e8f8d162c3764aea947296396a0a669564ff3ee53414bc",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/changefeedpb/com_github_cockroachdb_changefeedpb-v0.0.0-20250807204158-c4f634c8d95c.zip": "94533028aec2a4a56b8c5e6ea0e43513dcc160075765cbc6fbe720a0fcafc6a5",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/client_golang/com_github_cockroachdb_client_golang-v0.0.0-20250124161916-2d4b7d300341.zip": "b4fc2d09aab49c3315b442db09b08bbc7f164d5536404443cbb57203d1cd461f",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cmux/com_github_cockroachdb_cmux-v0.0.0-20250514152509-914d3bf9ec58.zip": "c1cf4cd99a1ad6a00f2ccd4188cbcf004cb0d56895670b2c171061ce564cd791",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cockroach-go/v2/com_github_cockroachdb_cockroach_go_v2-v2.4.1.zip": "ba646db91152f3121a6812c7b74d12d8c0e126f7b4d3b927618b159692ceb424",

go.mod

@@ -128,6 +128,7 @@ require (
 	github.com/blevesearch/snowballstem v0.9.0
 	github.com/charmbracelet/bubbles v0.15.1-0.20230123181021-a6a12c4a31eb
 	github.com/cockroachdb/apd/v3 v3.2.1
+	github.com/cockroachdb/changefeedpb v0.0.0-20250807204158-c4f634c8d95c
 	github.com/cockroachdb/cmux v0.0.0-20250514152509-914d3bf9ec58
 	github.com/cockroachdb/cockroach-go/v2 v2.4.1
 	github.com/cockroachdb/crlib v0.0.0-20250718215705-7ff5051265b9

go.sum

@@ -549,6 +549,8 @@ github.com/cockroachdb/apd/v3 v3.2.1 h1:U+8j7t0axsIgvQUqthuNm82HIrYXodOV2iWLWtEa
 github.com/cockroachdb/apd/v3 v3.2.1/go.mod h1:klXJcjp+FffLTHlhIG69tezTDvdP065naDsHzKhYSqc=
 github.com/cockroachdb/bubbletea v0.23.1-bracketed-paste2 h1:OmQDBlTg1DU5OaKjIuEBt4K+40i9RqtxAwK1P/0OVjI=
 github.com/cockroachdb/bubbletea v0.23.1-bracketed-paste2/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU=
+github.com/cockroachdb/changefeedpb v0.0.0-20250807204158-c4f634c8d95c h1:92Sd4x3IQbEiOZQ9vUo+cwWS6m/saC53tofAknPBWBA=
+github.com/cockroachdb/changefeedpb v0.0.0-20250807204158-c4f634c8d95c/go.mod h1:Czh2+FFDUUKdsxZ7aYZSW0W/E0Dx2sQXf1UUkeMkzxw=
 github.com/cockroachdb/client_golang v0.0.0-20250124161916-2d4b7d300341 h1:VQDZhIT4rPz6OhMeiD/2kXfE2PLHJzX2QUd1wsGdjxM=
 github.com/cockroachdb/client_golang v0.0.0-20250124161916-2d4b7d300341/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
 github.com/cockroachdb/cmux v0.0.0-20250514152509-914d3bf9ec58 h1:DQM99rWou5NZoKKKgSFUtO10FmeK8jbetLIdaH2LHE8=

pkg/ccl/changefeedccl/BUILD.bazel

@@ -162,6 +162,7 @@ go_library(
         "//pkg/util/unique",
         "//pkg/util/uuid",
         "@com_github_apache_pulsar_client_go//pulsar",
+        "@com_github_cockroachdb_changefeedpb//:go_default_library",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_logtags//:logtags",
         "@com_github_cockroachdb_redact//:redact",
@@ -353,6 +354,7 @@ go_test(
         "//pkg/workload/workloadsql",
         "@com_github_apache_pulsar_client_go//pulsar",
         "@com_github_cockroachdb_apd_v3//:apd",
+        "@com_github_cockroachdb_changefeedpb//:go_default_library",
         "@com_github_cockroachdb_cockroach_go_v2//crdb",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_redact//:redact",

pkg/ccl/changefeedccl/changefeedpb/BUILD.bazel

@@ -4,13 +4,9 @@ load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
 proto_library(
     name = "changefeedpb_proto",
-    srcs = [
-        "changefeed.proto",
-        "scheduled_changefeed.proto",
-    ],
+    srcs = ["scheduled_changefeed.proto"],
     strip_import_prefix = "/pkg",
     visibility = ["//visibility:public"],
-    deps = ["@com_google_protobuf//:timestamp_proto"],
 )
 
 go_proto_library(

pkg/ccl/changefeedccl/changefeedpb/changefeed.proto

@@ -40,58 +40,3 @@ func (m ScheduledChangefeedExecutionArgs) MarshalJSONPB(x *jsonpb.Marshaler) ([]
 	m.ChangefeedStatement = tree.AsStringWithFlags(export, tree.FmtShowFullURIs)
 	return json.Marshal(m)
 }
-
-// MarshalJSON provides clean, unwrapped JSON output for changefeedpb.Value.
-func (v *Value) MarshalJSON() ([]byte, error) {
-	if v == nil || v.Value == nil {
-		return []byte("null"), nil
-	}
-
-	var out any
-	switch val := v.Value.(type) {
-	case *Value_BoolValue:
-		out = val.BoolValue
-	case *Value_Int64Value:
-		out = val.Int64Value
-	case *Value_DoubleValue:
-		out = val.DoubleValue
-	case *Value_StringValue:
-		out = val.StringValue
-	case *Value_DecimalValue:
-		out = val.DecimalValue.Value
-	case *Value_TimestampValue:
-		out = val.TimestampValue
-	case *Value_DateValue:
-		out = val.DateValue
-	case *Value_IntervalValue:
-		out = val.IntervalValue
-	case *Value_UuidValue:
-		out = val.UuidValue
-	case *Value_BytesValue:
-		out = string(val.BytesValue)
-	case *Value_TimeValue:
-		out = val.TimeValue
-	case *Value_ArrayValue:
-		arr := make([]any, len(val.ArrayValue.Values))
-		for i, elem := range val.ArrayValue.Values {
-			arr[i] = elem
-		}
-		out = arr
-	case *Value_TupleValue:
-		m := make(map[string]any, len(val.TupleValue.Values))
-		for k, v := range val.TupleValue.Values {
-			m[k] = v
-		}
-		out = m
-	default:
-		return nil, errors.AssertionFailedf("unexpected protobuf value type: %T", v.Value)
-	}
-	return json.Marshal(out)
-}
-
-func (k *Key) MarshalJSON() ([]byte, error) {
-	if k == nil || k.Key == nil {
-		return []byte("null"), nil
-	}
-	return json.Marshal(k.Key)
-}

pkg/ccl/changefeedccl/changefeedpb/marshal.go

@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/cockroachdb/changefeedpb"
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdcevent"
 	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase"
-	"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/sessiondatapb"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -395,13 +395,22 @@ func datumToProtoValue(
 		if err != nil {
 			return nil, err
 		}
-		return &changefeedpb.Value{Value: &changefeedpb.Value_TimestampValue{TimestampValue: ts}}, nil
+		return &changefeedpb.Value{
+			Value: &changefeedpb.Value_TimestampValue{
+				TimestampValue: ts,
+			},
+		}, nil
+
 	case *tree.DTimestamp:
 		ts, err := types.TimestampProto(v.Time.UTC())
 		if err != nil {
 			return nil, err
 		}
-		return &changefeedpb.Value{Value: &changefeedpb.Value_TimestampValue{TimestampValue: ts}}, nil
+		return &changefeedpb.Value{
+			Value: &changefeedpb.Value_TimestampValue{
+				TimestampValue: ts,
+			},
+		}, nil
 	case *tree.DBytes:
 		return &changefeedpb.Value{Value: &changefeedpb.Value_BytesValue{BytesValue: []byte(*v)}}, nil
 	case *tree.DGeography: