mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-02-23 06:41:09 +00:00
0fc49f8225
Added methods:
Enum.Descriptor
Message.Descriptor
EnumType.Descriptor
MessageType.Descriptor
ExtensionType.Descriptor
Message.New
All functionality is switched over to use those methods instead of
implicitly relying on the fact that {Enum,Message}Type implicitly
implement the associated descriptor interface.
This CL does not yet remove {Enum,Message}.Type or prevent
{Enum,Message,Extension}Type from implementating a descriptor.
That is a subsequent CL.
The Message.New method is also added to replace functionality
that will be lost when the Type methods are removed.
Change-Id: I7fefde1673bbd40bfdac489aca05cec9a6c98eb1
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/174918
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Herbie Ong <herbie@google.com>
77 lines
2.5 KiB
Go
77 lines
2.5 KiB
Go
// 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.
|
|
|
|
package legacy_test
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
pimpl "github.com/golang/protobuf/v2/internal/impl"
|
|
plegacy "github.com/golang/protobuf/v2/internal/legacy"
|
|
ptype "github.com/golang/protobuf/v2/internal/prototype"
|
|
pref "github.com/golang/protobuf/v2/reflect/protoreflect"
|
|
piface "github.com/golang/protobuf/v2/runtime/protoiface"
|
|
|
|
proto2_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152"
|
|
)
|
|
|
|
type legacyTestMessage struct {
|
|
XXX_unrecognized []byte
|
|
XXX_InternalExtensions map[int32]pimpl.ExtensionFieldV1
|
|
}
|
|
|
|
func (*legacyTestMessage) Reset() {}
|
|
func (*legacyTestMessage) String() string { return "" }
|
|
func (*legacyTestMessage) ProtoMessage() {}
|
|
func (*legacyTestMessage) ExtensionRangeArray() []piface.ExtensionRangeV1 {
|
|
return []piface.ExtensionRangeV1{{Start: 10000, End: 20000}}
|
|
}
|
|
|
|
func mustMakeExtensionType(x *ptype.StandaloneExtension, v interface{}) pref.ExtensionType {
|
|
xd, err := ptype.NewExtension(x)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return plegacy.ExtensionTypeOf(xd, reflect.TypeOf(v))
|
|
}
|
|
|
|
var (
|
|
parentDesc = pimpl.Export{}.MessageDescriptorOf((*legacyTestMessage)(nil))
|
|
messageV1Desc = pimpl.Export{}.MessageDescriptorOf((*proto2_20180125.Message_ChildMessage)(nil))
|
|
|
|
wantType = mustMakeExtensionType(&ptype.StandaloneExtension{
|
|
FullName: "fizz.buzz.optional_message_v1",
|
|
Number: 10007,
|
|
Cardinality: pref.Optional,
|
|
Kind: pref.MessageKind,
|
|
MessageType: messageV1Desc,
|
|
ExtendedType: parentDesc,
|
|
}, (*proto2_20180125.Message_ChildMessage)(nil))
|
|
wantDesc = &piface.ExtensionDescV1{
|
|
ExtendedType: (*legacyTestMessage)(nil),
|
|
ExtensionType: (*proto2_20180125.Message_ChildMessage)(nil),
|
|
Field: 10007,
|
|
Name: "fizz.buzz.optional_message_v1",
|
|
Tag: "bytes,10007,opt,name=optional_message_v1",
|
|
}
|
|
)
|
|
|
|
func BenchmarkConvert(b *testing.B) {
|
|
b.ReportAllocs()
|
|
for i := 0; i < b.N; i++ {
|
|
xd := plegacy.Export{}.ExtensionDescFromType(wantType)
|
|
gotType := plegacy.Export{}.ExtensionTypeFromDesc(xd)
|
|
if gotType != wantType {
|
|
b.Fatalf("ExtensionType mismatch: got %p, want %p", gotType, wantType)
|
|
}
|
|
|
|
xt := plegacy.Export{}.ExtensionTypeFromDesc(wantDesc)
|
|
gotDesc := plegacy.Export{}.ExtensionDescFromType(xt)
|
|
if gotDesc != wantDesc {
|
|
b.Fatalf("ExtensionDesc mismatch: got %p, want %p", gotDesc, wantDesc)
|
|
}
|
|
}
|
|
}
|