Skip to content

Commit 7898c83

Browse files
craig[bot]yuzefovich
andcommitted
Merge #148718
148718: vecstorepb: remove unused proto import r=yuzefovich a=yuzefovich This commit moves the import of `descpb` package from the proto file to the regular Go file (the proto linter was complaining). We need this package for the cast in the generated protobuf code. Epic: None Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
2 parents 061c2ab + eb9f423 commit 7898c83

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

pkg/sql/vecindex/vecstore/vecstorepb/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ proto_library(
88
strip_import_prefix = "/pkg",
99
visibility = ["//visibility:public"],
1010
deps = [
11-
"//pkg/sql/catalog/descpb:descpb_proto",
1211
"//pkg/sql/catalog/fetchpb:fetchpb_proto",
1312
"@com_github_gogo_protobuf//gogoproto:gogo_proto",
1413
],
@@ -21,15 +20,16 @@ go_proto_library(
2120
proto = ":vecstorepb_proto",
2221
visibility = ["//visibility:public"],
2322
deps = [
24-
"//pkg/sql/catalog/descpb",
2523
"//pkg/sql/catalog/fetchpb",
2624
"@com_github_gogo_protobuf//gogoproto",
2725
],
2826
)
2927

3028
go_library(
3129
name = "vecstorepb",
30+
srcs = ["fullvecfetchspec.go"],
3231
embed = [":vecstorepb_go_proto"],
3332
importpath = "github.com/cockroachdb/cockroach/pkg/sql/vecindex/vecstore/vecstorepb",
3433
visibility = ["//visibility:public"],
34+
deps = ["//pkg/sql/catalog/descpb"],
3535
)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright 2025 The Cockroach Authors.
2+
//
3+
// Use of this software is governed by the CockroachDB Software License
4+
// included in the /LICENSE file.
5+
6+
package vecstorepb
7+
8+
import "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
9+
10+
// Import descpb package for the cast in the generated protobuf code.
11+
var _ descpb.FamilyID

pkg/sql/vecindex/vecstore/vecstorepb/fullvecfetchspec.proto

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ option go_package = "github.com/cockroachdb/cockroach/pkg/sql/vecindex/vecstore/
99

1010
import "gogoproto/gogo.proto";
1111
import "sql/catalog/fetchpb/index_fetch.proto";
12-
import "sql/catalog/descpb/structured.proto";
1312

1413
option (gogoproto.goproto_getters_all) = false;
1514

@@ -25,4 +24,4 @@ message GetFullVectorsFetchSpec {
2524
(gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb.FamilyID"];
2625

2726
sqlbase.IndexFetchSpec extract_pk_fetch_spec = 3 [(gogoproto.customname) = "ExtractPKFetchSpec", (gogoproto.nullable) = false];
28-
}
27+
}

0 commit comments

Comments
 (0)