mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2024-12-25 18:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal/impl: fix WhichOneof() to work with synthetic oneofs

Browse Source 
This is the equivalent of CL 638495, but for the Opaque API.

While the behavior is the same for non-synthetic oneofs between
the Open Struct API and Opaque API, the behavior for synthetic oneofs
is not the same: Because the Opaque API uses a bitfield to store
presence, we need to use the Opaque presence check in WhichOneof().

This CL extends the testproto generator to use the protoc
command-line flag for the test3 testproto (which specifies
syntax = "proto3";), as the in-file api_level is only available
in .proto files using editions (but editions does not use synthetic
oneofs for optional fields, only proto3 does).

For golang/protobuf#1659

Change-Id: I0a1fd6e5fc6f96eeab043f966728ce2a14dbd446
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/638515
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Chressie Himpel <chressie@google.com>
This commit is contained in:
Michael Stapelberg 2024-12-23 14:13:09 +01:00
parent c0c814fc1b
commit 8878926ea7
13 changed files with 9321 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/cmd/generate-protos/main.go
View File

@ -182,7 +182,13 @@ func generateOpaqueDotProto(repoRoot, tmpDir, relPath string) {
if matches := goPackageRe.FindStringSubmatch(line); matches != nil {
goPkg := matches[1]
hybridGoPkg := strings.TrimSuffix(goPkg, "/") + "/" + filepath.Base(goPkg) + "_hybrid"
return `option go_package = "` + hybridGoPkg + `";` + "\n" +
goPackage := `option go_package = "` + hybridGoPkg + `";` + "\n"
if strings.HasPrefix(relPath, "internal/testprotos/test3/") {
// The test3 testproto must remain on syntax = "proto3";
// and therefore cannot use the editions-only api_level.
return goPackage
}
return goPackage +
`import "google/protobuf/go_features.proto";` + "\n" +
`option features.(pb.go).api_level = API_HYBRID;`
}
@ -211,7 +217,13 @@ func generateOpaqueDotProto(repoRoot, tmpDir, relPath string) {
if matches := goPackageRe.FindStringSubmatch(line); matches != nil {
goPkg := matches[1]
opaqueGoPkg := strings.TrimSuffix(goPkg, "/") + "/" + filepath.Base(goPkg) + "_opaque"
return `option go_package = "` + opaqueGoPkg + `";` + "\n" +
goPackage := `option go_package = "` + opaqueGoPkg + `";` + "\n"
if strings.HasPrefix(relPath, "internal/testprotos/test3/") {
// The test3 testproto must remain on syntax = "proto3";
// and therefore cannot use the editions-only api_level.
return goPackage
}
return goPackage +
`import "google/protobuf/go_features.proto";` + "\n" +
`option features.(pb.go).api_level = API_OPAQUE;`
}
@ -248,6 +260,12 @@ func generateOpaqueTestprotos() {
}{
{path: "internal/testprotos/required"},
{path: "internal/testprotos/testeditions"},
{
path: "internal/testprotos/test3",
exclude: map[string]bool{
"internal/testprotos/test3/test_extension.proto": true,
},
},
{path: "internal/testprotos/enums"},
{path: "internal/testprotos/textpbeditions"},
{path: "internal/testprotos/messageset"},
@ -359,6 +377,18 @@ func generateLocalProtos() {
if d.annotate[filepath.ToSlash(relPath)] {
opts += ",annotate_code"
}
if strings.HasPrefix(relPath, "internal/testprotos/test3/") {
variant := strings.TrimPrefix(relPath, "internal/testprotos/test3/")
if idx := strings.IndexByte(variant, '/'); idx > -1 {
variant = variant[:idx]
}
switch variant {
case "test3_hybrid":
opts += fmt.Sprintf(",apilevelM%v=%v", relPath, "API_HYBRID")
case "test3_opaque":
opts += fmt.Sprintf(",apilevelM%v=%v", relPath, "API_OPAQUE")
}
}
protoc("-I"+filepath.Join(repoRoot, "src"), "-I"+filepath.Join(protoRoot, "src"), "-I"+repoRoot, "--go_out="+opts+":"+tmpDir, filepath.Join(repoRoot, relPath))
return nil
})

24
internal/impl/message_opaque.go
View File

@ -88,9 +88,7 @@ func opaqueInitHook(mi *MessageInfo) bool {
mi.oneofs = map[protoreflect.Name]*oneofInfo{}
for i := 0; i < mi.Desc.Oneofs().Len(); i++ {
od := mi.Desc.Oneofs().Get(i)
if !od.IsSynthetic() {
mi.oneofs[od.Name()] = makeOneofInfo(od, si.structInfo, mi.Exporter)
}
mi.oneofs[od.Name()] = makeOneofInfoOpaque(mi, od, si.structInfo, mi.Exporter)
}
mi.denseFields = make([]*fieldInfo, fds.Len()*2)
@ -119,6 +117,26 @@ func opaqueInitHook(mi *MessageInfo) bool {
return true
}
func makeOneofInfoOpaque(mi *MessageInfo, od protoreflect.OneofDescriptor, si structInfo, x exporter) *oneofInfo {
oi := &oneofInfo{oneofDesc: od}
if od.IsSynthetic() {
fd := od.Fields().Get(0)
index, _ := presenceIndex(mi.Desc, fd)
oi.which = func(p pointer) protoreflect.FieldNumber {
if p.IsNil() {
return 0
}
if !mi.present(p, index) {
return 0
}
return od.Fields().Get(0).Number()
}
return oi
}
// Dispatch to non-opaque oneof implementation for non-synthetic oneofs.
return makeOneofInfo(od, si, x)
}
func (mi *MessageInfo) fieldInfoForMapOpaque(si opaqueStructInfo, fd protoreflect.FieldDescriptor, fs reflect.StructField) fieldInfo {
ft := fs.Type
if ft.Kind() != reflect.Map {

2762
internal/testprotos/test3/test3_hybrid/test.hybrid.pb.go Normal file
View File

File diff suppressed because it is too large Load Diff

134
internal/testprotos/test3/test3_hybrid/test.hybrid.proto Normal file
View File

@ -0,0 +1,134 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
syntax = "proto3";
package hybrid.goproto.proto.test3;
import "internal/testprotos/test3/test3_hybrid/test_import.hybrid.proto";
option go_package = "google.golang.org/protobuf/internal/testprotos/test3/test3_hybrid";
message TestAllTypes {
message NestedMessage {
int32 a = 1;
TestAllTypes corecursive = 2;
}
enum NestedEnum {
FOO = 0;
BAR = 1;
BAZ = 2;
NEG = -1; // Intentionally negative.
}
int32 singular_int32 = 81;
int64 singular_int64 = 82;
uint32 singular_uint32 = 83;
uint64 singular_uint64 = 84;
sint32 singular_sint32 = 85;
sint64 singular_sint64 = 86;
fixed32 singular_fixed32 = 87;
fixed64 singular_fixed64 = 88;
sfixed32 singular_sfixed32 = 89;
sfixed64 singular_sfixed64 = 90;
float singular_float = 91;
double singular_double = 92;
bool singular_bool = 93;
string singular_string = 94;
bytes singular_bytes = 95;
NestedMessage singular_nested_message = 98;
ForeignMessage singular_foreign_message = 99;
ImportMessage singular_import_message = 100;
NestedEnum singular_nested_enum = 101;
ForeignEnum singular_foreign_enum = 102;
ImportEnum singular_import_enum = 103;
optional int32 optional_int32 = 1;
optional int64 optional_int64 = 2;
optional uint32 optional_uint32 = 3;
optional uint64 optional_uint64 = 4;
optional sint32 optional_sint32 = 5;
optional sint64 optional_sint64 = 6;
optional fixed32 optional_fixed32 = 7;
optional fixed64 optional_fixed64 = 8;
optional sfixed32 optional_sfixed32 = 9;
optional sfixed64 optional_sfixed64 = 10;
optional float optional_float = 11;
optional double optional_double = 12;
optional bool optional_bool = 13;
optional string optional_string = 14;
optional bytes optional_bytes = 15;
optional NestedMessage optional_nested_message = 18;
optional ForeignMessage optional_foreign_message = 19;
optional ImportMessage optional_import_message = 20;
optional NestedEnum optional_nested_enum = 21;
optional ForeignEnum optional_foreign_enum = 22;
optional ImportEnum optional_import_enum = 23;
repeated int32 repeated_int32 = 31;
repeated int64 repeated_int64 = 32;
repeated uint32 repeated_uint32 = 33;
repeated uint64 repeated_uint64 = 34;
repeated sint32 repeated_sint32 = 35;
repeated sint64 repeated_sint64 = 36;
repeated fixed32 repeated_fixed32 = 37;
repeated fixed64 repeated_fixed64 = 38;
repeated sfixed32 repeated_sfixed32 = 39;
repeated sfixed64 repeated_sfixed64 = 40;
repeated float repeated_float = 41;
repeated double repeated_double = 42;
repeated bool repeated_bool = 43;
repeated string repeated_string = 44;
repeated bytes repeated_bytes = 45;
repeated NestedMessage repeated_nested_message = 48;
repeated ForeignMessage repeated_foreign_message = 49;
repeated ImportMessage repeated_importmessage = 50;
repeated NestedEnum repeated_nested_enum = 51;
repeated ForeignEnum repeated_foreign_enum = 52;
repeated ImportEnum repeated_importenum = 53;
map<int32, int32> map_int32_int32 = 56;
map<int64, int64> map_int64_int64 = 57;
map<uint32, uint32> map_uint32_uint32 = 58;
map<uint64, uint64> map_uint64_uint64 = 59;
map<sint32, sint32> map_sint32_sint32 = 60;
map<sint64, sint64> map_sint64_sint64 = 61;
map<fixed32, fixed32> map_fixed32_fixed32 = 62;
map<fixed64, fixed64> map_fixed64_fixed64 = 63;
map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 64;
map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 65;
map<int32, float> map_int32_float = 66;
map<int32, double> map_int32_double = 67;
map<bool, bool> map_bool_bool = 68;
map<string, string> map_string_string = 69;
map<string, bytes> map_string_bytes = 70;
map<string, NestedMessage> map_string_nested_message = 71;
map<string, NestedEnum> map_string_nested_enum = 73;
oneof oneof_field {
uint32 oneof_uint32 = 111;
NestedMessage oneof_nested_message = 112;
string oneof_string = 113;
bytes oneof_bytes = 114;
bool oneof_bool = 115;
uint64 oneof_uint64 = 116;
float oneof_float = 117;
double oneof_double = 118;
NestedEnum oneof_enum = 119;
}
}
message ForeignMessage {
int32 c = 1;
int32 d = 2;
}
enum ForeignEnum {
FOREIGN_ZERO = 0;
FOREIGN_FOO = 4;
FOREIGN_BAR = 5;
FOREIGN_BAZ = 6;
}

2851
internal/testprotos/test3/test3_hybrid/test.hybrid_protoopaque.pb.go Normal file
View File

File diff suppressed because it is too large Load Diff

156
internal/testprotos/test3/test3_hybrid/test_import.hybrid.pb.go Normal file
View File

@ -0,0 +1,156 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: internal/testprotos/test3/test3_hybrid/test_import.hybrid.proto
//go:build !protoopaque
package test3_hybrid
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
)
type ImportEnum int32
const (
ImportEnum_IMPORT_ZERO ImportEnum = 0
)
// Enum value maps for ImportEnum.
var (
ImportEnum_name = map[int32]string{
0: "IMPORT_ZERO",
}
ImportEnum_value = map[string]int32{
"IMPORT_ZERO": 0,
}
)
func (x ImportEnum) Enum() *ImportEnum {
p := new(ImportEnum)
*p = x
return p
}
func (x ImportEnum) String() string {
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
}
func (ImportEnum) Descriptor() protoreflect.EnumDescriptor {
return file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes[0].Descriptor()
}
func (ImportEnum) Type() protoreflect.EnumType {
return &file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes[0]
}
func (x ImportEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
type ImportMessage struct {
state protoimpl.MessageState `protogen:"hybrid.v1"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *ImportMessage) Reset() {
*x = ImportMessage{}
mi := &file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ImportMessage) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ImportMessage) ProtoMessage() {}
func (x *ImportMessage) ProtoReflect() protoreflect.Message {
mi := &file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
type ImportMessage_builder struct {
_ [0]func() // Prevents comparability and use of unkeyed literals for the builder.
}
func (b0 ImportMessage_builder) Build() *ImportMessage {
m0 := &ImportMessage{}
b, x := &b0, m0
_, _ = b, x
return m0
}
var File_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto protoreflect.FileDescriptor
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_rawDesc = []byte{
0x0a, 0x3f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74,
0x33, 0x5f, 0x68, 0x79, 0x62, 0x72, 0x69, 0x64, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6d,
0x70, 0x6f, 0x72, 0x74, 0x2e, 0x68, 0x79, 0x62, 0x72, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x12, 0x1a, 0x68, 0x79, 0x62, 0x72, 0x69, 0x64, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x22, 0x0f, 0x0a,
0x0d, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x1d,
0x0a, 0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a, 0x0b,
0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x43, 0x5a,
0x41, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x5f, 0x68, 0x79, 0x62, 0x72,
0x69, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_goTypes = []any{
(ImportEnum)(0), // 0: hybrid.goproto.proto.test3.ImportEnum
(*ImportMessage)(nil), // 1: hybrid.goproto.proto.test3.ImportMessage
}
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_init() }
func file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_init() {
if File_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto != nil {
return
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_rawDesc,
NumEnums: 1,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_goTypes,
DependencyIndexes: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_depIdxs,
EnumInfos: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes,
MessageInfos: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes,
}.Build()
File_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto = out.File
file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_rawDesc = nil
file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_goTypes = nil
file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_depIdxs = nil
}

16
internal/testprotos/test3/test3_hybrid/test_import.hybrid.proto Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
syntax = "proto3";
package hybrid.goproto.proto.test3;
option go_package = "google.golang.org/protobuf/internal/testprotos/test3/test3_hybrid";
message ImportMessage {}
enum ImportEnum {
IMPORT_ZERO = 0;
}

156
internal/testprotos/test3/test3_hybrid/test_import.hybrid_protoopaque.pb.go Normal file
View File

@ -0,0 +1,156 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: internal/testprotos/test3/test3_hybrid/test_import.hybrid.proto
//go:build protoopaque
package test3_hybrid
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
)
type ImportEnum int32
const (
ImportEnum_IMPORT_ZERO ImportEnum = 0
)
// Enum value maps for ImportEnum.
var (
ImportEnum_name = map[int32]string{
0: "IMPORT_ZERO",
}
ImportEnum_value = map[string]int32{
"IMPORT_ZERO": 0,
}
)
func (x ImportEnum) Enum() *ImportEnum {
p := new(ImportEnum)
*p = x
return p
}
func (x ImportEnum) String() string {
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
}
func (ImportEnum) Descriptor() protoreflect.EnumDescriptor {
return file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes[0].Descriptor()
}
func (ImportEnum) Type() protoreflect.EnumType {
return &file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes[0]
}
func (x ImportEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
type ImportMessage struct {
state protoimpl.MessageState `protogen:"opaque.v1"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *ImportMessage) Reset() {
*x = ImportMessage{}
mi := &file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ImportMessage) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ImportMessage) ProtoMessage() {}
func (x *ImportMessage) ProtoReflect() protoreflect.Message {
mi := &file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
type ImportMessage_builder struct {
_ [0]func() // Prevents comparability and use of unkeyed literals for the builder.
}
func (b0 ImportMessage_builder) Build() *ImportMessage {
m0 := &ImportMessage{}
b, x := &b0, m0
_, _ = b, x
return m0
}
var File_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto protoreflect.FileDescriptor
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_rawDesc = []byte{
0x0a, 0x3f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74,
0x33, 0x5f, 0x68, 0x79, 0x62, 0x72, 0x69, 0x64, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6d,
0x70, 0x6f, 0x72, 0x74, 0x2e, 0x68, 0x79, 0x62, 0x72, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x12, 0x1a, 0x68, 0x79, 0x62, 0x72, 0x69, 0x64, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x22, 0x0f, 0x0a,
0x0d, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x1d,
0x0a, 0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a, 0x0b,
0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x43, 0x5a,
0x41, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x5f, 0x68, 0x79, 0x62, 0x72,
0x69, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_goTypes = []any{
(ImportEnum)(0), // 0: hybrid.goproto.proto.test3.ImportEnum
(*ImportMessage)(nil), // 1: hybrid.goproto.proto.test3.ImportMessage
}
var file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_init() }
func file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_init() {
if File_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto != nil {
return
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_rawDesc,
NumEnums: 1,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_goTypes,
DependencyIndexes: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_depIdxs,
EnumInfos: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_enumTypes,
MessageInfos: file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_msgTypes,
}.Build()
File_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto = out.File
file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_rawDesc = nil
file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_goTypes = nil
file_internal_testprotos_test3_test3_hybrid_test_import_hybrid_proto_depIdxs = nil
}

2849
internal/testprotos/test3/test3_opaque/test.opaque.pb.go Normal file
View File

File diff suppressed because it is too large Load Diff

134
internal/testprotos/test3/test3_opaque/test.opaque.proto Normal file
View File

@ -0,0 +1,134 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
syntax = "proto3";
package opaque.goproto.proto.test3;
import "internal/testprotos/test3/test3_opaque/test_import.opaque.proto";
option go_package = "google.golang.org/protobuf/internal/testprotos/test3/test3_opaque";
message TestAllTypes {
message NestedMessage {
int32 a = 1;
TestAllTypes corecursive = 2;
}
enum NestedEnum {
FOO = 0;
BAR = 1;
BAZ = 2;
NEG = -1; // Intentionally negative.
}
int32 singular_int32 = 81;
int64 singular_int64 = 82;
uint32 singular_uint32 = 83;
uint64 singular_uint64 = 84;
sint32 singular_sint32 = 85;
sint64 singular_sint64 = 86;
fixed32 singular_fixed32 = 87;
fixed64 singular_fixed64 = 88;
sfixed32 singular_sfixed32 = 89;
sfixed64 singular_sfixed64 = 90;
float singular_float = 91;
double singular_double = 92;
bool singular_bool = 93;
string singular_string = 94;
bytes singular_bytes = 95;
NestedMessage singular_nested_message = 98;
ForeignMessage singular_foreign_message = 99;
ImportMessage singular_import_message = 100;
NestedEnum singular_nested_enum = 101;
ForeignEnum singular_foreign_enum = 102;
ImportEnum singular_import_enum = 103;
optional int32 optional_int32 = 1;
optional int64 optional_int64 = 2;
optional uint32 optional_uint32 = 3;
optional uint64 optional_uint64 = 4;
optional sint32 optional_sint32 = 5;
optional sint64 optional_sint64 = 6;
optional fixed32 optional_fixed32 = 7;
optional fixed64 optional_fixed64 = 8;
optional sfixed32 optional_sfixed32 = 9;
optional sfixed64 optional_sfixed64 = 10;
optional float optional_float = 11;
optional double optional_double = 12;
optional bool optional_bool = 13;
optional string optional_string = 14;
optional bytes optional_bytes = 15;
optional NestedMessage optional_nested_message = 18;
optional ForeignMessage optional_foreign_message = 19;
optional ImportMessage optional_import_message = 20;
optional NestedEnum optional_nested_enum = 21;
optional ForeignEnum optional_foreign_enum = 22;
optional ImportEnum optional_import_enum = 23;
repeated int32 repeated_int32 = 31;
repeated int64 repeated_int64 = 32;
repeated uint32 repeated_uint32 = 33;
repeated uint64 repeated_uint64 = 34;
repeated sint32 repeated_sint32 = 35;
repeated sint64 repeated_sint64 = 36;
repeated fixed32 repeated_fixed32 = 37;
repeated fixed64 repeated_fixed64 = 38;
repeated sfixed32 repeated_sfixed32 = 39;
repeated sfixed64 repeated_sfixed64 = 40;
repeated float repeated_float = 41;
repeated double repeated_double = 42;
repeated bool repeated_bool = 43;
repeated string repeated_string = 44;
repeated bytes repeated_bytes = 45;
repeated NestedMessage repeated_nested_message = 48;
repeated ForeignMessage repeated_foreign_message = 49;
repeated ImportMessage repeated_importmessage = 50;
repeated NestedEnum repeated_nested_enum = 51;
repeated ForeignEnum repeated_foreign_enum = 52;
repeated ImportEnum repeated_importenum = 53;
map<int32, int32> map_int32_int32 = 56;
map<int64, int64> map_int64_int64 = 57;
map<uint32, uint32> map_uint32_uint32 = 58;
map<uint64, uint64> map_uint64_uint64 = 59;
map<sint32, sint32> map_sint32_sint32 = 60;
map<sint64, sint64> map_sint64_sint64 = 61;
map<fixed32, fixed32> map_fixed32_fixed32 = 62;
map<fixed64, fixed64> map_fixed64_fixed64 = 63;
map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 64;
map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 65;
map<int32, float> map_int32_float = 66;
map<int32, double> map_int32_double = 67;
map<bool, bool> map_bool_bool = 68;
map<string, string> map_string_string = 69;
map<string, bytes> map_string_bytes = 70;
map<string, NestedMessage> map_string_nested_message = 71;
map<string, NestedEnum> map_string_nested_enum = 73;
oneof oneof_field {
uint32 oneof_uint32 = 111;
NestedMessage oneof_nested_message = 112;
string oneof_string = 113;
bytes oneof_bytes = 114;
bool oneof_bool = 115;
uint64 oneof_uint64 = 116;
float oneof_float = 117;
double oneof_double = 118;
NestedEnum oneof_enum = 119;
}
}
message ForeignMessage {
int32 c = 1;
int32 d = 2;
}
enum ForeignEnum {
FOREIGN_ZERO = 0;
FOREIGN_FOO = 4;
FOREIGN_BAR = 5;
FOREIGN_BAZ = 6;
}

154
internal/testprotos/test3/test3_opaque/test_import.opaque.pb.go Normal file
View File

@ -0,0 +1,154 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// Code generated by protoc-gen-go. DO NOT EDIT.
// source: internal/testprotos/test3/test3_opaque/test_import.opaque.proto
package test3_opaque
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
)
type ImportEnum int32
const (
ImportEnum_IMPORT_ZERO ImportEnum = 0
)
// Enum value maps for ImportEnum.
var (
ImportEnum_name = map[int32]string{
0: "IMPORT_ZERO",
}
ImportEnum_value = map[string]int32{
"IMPORT_ZERO": 0,
}
)
func (x ImportEnum) Enum() *ImportEnum {
p := new(ImportEnum)
*p = x
return p
}
func (x ImportEnum) String() string {
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
}
func (ImportEnum) Descriptor() protoreflect.EnumDescriptor {
return file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_enumTypes[0].Descriptor()
}
func (ImportEnum) Type() protoreflect.EnumType {
return &file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_enumTypes[0]
}
func (x ImportEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
type ImportMessage struct {
state protoimpl.MessageState `protogen:"opaque.v1"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *ImportMessage) Reset() {
*x = ImportMessage{}
mi := &file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ImportMessage) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ImportMessage) ProtoMessage() {}
func (x *ImportMessage) ProtoReflect() protoreflect.Message {
mi := &file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
type ImportMessage_builder struct {
_ [0]func() // Prevents comparability and use of unkeyed literals for the builder.
}
func (b0 ImportMessage_builder) Build() *ImportMessage {
m0 := &ImportMessage{}
b, x := &b0, m0
_, _ = b, x
return m0
}
var File_internal_testprotos_test3_test3_opaque_test_import_opaque_proto protoreflect.FileDescriptor
var file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_rawDesc = []byte{
0x0a, 0x3f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74,
0x33, 0x5f, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x6d,
0x70, 0x6f, 0x72, 0x74, 0x2e, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x12, 0x1a, 0x6f, 0x70, 0x61, 0x71, 0x75, 0x65, 0x2e, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x33, 0x22, 0x0f, 0x0a,
0x0d, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x1d,
0x0a, 0x0a, 0x49, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x0a, 0x0b,
0x49, 0x4d, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x42, 0x43, 0x5a,
0x41, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2e, 0x6f,
0x72, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x69, 0x6e, 0x74, 0x65,
0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f,
0x74, 0x65, 0x73, 0x74, 0x33, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x33, 0x5f, 0x6f, 0x70, 0x61, 0x71,
0x75, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_goTypes = []any{
(ImportEnum)(0), // 0: opaque.goproto.proto.test3.ImportEnum
(*ImportMessage)(nil), // 1: opaque.goproto.proto.test3.ImportMessage
}
var file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
}
func init() { file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_init() }
func file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_init() {
if File_internal_testprotos_test3_test3_opaque_test_import_opaque_proto != nil {
return
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_rawDesc,
NumEnums: 1,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_goTypes,
DependencyIndexes: file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_depIdxs,
EnumInfos: file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_enumTypes,
MessageInfos: file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_msgTypes,
}.Build()
File_internal_testprotos_test3_test3_opaque_test_import_opaque_proto = out.File
file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_rawDesc = nil
file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_goTypes = nil
file_internal_testprotos_test3_test3_opaque_test_import_opaque_proto_depIdxs = nil
}

16
internal/testprotos/test3/test3_opaque/test_import.opaque.proto Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
syntax = "proto3";
package opaque.goproto.proto.test3;
option go_package = "google.golang.org/protobuf/internal/testprotos/test3/test3_opaque";
message ImportMessage {}
enum ImportEnum {
IMPORT_ZERO = 0;
}

42
proto/oneof_which_test.go
View File

@ -8,6 +8,8 @@ import (
"testing"
test3openpb "google.golang.org/protobuf/internal/testprotos/test3"
test3hybridpb "google.golang.org/protobuf/internal/testprotos/test3/test3_hybrid"
test3opaquepb "google.golang.org/protobuf/internal/testprotos/test3/test3_opaque"
testhybridpb "google.golang.org/protobuf/internal/testprotos/testeditions/testeditions_hybrid"
testopaquepb "google.golang.org/protobuf/internal/testprotos/testeditions/testeditions_opaque"
"google.golang.org/protobuf/proto"
@ -189,7 +191,7 @@ func TestOpaqueWhich(t *testing.T) {
}
}
func TestSyntheticOneof(t *testing.T) {
func TestSyntheticOneofOpen(t *testing.T) {
msg := test3openpb.TestAllTypes{}
md := msg.ProtoReflect().Descriptor()
ood := md.Oneofs().ByName("_optional_int32")
@ -208,4 +210,40 @@ func TestSyntheticOneof(t *testing.T) {
}
}
// TODO(stapelberg): add test variants for the Hybrid API and Opaque API.
func TestSyntheticOneofHybrid(t *testing.T) {
msg := test3hybridpb.TestAllTypes{}
md := msg.ProtoReflect().Descriptor()
ood := md.Oneofs().ByName("_optional_int32")
if ood == nil {
t.Fatal("failed to find oneof _optional_int32")
}
if !ood.IsSynthetic() {
t.Fatal("oneof _optional_int32 should be synthetic")
}
if msg.ProtoReflect().WhichOneof(ood) != nil {
t.Error("oneof _optional_int32 should not have a field set yet")
}
msg.OptionalInt32 = proto.Int32(123)
if msg.ProtoReflect().WhichOneof(ood) == nil {
t.Error("oneof _optional_int32 should have a field set")
}
}
func TestSyntheticOneofOpaque(t *testing.T) {
msg := test3opaquepb.TestAllTypes{}
md := msg.ProtoReflect().Descriptor()
ood := md.Oneofs().ByName("_optional_int32")
if ood == nil {
t.Fatal("failed to find oneof _optional_int32")
}
if !ood.IsSynthetic() {
t.Fatal("oneof _optional_int32 should be synthetic")
}
if msg.ProtoReflect().WhichOneof(ood) != nil {
t.Error("oneof _optional_int32 should not have a field set yet")
}
msg.SetOptionalInt32(123)
if msg.ProtoReflect().WhichOneof(ood) == nil {
t.Error("oneof _optional_int32 should have a field set")
}
}