internal/filedesc, internal/filetype: initial commit
The internal/fileinit package is split apart into two packages:
* internal/filedesc constructs descriptors from the raw proto.
It is very similar to the previous internal/fileinit package.
* internal/filetype wraps descriptors with Go type information
Overview:
* The internal/fileinit package will be deleted in a future CL.
It is kept around since the v1 repo currently depends on it.
* The internal/prototype package is deleted. All former usages of it
are now using internal/filedesc instead. Most significantly,
the reflect/protodesc package was almost entirely re-written.
* The internal/impl package drops support for messages that do not
have a Descriptor method (pre-2016). This removes a significant amount
of technical debt.
filedesc.Builder to parse raw descriptors.
* The internal/encoding/defval package now handles enum values by name.
Change-Id: I3957bcc8588a70470fd6c7de1122216b80615ab7
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/182360
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/encoding/testprotos/pb3/test.pb.go b/encoding/testprotos/pb3/test.pb.go
index 0ec0eaf..1b0349a 100644
--- a/encoding/testprotos/pb3/test.pb.go
+++ b/encoding/testprotos/pb3/test.pb.go
@@ -5,7 +5,7 @@
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+ prototype "google.golang.org/protobuf/reflect/prototype"
protoiface "google.golang.org/protobuf/runtime/protoiface"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
sync "sync"
@@ -54,7 +54,7 @@
}
func (Enum) Descriptor() protoreflect.EnumDescriptor {
- return file_pb3_test_proto_enumTypes[0].Descriptor()
+ return file_pb3_test_proto_enumTypes[0].EnumDescriptor
}
func (x Enum) Number() protoreflect.EnumNumber {
@@ -102,7 +102,7 @@
}
func (Enums_NestedEnum) Descriptor() protoreflect.EnumDescriptor {
- return file_pb3_test_proto_enumTypes[1].Descriptor()
+ return file_pb3_test_proto_enumTypes[1].EnumDescriptor
}
func (x Enums_NestedEnum) Number() protoreflect.EnumNumber {
@@ -720,7 +720,7 @@
return file_pb3_test_proto_rawDescData
}
-var file_pb3_test_proto_enumTypes = make([]protoreflect.EnumType, 2)
+var file_pb3_test_proto_enumTypes = make([]prototype.Enum, 2)
var file_pb3_test_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
var file_pb3_test_proto_goTypes = []interface{}{
(Enum)(0), // 0: pb3.Enum
@@ -753,6 +753,11 @@
0, // pb3.Maps.Uint64ToEnumEntry.value:type_name -> pb3.Enum
5, // pb3.Maps.StrToNestedEntry.value:type_name -> pb3.Nested
6, // pb3.Maps.StrToOneofsEntry.value:type_name -> pb3.Oneofs
+ 14, // starting offset of method output_type sub-list
+ 14, // starting offset of method input_type sub-list
+ 14, // starting offset of extension type_name sub-list
+ 14, // starting offset of extension extendee sub-list
+ 0, // starting offset of field type_name sub-list
}
func init() { file_pb3_test_proto_init() }
@@ -760,15 +765,20 @@
if File_pb3_test_proto != nil {
return
}
- File_pb3_test_proto = protoimpl.FileBuilder{
- RawDescriptor: file_pb3_test_proto_rawDesc,
- GoTypes: file_pb3_test_proto_goTypes,
- DependencyIndexes: file_pb3_test_proto_depIdxs,
- EnumOutputTypes: file_pb3_test_proto_enumTypes,
- MessageOutputTypes: file_pb3_test_proto_msgTypes,
- FilesRegistry: protoregistry.GlobalFiles,
- TypesRegistry: protoregistry.GlobalTypes,
- }.Init()
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ RawDescriptor: file_pb3_test_proto_rawDesc,
+ NumEnums: 2,
+ NumMessages: 12,
+ NumExtensions: 0,
+ NumServices: 0,
+ },
+ GoTypes: file_pb3_test_proto_goTypes,
+ DependencyIndexes: file_pb3_test_proto_depIdxs,
+ MessageInfos: file_pb3_test_proto_msgTypes,
+ }.Build()
+ File_pb3_test_proto = out.File
+ file_pb3_test_proto_enumTypes = out.Enums
file_pb3_test_proto_rawDesc = nil
file_pb3_test_proto_goTypes = nil
file_pb3_test_proto_depIdxs = nil