mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-01-30 12:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
protobuf-go/encoding/testprotos/pb2/test.pb.go

2416 lines
91 KiB
Go
Raw Normal View History

cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
// Copyright 2019 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.
// Test Protobuf definitions with proto2 syntax.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
// Code generated by protoc-gen-go. DO NOT EDIT.
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
// source: pb2/test.proto
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
package pb2
import (
all: change module to google.golang.org/protobuf Temporarily remove go.mod, since we can't generate an accurate one until the corresponding v1 change is submitted. Change-Id: I1e1ad97f2b455e33f61ffaeb8676289795e47e72 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177000 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-13 23:55:40 -07:00
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoiface "google.golang.org/protobuf/runtime/protoiface"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
anypb "google.golang.org/protobuf/types/known/anypb"
durationpb "google.golang.org/protobuf/types/known/durationpb"
emptypb "google.golang.org/protobuf/types/known/emptypb"
fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
structpb "google.golang.org/protobuf/types/known/structpb"
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
reflect/protoregistry: provide more informative errors for conflicts The v2 implementation strictly enforces that there are no conflicts at all in the protobuf namespace unlike the prior v1 implementation. This change is almost certainly going to cause loud failures for users that were unknowingly tolerating registration conflicts. We modify internal/filedesc to be able to record the Go package path that the file descriptor is declared within. This information is used by reflect/protoregistry to print both the previous Go package that registered some declaration, and current Go package that is attempting to register some declaration. Change-Id: Ib5eb21c1c98495afc51aa08bd4404bd9d64b5b57 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186177 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-14 23:04:40 -07:00
reflect "reflect"
cmd/protoc-gen-go: lazily GZIP-encode the raw descriptor This reduces the init-time cost slightly since the GZIP'd raw descriptor is constructed lazily on demand. Change-Id: I482c6a2201b8786e425d7dee5612fdfd60ab1500 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169917 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-28 01:13:26 -07:00
sync "sync"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
)
type Enum int32
const (
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
Enum_ONE Enum = 1
Enum_TWO Enum = 2
Enum_TEN Enum = 10
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
)
cmd/protoc-gen-go: group enum map vars in blocks Since the enum maps are here to stay, group the declarations together in a var block for better readability in godoc. Change-Id: I9a313266539e9a60781f98b80a5293379f82607b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189077 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 18:38:48 -07:00
// Enum value maps for Enum.
var (
Enum_name = map[int32]string{
1: "ONE",
2: "TWO",
10: "TEN",
}
Enum_value = map[string]int32{
"ONE": 1,
"TWO": 2,
"TEN": 10,
}
)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (x Enum) Enum() *Enum {
cmd/protoc-gen-go: revert Enum simplication Go1.12 on GoLLVM with LLVM 9.0.0 has a bug where the simpler but equivalent expression results in memory corruption. Revert to the more complex expression to avoid breaking GoLLVM and it is not worth waiting for a GoLLVM fix. Change-Id: I8b42965ca9bd333deb8693021e7b22f966e13521 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171463 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-10 15:29:01 -07:00
p := new(Enum)
*p = x
return p
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
func (x Enum) String() string {
reflect/protoreflect: add Descriptor specific methods 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>
2019-05-01 12:29:25 -07:00
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
reflect/protoreflect: add Descriptor specific methods 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>
2019-05-01 12:29:25 -07:00
func (Enum) Descriptor() protoreflect.EnumDescriptor {
cmd/protoc-gen-go, internal/filetype: clean up EnumType construction Drop the dependency from generated files on prototype.Enum: Generated code should only depend on runtime/proto{iface,impl}. Drop the Enums, Messages, and Extensions returns form filetype.Builder.Build. Of these, only Enums was used by generated code. Change the generated init function to pass the builder a slice of values to fill in (as is done for messages and extensions). Remove the filetype dependency on prototype in preparation for eventually dropping the prototype package entirely. Change-Id: I28a3420f5dfcc13fed531a64ef07b9afddfd9d55 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189200 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-06 15:26:36 -07:00
return file_pb2_test_proto_enumTypes[0].Descriptor()
reflect/protoreflect: add Descriptor specific methods 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>
2019-05-01 12:29:25 -07:00
}
reflect/protoreflect: add Enum.Type and Message.Type CL/174938 removed these methods in favor of a method that returned only the descriptors. This CL adds back in the Type methods alongside the Descriptor methods. In a vast majority of protobuf usages, only the descriptor information is needed. However, there is a small percentage that legitimately needs the Go type information. We should provide both, but document that the descriptor-only information is preferred. Change-Id: Ia0a098997fb1bd009994940ae8ea5257ccd87cae Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184578 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-02 14:58:02 -07:00
func (Enum) Type() protoreflect.EnumType {
return &file_pb2_test_proto_enumTypes[0]
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x Enum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
// Deprecated: Do not use.
func (x *Enum) UnmarshalJSON(b []byte) error {
reflect/protoreflect: add Descriptor specific methods 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>
2019-05-01 12:29:25 -07:00
num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
if err != nil {
return err
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
*x = Enum(num)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
return nil
}
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Enum.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (Enum) EnumDescriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{0}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
type Enums_NestedEnum int32
const (
Enums_UNO Enums_NestedEnum = 1
Enums_DOS Enums_NestedEnum = 2
Enums_DIEZ Enums_NestedEnum = 10
)
cmd/protoc-gen-go: group enum map vars in blocks Since the enum maps are here to stay, group the declarations together in a var block for better readability in godoc. Change-Id: I9a313266539e9a60781f98b80a5293379f82607b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189077 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 18:38:48 -07:00
// Enum value maps for Enums_NestedEnum.
var (
Enums_NestedEnum_name = map[int32]string{
1: "UNO",
2: "DOS",
10: "DIEZ",
}
Enums_NestedEnum_value = map[string]int32{
"UNO": 1,
"DOS": 2,
"DIEZ": 10,
}
)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (x Enums_NestedEnum) Enum() *Enums_NestedEnum {
cmd/protoc-gen-go: revert Enum simplication Go1.12 on GoLLVM with LLVM 9.0.0 has a bug where the simpler but equivalent expression results in memory corruption. Revert to the more complex expression to avoid breaking GoLLVM and it is not worth waiting for a GoLLVM fix. Change-Id: I8b42965ca9bd333deb8693021e7b22f966e13521 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171463 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-10 15:29:01 -07:00
p := new(Enums_NestedEnum)
*p = x
return p
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
func (x Enums_NestedEnum) String() string {
reflect/protoreflect: add Descriptor specific methods 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>
2019-05-01 12:29:25 -07:00
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
}
func (Enums_NestedEnum) Descriptor() protoreflect.EnumDescriptor {
cmd/protoc-gen-go, internal/filetype: clean up EnumType construction Drop the dependency from generated files on prototype.Enum: Generated code should only depend on runtime/proto{iface,impl}. Drop the Enums, Messages, and Extensions returns form filetype.Builder.Build. Of these, only Enums was used by generated code. Change the generated init function to pass the builder a slice of values to fill in (as is done for messages and extensions). Remove the filetype dependency on prototype in preparation for eventually dropping the prototype package entirely. Change-Id: I28a3420f5dfcc13fed531a64ef07b9afddfd9d55 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189200 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-06 15:26:36 -07:00
return file_pb2_test_proto_enumTypes[1].Descriptor()
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
reflect/protoreflect: add Enum.Type and Message.Type CL/174938 removed these methods in favor of a method that returned only the descriptors. This CL adds back in the Type methods alongside the Descriptor methods. In a vast majority of protobuf usages, only the descriptor information is needed. However, there is a small percentage that legitimately needs the Go type information. We should provide both, but document that the descriptor-only information is preferred. Change-Id: Ia0a098997fb1bd009994940ae8ea5257ccd87cae Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184578 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-02 14:58:02 -07:00
func (Enums_NestedEnum) Type() protoreflect.EnumType {
return &file_pb2_test_proto_enumTypes[1]
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x Enums_NestedEnum) Number() protoreflect.EnumNumber {
return protoreflect.EnumNumber(x)
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
// Deprecated: Do not use.
func (x *Enums_NestedEnum) UnmarshalJSON(b []byte) error {
reflect/protoreflect: add Descriptor specific methods 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>
2019-05-01 12:29:25 -07:00
num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
if err != nil {
return err
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
*x = Enums_NestedEnum(num)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
return nil
}
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Enums_NestedEnum.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (Enums_NestedEnum) EnumDescriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{1, 0}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
// Scalars contains optional scalar fields.
type Scalars struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptBool *bool `protobuf:"varint,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
OptInt32 *int32 `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
OptInt64 *int64 `protobuf:"varint,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
OptUint32 *uint32 `protobuf:"varint,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
OptUint64 *uint64 `protobuf:"varint,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
OptSint32 *int32 `protobuf:"zigzag32,6,opt,name=opt_sint32,json=optSint32" json:"opt_sint32,omitempty"`
OptSint64 *int64 `protobuf:"zigzag64,7,opt,name=opt_sint64,json=optSint64" json:"opt_sint64,omitempty"`
OptFixed32 *uint32 `protobuf:"fixed32,8,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
OptFixed64 *uint64 `protobuf:"fixed64,9,opt,name=opt_fixed64,json=optFixed64" json:"opt_fixed64,omitempty"`
OptSfixed32 *int32 `protobuf:"fixed32,10,opt,name=opt_sfixed32,json=optSfixed32" json:"opt_sfixed32,omitempty"`
OptSfixed64 *int64 `protobuf:"fixed64,11,opt,name=opt_sfixed64,json=optSfixed64" json:"opt_sfixed64,omitempty"`
OptFloat *float32 `protobuf:"fixed32,20,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
OptDouble *float64 `protobuf:"fixed64,21,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
OptBytes []byte `protobuf:"bytes,14,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
OptString *string `protobuf:"bytes,13,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) Reset() {
*x = Scalars{}
}
func (x *Scalars) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Scalars) ProtoMessage() {}
func (x *Scalars) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Scalars.ProtoReflect.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (*Scalars) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{0}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptBool() bool {
if x != nil && x.OptBool != nil {
return *x.OptBool
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return false
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptInt32() int32 {
if x != nil && x.OptInt32 != nil {
return *x.OptInt32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptInt64() int64 {
if x != nil && x.OptInt64 != nil {
return *x.OptInt64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptUint32() uint32 {
if x != nil && x.OptUint32 != nil {
return *x.OptUint32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptUint64() uint64 {
if x != nil && x.OptUint64 != nil {
return *x.OptUint64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptSint32() int32 {
if x != nil && x.OptSint32 != nil {
return *x.OptSint32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptSint64() int64 {
if x != nil && x.OptSint64 != nil {
return *x.OptSint64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptFixed32() uint32 {
if x != nil && x.OptFixed32 != nil {
return *x.OptFixed32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptFixed64() uint64 {
if x != nil && x.OptFixed64 != nil {
return *x.OptFixed64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptSfixed32() int32 {
if x != nil && x.OptSfixed32 != nil {
return *x.OptSfixed32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptSfixed64() int64 {
if x != nil && x.OptSfixed64 != nil {
return *x.OptSfixed64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptFloat() float32 {
if x != nil && x.OptFloat != nil {
return *x.OptFloat
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptDouble() float64 {
if x != nil && x.OptDouble != nil {
return *x.OptDouble
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptBytes() []byte {
if x != nil {
return x.OptBytes
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Scalars) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return ""
}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
// Message contains enum fields.
type Enums struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
OptEnum *Enum `protobuf:"varint,1,opt,name=opt_enum,json=optEnum,enum=pb2.Enum" json:"opt_enum,omitempty"`
RptEnum []Enum `protobuf:"varint,2,rep,name=rpt_enum,json=rptEnum,enum=pb2.Enum" json:"rpt_enum,omitempty"`
OptNestedEnum *Enums_NestedEnum `protobuf:"varint,3,opt,name=opt_nested_enum,json=optNestedEnum,enum=pb2.Enums_NestedEnum" json:"opt_nested_enum,omitempty"`
RptNestedEnum []Enums_NestedEnum `protobuf:"varint,4,rep,name=rpt_nested_enum,json=rptNestedEnum,enum=pb2.Enums_NestedEnum" json:"rpt_nested_enum,omitempty"`
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Enums) Reset() {
*x = Enums{}
}
func (x *Enums) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Enums) ProtoMessage() {}
func (x *Enums) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Enums.ProtoReflect.Descriptor instead.
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
func (*Enums) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{1}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Enums) GetOptEnum() Enum {
if x != nil && x.OptEnum != nil {
return *x.OptEnum
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
return Enum_ONE
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Enums) GetRptEnum() []Enum {
if x != nil {
return x.RptEnum
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Enums) GetOptNestedEnum() Enums_NestedEnum {
if x != nil && x.OptNestedEnum != nil {
return *x.OptNestedEnum
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
return Enums_UNO
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Enums) GetRptNestedEnum() []Enums_NestedEnum {
if x != nil {
return x.RptNestedEnum
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}
return nil
}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
// Message contains repeated fields.
type Repeats struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
RptBool []bool `protobuf:"varint,1,rep,name=rpt_bool,json=rptBool" json:"rpt_bool,omitempty"`
RptInt32 []int32 `protobuf:"varint,2,rep,name=rpt_int32,json=rptInt32" json:"rpt_int32,omitempty"`
RptInt64 []int64 `protobuf:"varint,3,rep,name=rpt_int64,json=rptInt64" json:"rpt_int64,omitempty"`
RptUint32 []uint32 `protobuf:"varint,4,rep,name=rpt_uint32,json=rptUint32" json:"rpt_uint32,omitempty"`
RptUint64 []uint64 `protobuf:"varint,5,rep,name=rpt_uint64,json=rptUint64" json:"rpt_uint64,omitempty"`
RptFloat []float32 `protobuf:"fixed32,6,rep,name=rpt_float,json=rptFloat" json:"rpt_float,omitempty"`
RptDouble []float64 `protobuf:"fixed64,7,rep,name=rpt_double,json=rptDouble" json:"rpt_double,omitempty"`
RptString []string `protobuf:"bytes,8,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
RptBytes [][]byte `protobuf:"bytes,9,rep,name=rpt_bytes,json=rptBytes" json:"rpt_bytes,omitempty"`
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) Reset() {
*x = Repeats{}
}
func (x *Repeats) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Repeats) ProtoMessage() {}
func (x *Repeats) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Repeats.ProtoReflect.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (*Repeats) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{2}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptBool() []bool {
if x != nil {
return x.RptBool
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptInt32() []int32 {
if x != nil {
return x.RptInt32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptInt64() []int64 {
if x != nil {
return x.RptInt64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptUint32() []uint32 {
if x != nil {
return x.RptUint32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptUint64() []uint64 {
if x != nil {
return x.RptUint64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptFloat() []float32 {
if x != nil {
return x.RptFloat
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptDouble() []float64 {
if x != nil {
return x.RptDouble
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptString() []string {
if x != nil {
return x.RptString
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Repeats) GetRptBytes() [][]byte {
if x != nil {
return x.RptBytes
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
// Message type used as submessage.
type Nested struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nested) Reset() {
*x = Nested{}
}
func (x *Nested) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Nested) ProtoMessage() {}
func (x *Nested) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Nested.ProtoReflect.Descriptor instead.
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
func (*Nested) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{3}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nested) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
return ""
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nested) GetOptNested() *Nested {
if x != nil {
return x.OptNested
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
// Message contains message and group fields.
type Nests struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptNested *Nested `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
Optgroup *Nests_OptGroup `protobuf:"group,2,opt,name=OptGroup,json=optgroup" json:"optgroup,omitempty"`
RptNested []*Nested `protobuf:"bytes,4,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
Rptgroup []*Nests_RptGroup `protobuf:"group,5,rep,name=RptGroup,json=rptgroup" json:"rptgroup,omitempty"`
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests) Reset() {
*x = Nests{}
}
func (x *Nests) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Nests) ProtoMessage() {}
func (x *Nests) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Nests.ProtoReflect.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (*Nests) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{4}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests) GetOptNested() *Nested {
if x != nil {
return x.OptNested
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests) GetOptgroup() *Nests_OptGroup {
if x != nil {
return x.Optgroup
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests) GetRptNested() []*Nested {
if x != nil {
return x.RptNested
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests) GetRptgroup() []*Nests_RptGroup {
if x != nil {
return x.Rptgroup
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
// Message contains required fields.
type Requireds struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
ReqBool *bool `protobuf:"varint,1,req,name=req_bool,json=reqBool" json:"req_bool,omitempty"`
ReqSfixed64 *int64 `protobuf:"fixed64,2,req,name=req_sfixed64,json=reqSfixed64" json:"req_sfixed64,omitempty"`
ReqDouble *float64 `protobuf:"fixed64,3,req,name=req_double,json=reqDouble" json:"req_double,omitempty"`
ReqString *string `protobuf:"bytes,4,req,name=req_string,json=reqString" json:"req_string,omitempty"`
ReqEnum *Enum `protobuf:"varint,5,req,name=req_enum,json=reqEnum,enum=pb2.Enum" json:"req_enum,omitempty"`
ReqNested *Nested `protobuf:"bytes,6,req,name=req_nested,json=reqNested" json:"req_nested,omitempty"`
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) Reset() {
*x = Requireds{}
}
func (x *Requireds) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Requireds) ProtoMessage() {}
func (x *Requireds) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Requireds.ProtoReflect.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (*Requireds) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{5}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) GetReqBool() bool {
if x != nil && x.ReqBool != nil {
return *x.ReqBool
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return false
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) GetReqSfixed64() int64 {
if x != nil && x.ReqSfixed64 != nil {
return *x.ReqSfixed64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) GetReqDouble() float64 {
if x != nil && x.ReqDouble != nil {
return *x.ReqDouble
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return 0
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) GetReqString() string {
if x != nil && x.ReqString != nil {
return *x.ReqString
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return ""
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) GetReqEnum() Enum {
if x != nil && x.ReqEnum != nil {
return *x.ReqEnum
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
return Enum_ONE
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Requireds) GetReqNested() *Nested {
if x != nil {
return x.ReqNested
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
// Message contains both required and optional fields.
type PartialRequired struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
OptString *string `protobuf:"bytes,2,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *PartialRequired) Reset() {
*x = PartialRequired{}
}
func (x *PartialRequired) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PartialRequired) ProtoMessage() {}
func (x *PartialRequired) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use PartialRequired.ProtoReflect.Descriptor instead.
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
func (*PartialRequired) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{6}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *PartialRequired) GetReqString() string {
if x != nil && x.ReqString != nil {
return *x.ReqString
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
return ""
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *PartialRequired) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
return ""
}
type NestedWithRequired struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
ReqString *string `protobuf:"bytes,1,req,name=req_string,json=reqString" json:"req_string,omitempty"`
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *NestedWithRequired) Reset() {
*x = NestedWithRequired{}
}
func (x *NestedWithRequired) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*NestedWithRequired) ProtoMessage() {}
func (x *NestedWithRequired) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use NestedWithRequired.ProtoReflect.Descriptor instead.
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
func (*NestedWithRequired) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{7}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *NestedWithRequired) GetReqString() string {
if x != nil && x.ReqString != nil {
return *x.ReqString
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
return ""
}
type IndirectRequired struct {
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptNested *NestedWithRequired `protobuf:"bytes,1,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
RptNested []*NestedWithRequired `protobuf:"bytes,2,rep,name=rpt_nested,json=rptNested" json:"rpt_nested,omitempty"`
StrToNested map[string]*NestedWithRequired `protobuf:"bytes,3,rep,name=str_to_nested,json=strToNested" json:"str_to_nested,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
// Types that are assignable to Union:
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
// *IndirectRequired_OneofNested
Union isIndirectRequired_Union `protobuf_oneof:"union"`
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *IndirectRequired) Reset() {
*x = IndirectRequired{}
}
func (x *IndirectRequired) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*IndirectRequired) ProtoMessage() {}
func (x *IndirectRequired) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use IndirectRequired.ProtoReflect.Descriptor instead.
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
func (*IndirectRequired) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{8}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *IndirectRequired) GetOptNested() *NestedWithRequired {
if x != nil {
return x.OptNested
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *IndirectRequired) GetRptNested() []*NestedWithRequired {
if x != nil {
return x.RptNested
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *IndirectRequired) GetStrToNested() map[string]*NestedWithRequired {
if x != nil {
return x.StrToNested
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
return nil
}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
func (m *IndirectRequired) GetUnion() isIndirectRequired_Union {
if m != nil {
return m.Union
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *IndirectRequired) GetOneofNested() *NestedWithRequired {
if x, ok := x.GetUnion().(*IndirectRequired_OneofNested); ok {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
return x.OneofNested
}
return nil
}
cmd/protoc-gen-go: generate oneof types seperately Seperate out the generation of the oneof wrapper types from the code block that is about getter methods. Change-Id: Ief44ef953d0b5ad8c998a8542c830ca70468a3bf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171029 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-08 14:03:15 -07:00
type isIndirectRequired_Union interface {
isIndirectRequired_Union()
}
type IndirectRequired_OneofNested struct {
OneofNested *NestedWithRequired `protobuf:"bytes,4,opt,name=oneof_nested,json=oneofNested,oneof"`
}
func (*IndirectRequired_OneofNested) isIndirectRequired_Union() {}
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
type Extensions struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: remove MessageSet hackery The encoding/prototext and encoding/protojson are implemented entirely in terms of protobuf reflection, which side-steps this information. Remove the hacks in the generator to special-case MessageSet. Change-Id: I708c4636b77672545a103b7ab686f103b9dfc514 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185240 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-08 12:31:21 -07:00
extensionFields protoimpl.ExtensionFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
OptBool *bool `protobuf:"varint,101,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
OptInt32 *int32 `protobuf:"varint,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Extensions) Reset() {
*x = Extensions{}
}
func (x *Extensions) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Extensions) ProtoMessage() {}
func (x *Extensions) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Extensions.ProtoReflect.Descriptor instead.
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
func (*Extensions) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{9}
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
var extRange_Extensions = []protoiface.ExtensionRangeV1{
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
{Start: 20, End: 100},
}
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Extensions.ProtoReflect.Descriptor.ExtensionRanges instead.
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
func (*Extensions) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
return extRange_Extensions
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Extensions) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
return ""
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Extensions) GetOptBool() bool {
if x != nil && x.OptBool != nil {
return *x.OptBool
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
return false
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Extensions) GetOptInt32() int32 {
if x != nil && x.OptInt32 != nil {
return *x.OptInt32
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
return 0
}
type ExtensionsContainer struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *ExtensionsContainer) Reset() {
*x = ExtensionsContainer{}
}
func (x *ExtensionsContainer) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ExtensionsContainer) ProtoMessage() {}
func (x *ExtensionsContainer) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use ExtensionsContainer.ProtoReflect.Descriptor instead.
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
func (*ExtensionsContainer) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{10}
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
type MessageSet struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: remove MessageSet hackery The encoding/prototext and encoding/protojson are implemented entirely in terms of protobuf reflection, which side-steps this information. Remove the hacks in the generator to special-case MessageSet. Change-Id: I708c4636b77672545a103b7ab686f103b9dfc514 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185240 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-08 12:31:21 -07:00
extensionFields protoimpl.ExtensionFields
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *MessageSet) Reset() {
*x = MessageSet{}
}
func (x *MessageSet) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*MessageSet) ProtoMessage() {}
func (x *MessageSet) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use MessageSet.ProtoReflect.Descriptor instead.
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
func (*MessageSet) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{11}
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
var extRange_MessageSet = []protoiface.ExtensionRangeV1{
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
{Start: 4, End: 2147483646},
}
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use MessageSet.ProtoReflect.Descriptor.ExtensionRanges instead.
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
func (*MessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
return extRange_MessageSet
}
type MessageSetExtension struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *MessageSetExtension) Reset() {
*x = MessageSetExtension{}
}
func (x *MessageSetExtension) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*MessageSetExtension) ProtoMessage() {}
func (x *MessageSetExtension) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use MessageSetExtension.ProtoReflect.Descriptor instead.
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
func (*MessageSetExtension) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{12}
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *MessageSetExtension) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
return ""
}
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
type FakeMessageSet struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: remove MessageSet hackery The encoding/prototext and encoding/protojson are implemented entirely in terms of protobuf reflection, which side-steps this information. Remove the hacks in the generator to special-case MessageSet. Change-Id: I708c4636b77672545a103b7ab686f103b9dfc514 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185240 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-08 12:31:21 -07:00
extensionFields protoimpl.ExtensionFields
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *FakeMessageSet) Reset() {
*x = FakeMessageSet{}
}
func (x *FakeMessageSet) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*FakeMessageSet) ProtoMessage() {}
func (x *FakeMessageSet) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use FakeMessageSet.ProtoReflect.Descriptor instead.
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
func (*FakeMessageSet) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{13}
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
var extRange_FakeMessageSet = []protoiface.ExtensionRangeV1{
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
{Start: 4, End: 536870911},
}
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use FakeMessageSet.ProtoReflect.Descriptor.ExtensionRanges instead.
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
func (*FakeMessageSet) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
return extRange_FakeMessageSet
}
type FakeMessageSetExtension struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *FakeMessageSetExtension) Reset() {
*x = FakeMessageSetExtension{}
}
func (x *FakeMessageSetExtension) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*FakeMessageSetExtension) ProtoMessage() {}
func (x *FakeMessageSetExtension) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use FakeMessageSetExtension.ProtoReflect.Descriptor instead.
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
func (*FakeMessageSetExtension) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{14}
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *FakeMessageSetExtension) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}
return ""
}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
// Message contains well-known type fields.
type KnownTypes struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptBool *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=opt_bool,json=optBool" json:"opt_bool,omitempty"`
OptInt32 *wrapperspb.Int32Value `protobuf:"bytes,2,opt,name=opt_int32,json=optInt32" json:"opt_int32,omitempty"`
OptInt64 *wrapperspb.Int64Value `protobuf:"bytes,3,opt,name=opt_int64,json=optInt64" json:"opt_int64,omitempty"`
OptUint32 *wrapperspb.UInt32Value `protobuf:"bytes,4,opt,name=opt_uint32,json=optUint32" json:"opt_uint32,omitempty"`
OptUint64 *wrapperspb.UInt64Value `protobuf:"bytes,5,opt,name=opt_uint64,json=optUint64" json:"opt_uint64,omitempty"`
OptFloat *wrapperspb.FloatValue `protobuf:"bytes,6,opt,name=opt_float,json=optFloat" json:"opt_float,omitempty"`
OptDouble *wrapperspb.DoubleValue `protobuf:"bytes,7,opt,name=opt_double,json=optDouble" json:"opt_double,omitempty"`
OptString *wrapperspb.StringValue `protobuf:"bytes,8,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
OptBytes *wrapperspb.BytesValue `protobuf:"bytes,9,opt,name=opt_bytes,json=optBytes" json:"opt_bytes,omitempty"`
OptDuration *durationpb.Duration `protobuf:"bytes,20,opt,name=opt_duration,json=optDuration" json:"opt_duration,omitempty"`
OptTimestamp *timestamppb.Timestamp `protobuf:"bytes,21,opt,name=opt_timestamp,json=optTimestamp" json:"opt_timestamp,omitempty"`
OptStruct *structpb.Struct `protobuf:"bytes,25,opt,name=opt_struct,json=optStruct" json:"opt_struct,omitempty"`
OptList *structpb.ListValue `protobuf:"bytes,26,opt,name=opt_list,json=optList" json:"opt_list,omitempty"`
OptValue *structpb.Value `protobuf:"bytes,27,opt,name=opt_value,json=optValue" json:"opt_value,omitempty"`
OptNull *structpb.NullValue `protobuf:"varint,28,opt,name=opt_null,json=optNull,enum=google.protobuf.NullValue" json:"opt_null,omitempty"`
OptEmpty *emptypb.Empty `protobuf:"bytes,30,opt,name=opt_empty,json=optEmpty" json:"opt_empty,omitempty"`
OptAny *anypb.Any `protobuf:"bytes,32,opt,name=opt_any,json=optAny" json:"opt_any,omitempty"`
OptFieldmask *fieldmaskpb.FieldMask `protobuf:"bytes,40,opt,name=opt_fieldmask,json=optFieldmask" json:"opt_fieldmask,omitempty"`
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *KnownTypes) Reset() {
*x = KnownTypes{}
}
func (x *KnownTypes) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*KnownTypes) ProtoMessage() {}
func (x *KnownTypes) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use KnownTypes.ProtoReflect.Descriptor instead.
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
func (*KnownTypes) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{15}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptBool() *wrapperspb.BoolValue {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptBool
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptInt32() *wrapperspb.Int32Value {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptInt32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptInt64() *wrapperspb.Int64Value {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptInt64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptUint32() *wrapperspb.UInt32Value {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptUint32
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptUint64() *wrapperspb.UInt64Value {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptUint64
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptFloat() *wrapperspb.FloatValue {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptFloat
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptDouble() *wrapperspb.DoubleValue {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptDouble
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptString() *wrapperspb.StringValue {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptString
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptBytes() *wrapperspb.BytesValue {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptBytes
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptDuration() *durationpb.Duration {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptDuration
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptTimestamp() *timestamppb.Timestamp {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptTimestamp
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptStruct() *structpb.Struct {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptStruct
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptList() *structpb.ListValue {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptList
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptValue() *structpb.Value {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptValue
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptNull() structpb.NullValue {
encoding/jsonpb: fix unmarshaling of NullValue field A JSON "null" field should set the NullValue enum field because NullValue has the custom encoding format of "null". Change-Id: I2bfa0900de64d7e2874f7c6db04b1cbc0b61b904 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170107 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-29 15:42:20 -07:00
if x != nil && x.OptNull != nil {
return *x.OptNull
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
return structpb.NullValue_NULL_VALUE
encoding/jsonpb: fix unmarshaling of NullValue field A JSON "null" field should set the NullValue enum field because NullValue has the custom encoding format of "null". Change-Id: I2bfa0900de64d7e2874f7c6db04b1cbc0b61b904 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170107 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-29 15:42:20 -07:00
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptEmpty() *emptypb.Empty {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptEmpty
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptAny() *anypb.Any {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptAny
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
return nil
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
func (x *KnownTypes) GetOptFieldmask() *fieldmaskpb.FieldMask {
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
if x != nil {
return x.OptFieldmask
encoding/jsonpb: add support for marshaling well-known types Also, changed MarshalOptions.Compact to Indent for consistency with v1 and to make compact as the default. Change-Id: Id08aaa5ca5656f18e7925d2eabc0b6b055b1cebb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168352 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-18 19:06:15 -07:00
}
return nil
}
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
type Nests_OptGroup struct {
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
OptString *string `protobuf:"bytes,1,opt,name=opt_string,json=optString" json:"opt_string,omitempty"`
OptNested *Nested `protobuf:"bytes,2,opt,name=opt_nested,json=optNested" json:"opt_nested,omitempty"`
Optnestedgroup *Nests_OptGroup_OptNestedGroup `protobuf:"group,3,opt,name=OptNestedGroup,json=optnestedgroup" json:"optnestedgroup,omitempty"`
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_OptGroup) Reset() {
*x = Nests_OptGroup{}
}
func (x *Nests_OptGroup) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Nests_OptGroup) ProtoMessage() {}
func (x *Nests_OptGroup) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[16]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Nests_OptGroup.ProtoReflect.Descriptor instead.
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
func (*Nests_OptGroup) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{4, 0}
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_OptGroup) GetOptString() string {
if x != nil && x.OptString != nil {
return *x.OptString
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
return ""
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_OptGroup) GetOptNested() *Nested {
if x != nil {
return x.OptNested
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
return nil
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_OptGroup) GetOptnestedgroup() *Nests_OptGroup_OptNestedGroup {
if x != nil {
return x.Optnestedgroup
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
return nil
}
type Nests_RptGroup struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
RptString []string `protobuf:"bytes,1,rep,name=rpt_string,json=rptString" json:"rpt_string,omitempty"`
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_RptGroup) Reset() {
*x = Nests_RptGroup{}
}
func (x *Nests_RptGroup) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Nests_RptGroup) ProtoMessage() {}
func (x *Nests_RptGroup) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[17]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Nests_RptGroup.ProtoReflect.Descriptor instead.
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
func (*Nests_RptGroup) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{4, 1}
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_RptGroup) GetRptString() []string {
if x != nil {
return x.RptString
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
return nil
}
type Nests_OptGroup_OptNestedGroup struct {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
state protoimpl.MessageState
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
cmd/protoc-gen-go: improve generation of comments The following improvements were made: * All standalone comments above the "syntax" marker are preserved similar to Java and some other generators. * All standalone comments above the "package" marker are preserved to be consistent with our former behavior. * Leading comments are now generated for enums and extension fields. * Single-line trailing comments are now generated for enum values, message fields, and extension fields. * The leading comments for each field that is part of a oneof are now generated with the wrapper types rather than being shoved into the comment for the oneof itself in an unreadable way. * The deprecation marker is always generated as being above the declaration rather than sometimes being an inlined comment. * The deprecation marker is now properly generated for weak field setters. Updates golang/protobuf#666 Change-Id: I7fd832dd4f86d15bfff70d7c22c6ba4934c05fcf Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189238 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 01:15:48 -07:00
OptFixed32 *uint32 `protobuf:"fixed32,1,opt,name=opt_fixed32,json=optFixed32" json:"opt_fixed32,omitempty"`
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_OptGroup_OptNestedGroup) Reset() {
*x = Nests_OptGroup_OptNestedGroup{}
}
func (x *Nests_OptGroup_OptNestedGroup) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Nests_OptGroup_OptNestedGroup) ProtoMessage() {}
func (x *Nests_OptGroup_OptNestedGroup) ProtoReflect() protoreflect.Message {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
mi := &file_pb2_test_proto_msgTypes[18]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: rely on protoimpl for basic helpers The EnumName, UnmarshalJSONEnum, and CompressGZIP helpers currently live in v1 protoapi, which would cause all generated messages to depend on v1. In an effort to break the dependency of v2 on v1, we move these helper functions to v2 (and re-written to take advantage of protobuf reflection). These helpers are unfortunate, but we cannot eliminate the functionality that they implement since they are exposed in the publicly generated API. Since EnumName does not rely on the enum maps, it removes another dependency on those variables. Eventually, we can get to the point where these variables (though declared) are not linked into the binary if the user does not use them. Also, we rely on the v1 proto package for registration instead of v1 protoapi. This may re-introduce a cyclic dependency on descriptor proto again in the future, but the better approach is to just start registering with v2. Change-Id: Id755585a7a1df14e4a6a2dfa650df221a3c153fb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167921 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-16 00:05:34 -07:00
cmd/protoc-gen-go: update deprecation warning Change-Id: Ie1a854bf6f47d4ca9e941b6ccc64dc24ff32bd19 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186657 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-17 18:06:47 -07:00
// Deprecated: Use Nests_OptGroup_OptNestedGroup.ProtoReflect.Descriptor instead.
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
func (*Nests_OptGroup_OptNestedGroup) Descriptor() ([]byte, []int) {
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescGZIP(), []int{4, 0, 0}
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
cmd/protoc-gen-go: perform some code cleanup Minor changes: * Use x as the receiver since "e" and "m" are meaningless in the presence of user-defined enum and message names. * Consistently keep enum methods together, rather awkwardly split apart by the value maps. Change-Id: I68e5666efb56ac7a4d062fb223b9f826dc72aba9 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170357 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-01 12:59:24 -07:00
func (x *Nests_OptGroup_OptNestedGroup) GetOptFixed32() uint32 {
if x != nil && x.OptFixed32 != nil {
return *x.OptFixed32
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
return 0
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
var file_pb2_test_proto_extTypes = []protoimpl.ExtensionInfo{
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*bool)(nil),
Field: 21,
Name: "pb2.opt_ext_bool",
Tag: "varint,21,opt,name=opt_ext_bool",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*string)(nil),
Field: 22,
Name: "pb2.opt_ext_string",
Tag: "bytes,22,opt,name=opt_ext_string",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*Enum)(nil),
Field: 23,
Name: "pb2.opt_ext_enum",
Tag: "varint,23,opt,name=opt_ext_enum,enum=pb2.Enum",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*Nested)(nil),
Field: 24,
Name: "pb2.opt_ext_nested",
Tag: "bytes,24,opt,name=opt_ext_nested",
Filename: "pb2/test.proto",
},
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*PartialRequired)(nil),
Field: 25,
Name: "pb2.opt_ext_partial",
Tag: "bytes,25,opt,name=opt_ext_partial",
Filename: "pb2/test.proto",
},
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
{
ExtendedType: (*Extensions)(nil),
ExtensionType: ([]uint32)(nil),
Field: 31,
Name: "pb2.rpt_ext_fixed32",
Tag: "fixed32,31,rep,name=rpt_ext_fixed32",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: ([]Enum)(nil),
Field: 32,
Name: "pb2.rpt_ext_enum",
Tag: "varint,32,rep,name=rpt_ext_enum,enum=pb2.Enum",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: ([]*Nested)(nil),
Field: 33,
Name: "pb2.rpt_ext_nested",
Tag: "bytes,33,rep,name=rpt_ext_nested",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*MessageSet)(nil),
ExtensionType: (*FakeMessageSetExtension)(nil),
Field: 50,
cmd/protoc-gen-go: remove MessageSet hackery The encoding/prototext and encoding/protojson are implemented entirely in terms of protobuf reflection, which side-steps this information. Remove the hacks in the generator to special-case MessageSet. Change-Id: I708c4636b77672545a103b7ab686f103b9dfc514 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185240 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-08 12:31:21 -07:00
Name: "pb2.message_set_extension",
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
Tag: "bytes,50,opt,name=message_set_extension",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*bool)(nil),
Field: 51,
Name: "pb2.ExtensionsContainer.opt_ext_bool",
Tag: "varint,51,opt,name=opt_ext_bool",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*string)(nil),
Field: 52,
Name: "pb2.ExtensionsContainer.opt_ext_string",
Tag: "bytes,52,opt,name=opt_ext_string",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*Enum)(nil),
Field: 53,
Name: "pb2.ExtensionsContainer.opt_ext_enum",
Tag: "varint,53,opt,name=opt_ext_enum,enum=pb2.Enum",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*Nested)(nil),
Field: 54,
Name: "pb2.ExtensionsContainer.opt_ext_nested",
Tag: "bytes,54,opt,name=opt_ext_nested",
Filename: "pb2/test.proto",
},
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
{
ExtendedType: (*Extensions)(nil),
ExtensionType: (*PartialRequired)(nil),
Field: 55,
Name: "pb2.ExtensionsContainer.opt_ext_partial",
Tag: "bytes,55,opt,name=opt_ext_partial",
Filename: "pb2/test.proto",
},
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
{
ExtendedType: (*Extensions)(nil),
ExtensionType: ([]string)(nil),
Field: 61,
Name: "pb2.ExtensionsContainer.rpt_ext_string",
Tag: "bytes,61,rep,name=rpt_ext_string",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: ([]Enum)(nil),
Field: 62,
Name: "pb2.ExtensionsContainer.rpt_ext_enum",
Tag: "varint,62,rep,name=rpt_ext_enum,enum=pb2.Enum",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*Extensions)(nil),
ExtensionType: ([]*Nested)(nil),
Field: 63,
Name: "pb2.ExtensionsContainer.rpt_ext_nested",
Tag: "bytes,63,rep,name=rpt_ext_nested",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*MessageSet)(nil),
ExtensionType: (*MessageSetExtension)(nil),
Field: 10,
all: rely on message_set_extension name mangling in ExtensionDescV1 Too much code inside Google rely on ExtensionDescV1.Name being the target message name rather than the real name of the extension. Double down on this assumption consistently across our codebase. Change-Id: If0b7cd16dd1f2f7acfb2e562dbf1a2b5487162b5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186980 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-20 14:57:56 -07:00
Name: "pb2.MessageSetExtension",
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
Tag: "bytes,10,opt,name=message_set_extension",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*MessageSet)(nil),
ExtensionType: (*MessageSetExtension)(nil),
Field: 20,
Name: "pb2.MessageSetExtension.not_message_set_extension",
Tag: "bytes,20,opt,name=not_message_set_extension",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*MessageSet)(nil),
ExtensionType: (*Nested)(nil),
Field: 30,
Name: "pb2.MessageSetExtension.ext_nested",
Tag: "bytes,30,opt,name=ext_nested",
Filename: "pb2/test.proto",
},
{
ExtendedType: (*FakeMessageSet)(nil),
ExtensionType: (*FakeMessageSetExtension)(nil),
Field: 10,
Name: "pb2.FakeMessageSetExtension.message_set_extension",
Tag: "bytes,10,opt,name=message_set_extension",
Filename: "pb2/test.proto",
},
}
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// Extension fields to Extensions.
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
var (
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional bool opt_ext_bool = 21;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_OptExtBool = &file_pb2_test_proto_extTypes[0]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional string opt_ext_string = 22;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_OptExtString = &file_pb2_test_proto_extTypes[1]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.Enum opt_ext_enum = 23;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_OptExtEnum = &file_pb2_test_proto_extTypes[2]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.Nested opt_ext_nested = 24;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_OptExtNested = &file_pb2_test_proto_extTypes[3]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.PartialRequired opt_ext_partial = 25;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_OptExtPartial = &file_pb2_test_proto_extTypes[4]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// repeated fixed32 rpt_ext_fixed32 = 31;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_RptExtFixed32 = &file_pb2_test_proto_extTypes[5]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// repeated pb2.Enum rpt_ext_enum = 32;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_RptExtEnum = &file_pb2_test_proto_extTypes[6]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// repeated pb2.Nested rpt_ext_nested = 33;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_RptExtNested = &file_pb2_test_proto_extTypes[7]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional bool opt_ext_bool = 51;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_OptExtBool = &file_pb2_test_proto_extTypes[9]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional string opt_ext_string = 52;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_OptExtString = &file_pb2_test_proto_extTypes[10]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.Enum opt_ext_enum = 53;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_OptExtEnum = &file_pb2_test_proto_extTypes[11]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.Nested opt_ext_nested = 54;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_OptExtNested = &file_pb2_test_proto_extTypes[12]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.PartialRequired opt_ext_partial = 55;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_OptExtPartial = &file_pb2_test_proto_extTypes[13]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// repeated string rpt_ext_string = 61;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_RptExtString = &file_pb2_test_proto_extTypes[14]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// repeated pb2.Enum rpt_ext_enum = 62;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_RptExtEnum = &file_pb2_test_proto_extTypes[15]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// repeated pb2.Nested rpt_ext_nested = 63;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_ExtensionsContainer_RptExtNested = &file_pb2_test_proto_extTypes[16]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
)
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// Extension fields to MessageSet.
var (
// optional pb2.FakeMessageSetExtension message_set_extension = 50;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_MessageSetExtension = &file_pb2_test_proto_extTypes[8]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.MessageSetExtension message_set_extension = 10;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_MessageSetExtension_MessageSetExtension = &file_pb2_test_proto_extTypes[17]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.MessageSetExtension not_message_set_extension = 20;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_MessageSetExtension_NotMessageSetExtension = &file_pb2_test_proto_extTypes[18]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// optional pb2.Nested ext_nested = 30;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_MessageSetExtension_ExtNested = &file_pb2_test_proto_extTypes[19]
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
)
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
// Extension fields to FakeMessageSet.
var (
// optional pb2.FakeMessageSetExtension message_set_extension = 10;
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
E_FakeMessageSetExtension_MessageSetExtension = &file_pb2_test_proto_extTypes[20]
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
)
cmd/protoc-gen-go: group extension variable declarations For better readability in godoc, group extension fields by the target message that they are extending. Change-Id: Icc0a247b37639e3dbf7a107810923b8ca8294724 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189257 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-06 16:45:11 -07:00
cmd/protoc-gen-go: lazily GZIP-encode the raw descriptor This reduces the init-time cost slightly since the GZIP'd raw descriptor is constructed lazily on demand. Change-Id: I482c6a2201b8786e425d7dee5612fdfd60ab1500 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169917 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-28 01:13:26 -07:00
var File_pb2_test_proto protoreflect.FileDescriptor
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
var file_pb2_test_proto_rawDesc = []byte{
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
0x0a, 0x0e, 0x70, 0x62, 0x32, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x12, 0x03, 0x70, 0x62, 0x32, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
encoding/jsonpb: add support for marshaling well-known types Also, changed MarshalOptions.Compact to Indent for consistency with v1 and to make compact as the default. Change-Id: Id08aaa5ca5656f18e7925d2eabc0b6b055b1cebb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168352 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-18 19:06:15 -07:00
0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x67,
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x66,
0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67,
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74,
0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xda,
0x03, 0x0a, 0x07, 0x53, 0x63, 0x61, 0x6c, 0x61, 0x72, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x70,
0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x70,
0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74,
0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74,
0x33, 0x32, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18,
0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12,
0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04, 0x20,
0x01, 0x28, 0x0d, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1d,
0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, 0x01,
0x28, 0x04, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1d, 0x0a,
0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x06, 0x20, 0x01, 0x28,
0x11, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1d, 0x0a, 0x0a,
0x6f, 0x70, 0x74, 0x5f, 0x73, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x12,
0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1f, 0x0a, 0x0b, 0x6f,
0x70, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x07,
0x52, 0x0a, 0x6f, 0x70, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x1f, 0x0a, 0x0b,
0x6f, 0x70, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28,
0x06, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x21, 0x0a,
0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x0a, 0x20,
0x01, 0x28, 0x0f, 0x52, 0x0b, 0x6f, 0x70, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34,
0x18, 0x0b, 0x20, 0x01, 0x28, 0x10, 0x52, 0x0b, 0x6f, 0x70, 0x74, 0x53, 0x66, 0x69, 0x78, 0x65,
0x64, 0x36, 0x34, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74,
0x18, 0x14, 0x20, 0x01, 0x28, 0x02, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74,
0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x15,
0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12,
0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01,
0x28, 0x0c, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a,
0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xfb, 0x01, 0x0a, 0x05,
0x45, 0x6e, 0x75, 0x6d, 0x73, 0x12, 0x24, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x6e, 0x75,
0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e,
0x75, 0x6d, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x08, 0x72,
0x70, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x09, 0x2e,
0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x07, 0x72, 0x70, 0x74, 0x45, 0x6e, 0x75,
0x6d, 0x12, 0x3d, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f,
0x65, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x32,
0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75,
0x6d, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d,
0x12, 0x3d, 0x0a, 0x0f, 0x72, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65,
0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x32, 0x2e,
0x45, 0x6e, 0x75, 0x6d, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d,
0x52, 0x0d, 0x72, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x22,
0x28, 0x0a, 0x0a, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x07, 0x0a,
0x03, 0x55, 0x4e, 0x4f, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x4f, 0x53, 0x10, 0x02, 0x12,
0x08, 0x0a, 0x04, 0x44, 0x49, 0x45, 0x5a, 0x10, 0x0a, 0x22, 0x94, 0x02, 0x0a, 0x07, 0x52, 0x65,
0x70, 0x65, 0x61, 0x74, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f,
0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x08, 0x52, 0x07, 0x72, 0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c,
0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20,
0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1b, 0x0a,
0x09, 0x72, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03,
0x52, 0x08, 0x72, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70,
0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0d, 0x52, 0x09,
0x72, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74,
0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20, 0x03, 0x28, 0x04, 0x52, 0x09, 0x72,
0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f,
0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x02, 0x52, 0x08, 0x72, 0x70, 0x74,
0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x64, 0x6f, 0x75,
0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x01, 0x52, 0x09, 0x72, 0x70, 0x74, 0x44, 0x6f,
0x75, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69,
0x6e, 0x67, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x70, 0x74, 0x53, 0x74, 0x72,
0x69, 0x6e, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x70, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73,
0x18, 0x09, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x08, 0x72, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73,
0x22, 0x53, 0x0a, 0x06, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70,
0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a, 0x0a, 0x6f, 0x70, 0x74,
0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e,
0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0xd3, 0x03, 0x0a, 0x05, 0x4e, 0x65, 0x73, 0x74, 0x73, 0x12,
0x2a, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64,
0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x2f, 0x0a, 0x08, 0x6f,
0x70, 0x74, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0a, 0x32, 0x13, 0x2e,
0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x47, 0x72, 0x6f,
0x75, 0x70, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x2a, 0x0a, 0x0a,
0x72, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x72,
0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x2f, 0x0a, 0x08, 0x72, 0x70, 0x74, 0x67,
0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0a, 0x32, 0x13, 0x2e, 0x70, 0x62, 0x32,
0x2e, 0x4e, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x52, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52,
0x08, 0x72, 0x70, 0x74, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0xd4, 0x01, 0x0a, 0x08, 0x4f, 0x70,
0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74,
0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53,
0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x2a, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73,
0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e,
0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65,
0x64, 0x12, 0x4a, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x67, 0x72,
0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0a, 0x32, 0x22, 0x2e, 0x70, 0x62, 0x32, 0x2e,
0x4e, 0x65, 0x73, 0x74, 0x73, 0x2e, 0x4f, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x4f,
0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x0e, 0x6f,
0x70, 0x74, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x31, 0x0a,
0x0e, 0x4f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12,
0x1f, 0x0a, 0x0b, 0x6f, 0x70, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x01,
0x20, 0x01, 0x28, 0x07, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
0x1a, 0x29, 0x0a, 0x08, 0x52, 0x70, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1d, 0x0a, 0x0a,
0x72, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
0x52, 0x09, 0x72, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x0e, 0x72, 0x65, 0x73,
0x65, 0x72, 0x76, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0xd9, 0x01, 0x0a, 0x09,
0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x71,
0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x02, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x71,
0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x71, 0x5f, 0x73, 0x66, 0x69, 0x78,
0x65, 0x64, 0x36, 0x34, 0x18, 0x02, 0x20, 0x02, 0x28, 0x10, 0x52, 0x0b, 0x72, 0x65, 0x71, 0x53,
0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x64,
0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x02, 0x28, 0x01, 0x52, 0x09, 0x72, 0x65, 0x71,
0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x73, 0x74,
0x72, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x02, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x53,
0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x24, 0x0a, 0x08, 0x72, 0x65, 0x71, 0x5f, 0x65, 0x6e, 0x75,
0x6d, 0x18, 0x05, 0x20, 0x02, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e,
0x75, 0x6d, 0x52, 0x07, 0x72, 0x65, 0x71, 0x45, 0x6e, 0x75, 0x6d, 0x12, 0x2a, 0x0a, 0x0a, 0x72,
0x65, 0x71, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x02, 0x28, 0x0b, 0x32,
0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x09, 0x72, 0x65,
0x71, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x4f, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x74, 0x69,
0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65,
0x71, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x02, 0x28, 0x09, 0x52, 0x09,
0x72, 0x65, 0x71, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74,
0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f,
0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0x33, 0x0a, 0x12, 0x4e, 0x65, 0x73, 0x74,
0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x12, 0x1d,
0x0a, 0x0a, 0x72, 0x65, 0x71, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x02,
0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x71, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x22, 0xee, 0x02,
0x0a, 0x10, 0x49, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72,
0x65, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73,
0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52,
0x09, 0x6f, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x36, 0x0a, 0x0a, 0x72, 0x70,
0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x52,
0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x09, 0x72, 0x70, 0x74, 0x4e, 0x65, 0x73, 0x74,
0x65, 0x64, 0x12, 0x4a, 0x0a, 0x0d, 0x73, 0x74, 0x72, 0x5f, 0x74, 0x6f, 0x5f, 0x6e, 0x65, 0x73,
0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x70, 0x62, 0x32, 0x2e,
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
0x49, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64,
encoding/jsonpb: add support for marshaling well-known types Also, changed MarshalOptions.Compact to Indent for consistency with v1 and to make compact as the default. Change-Id: Id08aaa5ca5656f18e7925d2eabc0b6b055b1cebb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168352 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-18 19:06:15 -07:00
0x2e, 0x53, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x3c,
0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x04,
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65,
encoding/jsonpb: add support for marshaling well-known types Also, changed MarshalOptions.Compact to Indent for consistency with v1 and to make compact as the default. Change-Id: Id08aaa5ca5656f18e7925d2eabc0b6b055b1cebb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168352 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-18 19:06:15 -07:00
0x64, 0x57, 0x69, 0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x48, 0x00, 0x52,
0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x1a, 0x57, 0x0a, 0x10,
0x53, 0x74, 0x72, 0x54, 0x6f, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
0x65, 0x79, 0x12, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x17, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69,
0x74, 0x68, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x22, 0x69,
0x0a, 0x0a, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1d, 0x0a, 0x0a,
0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x6f,
0x70, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x65, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f,
0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x1b, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e,
0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e,
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
0x74, 0x33, 0x32, 0x2a, 0x04, 0x08, 0x14, 0x10, 0x65, 0x22, 0x89, 0x04, 0x0a, 0x13, 0x45, 0x78,
encoding/jsonpb: add support for marshaling well-known types Also, changed MarshalOptions.Compact to Indent for consistency with v1 and to make compact as the default. Change-Id: Id08aaa5ca5656f18e7925d2eabc0b6b055b1cebb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168352 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-18 19:06:15 -07:00
0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
0x72, 0x32, 0x31, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x62, 0x6f, 0x6f,
0x6c, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
0x6e, 0x73, 0x18, 0x33, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74,
0x42, 0x6f, 0x6f, 0x6c, 0x32, 0x35, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f,
0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74,
0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x34, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f,
0x70, 0x74, 0x45, 0x78, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x32, 0x3c, 0x0a, 0x0c, 0x6f,
0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62,
0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x35, 0x20, 0x01,
0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0a, 0x6f,
0x70, 0x74, 0x45, 0x78, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x32, 0x42, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
0x5f, 0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62,
0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x36, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52,
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
0x0c, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x32, 0x4d, 0x0a,
0x0f, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c,
0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
0x73, 0x18, 0x37, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x50, 0x61,
0x72, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x0d, 0x6f,
0x70, 0x74, 0x45, 0x78, 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x32, 0x35, 0x0a, 0x0e,
0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x0f,
0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18,
0x3d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x53, 0x74, 0x72,
0x69, 0x6e, 0x67, 0x32, 0x3c, 0x0a, 0x0c, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x65,
0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
0x69, 0x6f, 0x6e, 0x73, 0x18, 0x3e, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32,
0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0a, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x45, 0x6e, 0x75,
0x6d, 0x32, 0x42, 0x0a, 0x0e, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73,
0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
0x69, 0x6f, 0x6e, 0x73, 0x18, 0x3f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32,
0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x0c, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x4e,
0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x1a, 0x0a, 0x0a, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
0x53, 0x65, 0x74, 0x2a, 0x08, 0x08, 0x04, 0x10, 0xff, 0xff, 0xff, 0xff, 0x07, 0x3a, 0x02, 0x08,
0x01, 0x22, 0xb6, 0x02, 0x0a, 0x13, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74,
0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74,
0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f,
0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x32, 0x5d, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73,
0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53,
0x65, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d,
encoding/jsonpb: fix unmarshaling of NullValue field A JSON "null" field should set the NullValue enum field because NullValue has the custom encoding format of "null". Change-Id: I2bfa0900de64d7e2874f7c6db04b1cbc0b61b904 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170107 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-29 15:42:20 -07:00
0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
0x6f, 0x6e, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78,
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x64, 0x0a, 0x19, 0x6e, 0x6f, 0x74, 0x5f, 0x6d,
0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e,
0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61,
0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x62,
0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65,
0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x16, 0x6e, 0x6f, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x3b, 0x0a,
0x0a, 0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62,
0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x1e, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52,
0x09, 0x65, 0x78, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0x1a, 0x0a, 0x0e, 0x46, 0x61,
0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x2a, 0x08, 0x08, 0x04,
0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x9f, 0x01, 0x0a, 0x17, 0x46, 0x61, 0x6b, 0x65, 0x4d,
0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e,
0x67, 0x32, 0x65, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65, 0x74,
0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x32,
0x2e, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18,
0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x46, 0x61, 0x6b, 0x65,
0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
0x69, 0x6f, 0x6e, 0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45,
0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x9e, 0x08, 0x0a, 0x0a, 0x4b, 0x6e, 0x6f,
0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x35, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x62,
0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c,
0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x38,
0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08,
0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x38, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f,
0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f,
0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e,
0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x49, 0x6e, 0x74,
0x36, 0x34, 0x12, 0x3b, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32,
0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
0x3b, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x05, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75,
0x65, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x55, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x38, 0x0a, 0x09,
0x6f, 0x70, 0x74, 0x5f, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x2e, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f, 0x70,
0x74, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x12, 0x3b, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x64, 0x6f,
0x75, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x6f, 0x75,
0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x44, 0x6f, 0x75,
0x62, 0x6c, 0x65, 0x12, 0x3b, 0x0a, 0x0a, 0x6f, 0x70, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
0x12, 0x38, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x79, 0x74, 0x65, 0x73, 0x56, 0x61, 0x6c, 0x75, 0x65,
0x52, 0x08, 0x6f, 0x70, 0x74, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x3c, 0x0a, 0x0c, 0x6f, 0x70,
0x74, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x6f, 0x70, 0x74,
0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x5f,
0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0c, 0x6f, 0x70, 0x74,
0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x36, 0x0a, 0x0a, 0x6f, 0x70, 0x74,
0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x6f, 0x70, 0x74, 0x53, 0x74, 0x72, 0x75, 0x63,
0x74, 0x12, 0x35, 0x0a, 0x08, 0x6f, 0x70, 0x74, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x1a, 0x20,
0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
0x07, 0x6f, 0x70, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x33, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f,
0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61,
0x6c, 0x75, 0x65, 0x52, 0x08, 0x6f, 0x70, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x35, 0x0a,
0x08, 0x6f, 0x70, 0x74, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0e, 0x32,
0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x6f, 0x70, 0x74,
0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x33, 0x0a, 0x09, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x6d, 0x70, 0x74,
0x79, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52,
0x08, 0x6f, 0x70, 0x74, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x2d, 0x0a, 0x07, 0x6f, 0x70, 0x74,
0x5f, 0x61, 0x6e, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f,
0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79,
0x52, 0x06, 0x6f, 0x70, 0x74, 0x41, 0x6e, 0x79, 0x12, 0x3f, 0x0a, 0x0d, 0x6f, 0x70, 0x74, 0x5f,
0x66, 0x69, 0x65, 0x6c, 0x64, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x0c, 0x6f, 0x70, 0x74,
0x46, 0x69, 0x65, 0x6c, 0x64, 0x6d, 0x61, 0x73, 0x6b, 0x2a, 0x21, 0x0a, 0x04, 0x45, 0x6e, 0x75,
0x6d, 0x12, 0x07, 0x0a, 0x03, 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x57,
0x4f, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x45, 0x4e, 0x10, 0x0a, 0x3a, 0x31, 0x0a, 0x0c,
0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x0f, 0x2e, 0x70,
0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x15, 0x20,
0x01, 0x28, 0x08, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74, 0x42, 0x6f, 0x6f, 0x6c, 0x3a,
0x35, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
0x67, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
0x6e, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74,
0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x3a, 0x3c, 0x0a, 0x0c, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78,
0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74,
0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e,
0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0a, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74,
0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x42, 0x0a, 0x0e, 0x6f, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f,
0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74,
0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x52, 0x0c, 0x6f, 0x70, 0x74, 0x45,
0x78, 0x74, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x3a, 0x4d, 0x0a, 0x0f, 0x6f, 0x70, 0x74, 0x5f,
0x65, 0x78, 0x74, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x12, 0x0f, 0x2e, 0x70, 0x62,
0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x19, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c,
0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x45, 0x78, 0x74,
0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x3a, 0x37, 0x0a, 0x0f, 0x72, 0x70, 0x74, 0x5f, 0x65,
0x78, 0x74, 0x5f, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32,
0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x1f, 0x20, 0x03, 0x28,
0x07, 0x52, 0x0d, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x46, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32,
0x3a, 0x3c, 0x0a, 0x0c, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x6e, 0x75, 0x6d,
0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
0x73, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x6e,
0x75, 0x6d, 0x52, 0x0a, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x45, 0x6e, 0x75, 0x6d, 0x3a, 0x42,
0x0a, 0x0e, 0x72, 0x70, 0x74, 0x5f, 0x65, 0x78, 0x74, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64,
0x12, 0x0f, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
0x73, 0x18, 0x21, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x4e, 0x65,
0x73, 0x74, 0x65, 0x64, 0x52, 0x0c, 0x72, 0x70, 0x74, 0x45, 0x78, 0x74, 0x4e, 0x65, 0x73, 0x74,
0x65, 0x64, 0x3a, 0x61, 0x0a, 0x15, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x65,
0x74, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x2e, 0x70, 0x62,
0x32, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x18, 0x32, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x32, 0x2e, 0x46, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73,
0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
0x52, 0x13, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x65, 0x74, 0x45, 0x78, 0x74, 0x65,
all: change module to google.golang.org/protobuf Temporarily remove go.mod, since we can't generate an accurate one until the corresponding v1 change is submitted. Change-Id: I1e1ad97f2b455e33f61ffaeb8676289795e47e72 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177000 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-13 23:55:40 -07:00
0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x34, 0x5a, 0x32, 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, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x74, 0x65, 0x73,
0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x70, 0x62, 0x32,
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
}
cmd/protoc-gen-go: lazily GZIP-encode the raw descriptor This reduces the init-time cost slightly since the GZIP'd raw descriptor is constructed lazily on demand. Change-Id: I482c6a2201b8786e425d7dee5612fdfd60ab1500 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169917 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-28 01:13:26 -07:00
var (
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
file_pb2_test_proto_rawDescOnce sync.Once
file_pb2_test_proto_rawDescData = file_pb2_test_proto_rawDesc
cmd/protoc-gen-go: lazily GZIP-encode the raw descriptor This reduces the init-time cost slightly since the GZIP'd raw descriptor is constructed lazily on demand. Change-Id: I482c6a2201b8786e425d7dee5612fdfd60ab1500 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169917 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-28 01:13:26 -07:00
)
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
func file_pb2_test_proto_rawDescGZIP() []byte {
file_pb2_test_proto_rawDescOnce.Do(func() {
file_pb2_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_pb2_test_proto_rawDescData)
cmd/protoc-gen-go: lazily GZIP-encode the raw descriptor This reduces the init-time cost slightly since the GZIP'd raw descriptor is constructed lazily on demand. Change-Id: I482c6a2201b8786e425d7dee5612fdfd60ab1500 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169917 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-28 01:13:26 -07:00
})
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
return file_pb2_test_proto_rawDescData
cmd/protoc-gen-go: lazily GZIP-encode the raw descriptor This reduces the init-time cost slightly since the GZIP'd raw descriptor is constructed lazily on demand. Change-Id: I482c6a2201b8786e425d7dee5612fdfd60ab1500 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169917 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-28 01:13:26 -07:00
}
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
cmd/protoc-gen-go, internal/filetype: clean up EnumType construction Drop the dependency from generated files on prototype.Enum: Generated code should only depend on runtime/proto{iface,impl}. Drop the Enums, Messages, and Extensions returns form filetype.Builder.Build. Of these, only Enums was used by generated code. Change the generated init function to pass the builder a slice of values to fill in (as is done for messages and extensions). Remove the filetype dependency on prototype in preparation for eventually dropping the prototype package entirely. Change-Id: I28a3420f5dfcc13fed531a64ef07b9afddfd9d55 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189200 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-06 15:26:36 -07:00
var file_pb2_test_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
internal/impl: rename MessageType as MessageInfo The name MessageType is easily confused with protoreflect.MessageType. Rename it as MessageInfo, which follows the pattern set by v1, where the equivalent data structure is called InternalMessageInfo. Change-Id: I535956e1f7c6e9b07e9585e889d5e93388d0d2ce Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/178478 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-22 05:12:36 -04:00
var file_pb2_test_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
var file_pb2_test_proto_goTypes = []interface{}{
internal/fileinit: generate reflect data structures from raw descriptors This CL takes a significantly different approach to generating support for protobuf reflection. The previous approach involved generating a large number of Go literals to represent the reflection information. While that approach was correct, it resulted in too much binary bloat. The approach taken here initializes the reflection information from the raw descriptor proto, which is a relatively dense representation of the protobuf reflection information. In order to keep initialization cost low, several measures were taken: * At program init, the bare minimum is parsed in order to initialize naming information for enums, messages, extensions, and services declared in the file. This is done because those top-level declarations are often relevant for registration. * Only upon first are most of the other data structures for protobuf reflection actually initialized. * Instead of using proto.Unmarshal, a hand-written unmarshaler is used. This allows us to avoid a dependendency on the descriptor proto and also because the API for the descriptor proto is fundamentally non-performant since it requires an allocation for every primitive field. At a high-level, the new implementation lives in internal/fileinit. Several changes were made to other parts of the repository: * cmd/protoc-gen-go: * Stop compressing the raw descriptors. While compression does reduce the size of the descriptors by approximately 2x, it is a pre-mature optimization since the descriptors themselves are around 1% of the total binary bloat that is due to generated protobufs. * Seeding protobuf reflection from the raw descriptor significantly simplifies the generator implementation since it is no longer responsible for constructing a tree of Go literals to represent the same information. * We remove the generation of the shadow types and instead call protoimpl.MessageType.MessageOf. Unfortunately, this incurs an allocation for every call to ProtoReflect since we need to allocate a tuple that wraps a pointer to the message value, and a pointer to message type. * internal/impl: * We add a MessageType.GoType field and make it required that it is set prior to first use. This is done so that we can avoid calling MessageType.init except for when it is actually needed. The allows code to call (*FooMessage)(nil).ProtoReflect().Type() without fearing that the init code will run, possibly triggering a recursive deadlock (where the init code depends on getting the Type of some dependency which may be declared within the same file). * internal/cmd/generate-types: * The code to generate reflect/prototype/protofile_list_gen.go was copied and altered to generated internal/fileinit.desc_list_gen.go. At a high-level this CL adds significant technical complexity. However, this is offset by several possible future changes: * The prototype package can be drastically simplified. We can probably reimplement internal/legacy to use internal/fileinit instead, allowing us to drop another dependency on the prototype package. As a result, we can probably delete most of the constructor types in that package. * With the prototype package significantly pruned, and the fact that generated code no longer depend on depends on that package, we can consider merging what's left of prototype into protodesc. Change-Id: I6090f023f2e1b6afaf62bd3ae883566242e30715 Reviewed-on: https://go-review.googlesource.com/c/158539 Reviewed-by: Herbie Ong <herbie@google.com> Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-18 09:32:24 -08:00
(Enum)(0), // 0: pb2.Enum
(Enums_NestedEnum)(0), // 1: pb2.Enums.NestedEnum
(*Scalars)(nil), // 2: pb2.Scalars
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
(*Enums)(nil), // 3: pb2.Enums
(*Repeats)(nil), // 4: pb2.Repeats
(*Nested)(nil), // 5: pb2.Nested
(*Nests)(nil), // 6: pb2.Nests
internal/fileinit: generate reflect data structures from raw descriptors This CL takes a significantly different approach to generating support for protobuf reflection. The previous approach involved generating a large number of Go literals to represent the reflection information. While that approach was correct, it resulted in too much binary bloat. The approach taken here initializes the reflection information from the raw descriptor proto, which is a relatively dense representation of the protobuf reflection information. In order to keep initialization cost low, several measures were taken: * At program init, the bare minimum is parsed in order to initialize naming information for enums, messages, extensions, and services declared in the file. This is done because those top-level declarations are often relevant for registration. * Only upon first are most of the other data structures for protobuf reflection actually initialized. * Instead of using proto.Unmarshal, a hand-written unmarshaler is used. This allows us to avoid a dependendency on the descriptor proto and also because the API for the descriptor proto is fundamentally non-performant since it requires an allocation for every primitive field. At a high-level, the new implementation lives in internal/fileinit. Several changes were made to other parts of the repository: * cmd/protoc-gen-go: * Stop compressing the raw descriptors. While compression does reduce the size of the descriptors by approximately 2x, it is a pre-mature optimization since the descriptors themselves are around 1% of the total binary bloat that is due to generated protobufs. * Seeding protobuf reflection from the raw descriptor significantly simplifies the generator implementation since it is no longer responsible for constructing a tree of Go literals to represent the same information. * We remove the generation of the shadow types and instead call protoimpl.MessageType.MessageOf. Unfortunately, this incurs an allocation for every call to ProtoReflect since we need to allocate a tuple that wraps a pointer to the message value, and a pointer to message type. * internal/impl: * We add a MessageType.GoType field and make it required that it is set prior to first use. This is done so that we can avoid calling MessageType.init except for when it is actually needed. The allows code to call (*FooMessage)(nil).ProtoReflect().Type() without fearing that the init code will run, possibly triggering a recursive deadlock (where the init code depends on getting the Type of some dependency which may be declared within the same file). * internal/cmd/generate-types: * The code to generate reflect/prototype/protofile_list_gen.go was copied and altered to generated internal/fileinit.desc_list_gen.go. At a high-level this CL adds significant technical complexity. However, this is offset by several possible future changes: * The prototype package can be drastically simplified. We can probably reimplement internal/legacy to use internal/fileinit instead, allowing us to drop another dependency on the prototype package. As a result, we can probably delete most of the constructor types in that package. * With the prototype package significantly pruned, and the fact that generated code no longer depend on depends on that package, we can consider merging what's left of prototype into protodesc. Change-Id: I6090f023f2e1b6afaf62bd3ae883566242e30715 Reviewed-on: https://go-review.googlesource.com/c/158539 Reviewed-by: Herbie Ong <herbie@google.com> Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-18 09:32:24 -08:00
(*Requireds)(nil), // 7: pb2.Requireds
(*PartialRequired)(nil), // 8: pb2.PartialRequired
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
(*NestedWithRequired)(nil), // 9: pb2.NestedWithRequired
(*IndirectRequired)(nil), // 10: pb2.IndirectRequired
(*Extensions)(nil), // 11: pb2.Extensions
(*ExtensionsContainer)(nil), // 12: pb2.ExtensionsContainer
(*MessageSet)(nil), // 13: pb2.MessageSet
(*MessageSetExtension)(nil), // 14: pb2.MessageSetExtension
(*FakeMessageSet)(nil), // 15: pb2.FakeMessageSet
(*FakeMessageSetExtension)(nil), // 16: pb2.FakeMessageSetExtension
(*KnownTypes)(nil), // 17: pb2.KnownTypes
(*Nests_OptGroup)(nil), // 18: pb2.Nests.OptGroup
(*Nests_RptGroup)(nil), // 19: pb2.Nests.RptGroup
(*Nests_OptGroup_OptNestedGroup)(nil), // 20: pb2.Nests.OptGroup.OptNestedGroup
nil, // 21: pb2.IndirectRequired.StrToNestedEntry
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
(*wrapperspb.BoolValue)(nil), // 22: google.protobuf.BoolValue
(*wrapperspb.Int32Value)(nil), // 23: google.protobuf.Int32Value
(*wrapperspb.Int64Value)(nil), // 24: google.protobuf.Int64Value
(*wrapperspb.UInt32Value)(nil), // 25: google.protobuf.UInt32Value
(*wrapperspb.UInt64Value)(nil), // 26: google.protobuf.UInt64Value
(*wrapperspb.FloatValue)(nil), // 27: google.protobuf.FloatValue
(*wrapperspb.DoubleValue)(nil), // 28: google.protobuf.DoubleValue
(*wrapperspb.StringValue)(nil), // 29: google.protobuf.StringValue
(*wrapperspb.BytesValue)(nil), // 30: google.protobuf.BytesValue
(*durationpb.Duration)(nil), // 31: google.protobuf.Duration
(*timestamppb.Timestamp)(nil), // 32: google.protobuf.Timestamp
(*structpb.Struct)(nil), // 33: google.protobuf.Struct
(*structpb.ListValue)(nil), // 34: google.protobuf.ListValue
(*structpb.Value)(nil), // 35: google.protobuf.Value
(structpb.NullValue)(0), // 36: google.protobuf.NullValue
(*emptypb.Empty)(nil), // 37: google.protobuf.Empty
(*anypb.Any)(nil), // 38: google.protobuf.Any
(*fieldmaskpb.FieldMask)(nil), // 39: google.protobuf.FieldMask
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
}
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
var file_pb2_test_proto_depIdxs = []int32{
cmd/protoc-gen-go: annotate depIdxs list with index comments Generate the current index into depIdxs for easier human debugging. Change-Id: Ida42aa95137b2044a4dc267c31cebec5023bdfb1 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/190278 Reviewed-by: Herbie Ong <herbie@google.com>
2019-08-14 11:55:31 -07:00
0, // 0: pb2.Enums.opt_enum:type_name -> pb2.Enum
0, // 1: pb2.Enums.rpt_enum:type_name -> pb2.Enum
1, // 2: pb2.Enums.opt_nested_enum:type_name -> pb2.Enums.NestedEnum
1, // 3: pb2.Enums.rpt_nested_enum:type_name -> pb2.Enums.NestedEnum
5, // 4: pb2.Nested.opt_nested:type_name -> pb2.Nested
5, // 5: pb2.Nests.opt_nested:type_name -> pb2.Nested
18, // 6: pb2.Nests.optgroup:type_name -> pb2.Nests.OptGroup
5, // 7: pb2.Nests.rpt_nested:type_name -> pb2.Nested
19, // 8: pb2.Nests.rptgroup:type_name -> pb2.Nests.RptGroup
0, // 9: pb2.Requireds.req_enum:type_name -> pb2.Enum
5, // 10: pb2.Requireds.req_nested:type_name -> pb2.Nested
9, // 11: pb2.IndirectRequired.opt_nested:type_name -> pb2.NestedWithRequired
9, // 12: pb2.IndirectRequired.rpt_nested:type_name -> pb2.NestedWithRequired
21, // 13: pb2.IndirectRequired.str_to_nested:type_name -> pb2.IndirectRequired.StrToNestedEntry
9, // 14: pb2.IndirectRequired.oneof_nested:type_name -> pb2.NestedWithRequired
22, // 15: pb2.KnownTypes.opt_bool:type_name -> google.protobuf.BoolValue
23, // 16: pb2.KnownTypes.opt_int32:type_name -> google.protobuf.Int32Value
24, // 17: pb2.KnownTypes.opt_int64:type_name -> google.protobuf.Int64Value
25, // 18: pb2.KnownTypes.opt_uint32:type_name -> google.protobuf.UInt32Value
26, // 19: pb2.KnownTypes.opt_uint64:type_name -> google.protobuf.UInt64Value
27, // 20: pb2.KnownTypes.opt_float:type_name -> google.protobuf.FloatValue
28, // 21: pb2.KnownTypes.opt_double:type_name -> google.protobuf.DoubleValue
29, // 22: pb2.KnownTypes.opt_string:type_name -> google.protobuf.StringValue
30, // 23: pb2.KnownTypes.opt_bytes:type_name -> google.protobuf.BytesValue
31, // 24: pb2.KnownTypes.opt_duration:type_name -> google.protobuf.Duration
32, // 25: pb2.KnownTypes.opt_timestamp:type_name -> google.protobuf.Timestamp
33, // 26: pb2.KnownTypes.opt_struct:type_name -> google.protobuf.Struct
34, // 27: pb2.KnownTypes.opt_list:type_name -> google.protobuf.ListValue
35, // 28: pb2.KnownTypes.opt_value:type_name -> google.protobuf.Value
36, // 29: pb2.KnownTypes.opt_null:type_name -> google.protobuf.NullValue
37, // 30: pb2.KnownTypes.opt_empty:type_name -> google.protobuf.Empty
38, // 31: pb2.KnownTypes.opt_any:type_name -> google.protobuf.Any
39, // 32: pb2.KnownTypes.opt_fieldmask:type_name -> google.protobuf.FieldMask
5, // 33: pb2.Nests.OptGroup.opt_nested:type_name -> pb2.Nested
20, // 34: pb2.Nests.OptGroup.optnestedgroup:type_name -> pb2.Nests.OptGroup.OptNestedGroup
9, // 35: pb2.IndirectRequired.StrToNestedEntry.value:type_name -> pb2.NestedWithRequired
11, // 36: pb2.opt_ext_bool:extendee -> pb2.Extensions
11, // 37: pb2.opt_ext_string:extendee -> pb2.Extensions
11, // 38: pb2.opt_ext_enum:extendee -> pb2.Extensions
11, // 39: pb2.opt_ext_nested:extendee -> pb2.Extensions
11, // 40: pb2.opt_ext_partial:extendee -> pb2.Extensions
11, // 41: pb2.rpt_ext_fixed32:extendee -> pb2.Extensions
11, // 42: pb2.rpt_ext_enum:extendee -> pb2.Extensions
11, // 43: pb2.rpt_ext_nested:extendee -> pb2.Extensions
13, // 44: pb2.message_set_extension:extendee -> pb2.MessageSet
11, // 45: pb2.ExtensionsContainer.opt_ext_bool:extendee -> pb2.Extensions
11, // 46: pb2.ExtensionsContainer.opt_ext_string:extendee -> pb2.Extensions
11, // 47: pb2.ExtensionsContainer.opt_ext_enum:extendee -> pb2.Extensions
11, // 48: pb2.ExtensionsContainer.opt_ext_nested:extendee -> pb2.Extensions
11, // 49: pb2.ExtensionsContainer.opt_ext_partial:extendee -> pb2.Extensions
11, // 50: pb2.ExtensionsContainer.rpt_ext_string:extendee -> pb2.Extensions
11, // 51: pb2.ExtensionsContainer.rpt_ext_enum:extendee -> pb2.Extensions
11, // 52: pb2.ExtensionsContainer.rpt_ext_nested:extendee -> pb2.Extensions
13, // 53: pb2.MessageSetExtension.message_set_extension:extendee -> pb2.MessageSet
13, // 54: pb2.MessageSetExtension.not_message_set_extension:extendee -> pb2.MessageSet
13, // 55: pb2.MessageSetExtension.ext_nested:extendee -> pb2.MessageSet
15, // 56: pb2.FakeMessageSetExtension.message_set_extension:extendee -> pb2.FakeMessageSet
0, // 57: pb2.opt_ext_enum:type_name -> pb2.Enum
5, // 58: pb2.opt_ext_nested:type_name -> pb2.Nested
8, // 59: pb2.opt_ext_partial:type_name -> pb2.PartialRequired
0, // 60: pb2.rpt_ext_enum:type_name -> pb2.Enum
5, // 61: pb2.rpt_ext_nested:type_name -> pb2.Nested
16, // 62: pb2.message_set_extension:type_name -> pb2.FakeMessageSetExtension
0, // 63: pb2.ExtensionsContainer.opt_ext_enum:type_name -> pb2.Enum
5, // 64: pb2.ExtensionsContainer.opt_ext_nested:type_name -> pb2.Nested
8, // 65: pb2.ExtensionsContainer.opt_ext_partial:type_name -> pb2.PartialRequired
0, // 66: pb2.ExtensionsContainer.rpt_ext_enum:type_name -> pb2.Enum
5, // 67: pb2.ExtensionsContainer.rpt_ext_nested:type_name -> pb2.Nested
14, // 68: pb2.MessageSetExtension.message_set_extension:type_name -> pb2.MessageSetExtension
14, // 69: pb2.MessageSetExtension.not_message_set_extension:type_name -> pb2.MessageSetExtension
5, // 70: pb2.MessageSetExtension.ext_nested:type_name -> pb2.Nested
16, // 71: pb2.FakeMessageSetExtension.message_set_extension:type_name -> pb2.FakeMessageSetExtension
72, // [72:72] is the sub-list for method output_type
72, // [72:72] is the sub-list for method input_type
57, // [57:72] is the sub-list for extension type_name
36, // [36:57] is the sub-list for extension extendee
0, // [0:36] is the sub-list for field type_name
internal/fileinit: generate reflect data structures from raw descriptors This CL takes a significantly different approach to generating support for protobuf reflection. The previous approach involved generating a large number of Go literals to represent the reflection information. While that approach was correct, it resulted in too much binary bloat. The approach taken here initializes the reflection information from the raw descriptor proto, which is a relatively dense representation of the protobuf reflection information. In order to keep initialization cost low, several measures were taken: * At program init, the bare minimum is parsed in order to initialize naming information for enums, messages, extensions, and services declared in the file. This is done because those top-level declarations are often relevant for registration. * Only upon first are most of the other data structures for protobuf reflection actually initialized. * Instead of using proto.Unmarshal, a hand-written unmarshaler is used. This allows us to avoid a dependendency on the descriptor proto and also because the API for the descriptor proto is fundamentally non-performant since it requires an allocation for every primitive field. At a high-level, the new implementation lives in internal/fileinit. Several changes were made to other parts of the repository: * cmd/protoc-gen-go: * Stop compressing the raw descriptors. While compression does reduce the size of the descriptors by approximately 2x, it is a pre-mature optimization since the descriptors themselves are around 1% of the total binary bloat that is due to generated protobufs. * Seeding protobuf reflection from the raw descriptor significantly simplifies the generator implementation since it is no longer responsible for constructing a tree of Go literals to represent the same information. * We remove the generation of the shadow types and instead call protoimpl.MessageType.MessageOf. Unfortunately, this incurs an allocation for every call to ProtoReflect since we need to allocate a tuple that wraps a pointer to the message value, and a pointer to message type. * internal/impl: * We add a MessageType.GoType field and make it required that it is set prior to first use. This is done so that we can avoid calling MessageType.init except for when it is actually needed. The allows code to call (*FooMessage)(nil).ProtoReflect().Type() without fearing that the init code will run, possibly triggering a recursive deadlock (where the init code depends on getting the Type of some dependency which may be declared within the same file). * internal/cmd/generate-types: * The code to generate reflect/prototype/protofile_list_gen.go was copied and altered to generated internal/fileinit.desc_list_gen.go. At a high-level this CL adds significant technical complexity. However, this is offset by several possible future changes: * The prototype package can be drastically simplified. We can probably reimplement internal/legacy to use internal/fileinit instead, allowing us to drop another dependency on the prototype package. As a result, we can probably delete most of the constructor types in that package. * With the prototype package significantly pruned, and the fact that generated code no longer depend on depends on that package, we can consider merging what's left of prototype into protodesc. Change-Id: I6090f023f2e1b6afaf62bd3ae883566242e30715 Reviewed-on: https://go-review.googlesource.com/c/158539 Reviewed-by: Herbie Ong <herbie@google.com> Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-18 09:32:24 -08:00
}
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
func init() { file_pb2_test_proto_init() }
func file_pb2_test_proto_init() {
cmd/protoc-gen-go: enforce init order within packages Ensure that the init funcs for files within a Go package run in the dependency order of the source .proto files. That is, if a.proto and b.proto are part of the same Go package, and a.proto imports b.proto, then b.pb.go's init funcs must run before a.pb.go's. Change-Id: I0e86ff22e5c4cab9df7a73fe4805390fadd34b0d Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/166419 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-08 17:18:11 -08:00
if File_pb2_test_proto != nil {
return
}
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
if !protoimpl.UnsafeEnabled {
file_pb2_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Scalars); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Enums); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Repeats); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Nested); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Nests); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Requireds); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PartialRequired); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*NestedWithRequired); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*IndirectRequired); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Extensions); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.unknownFields
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 3:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.extensionFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ExtensionsContainer); i {
case 0:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.state
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*MessageSet); i {
case 0:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.state
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
case 2:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.unknownFields
case 3:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.extensionFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*MessageSetExtension); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*FakeMessageSet); i {
case 0:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.state
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
case 2:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.unknownFields
case 3:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.extensionFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*FakeMessageSetExtension); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*KnownTypes); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Nests_OptGroup); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Nests_RptGroup); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
file_pb2_test_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Nests_OptGroup_OptNestedGroup); i {
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
case 0:
return &v.state
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 1:
internal/impl: add MessageState to every generated message We define MessageState, which is essentially an atomically set *MessageInfo. By nesting this as the first field in every generated message, we can implement the reflective methods on a *MessageState when obtained by unsafe casting a concrete message pointer as a *MessageState. The MessageInfo held by MessageState provides additional Go type information to interpret the memory that comes after the contents of the MessageState. Since we are nesting a MessageState in every message, the memory use of every message instance grows by 8B. On average, the body of ProtoReflect grows from 133B to 202B (+50%). However, this is offset by XXX_Methods, which is 108B and will be removed in a future CL. Taking into account the eventual removal of XXX_Methods, this is a net reduction of 25%. name old time/op new time/op delta Name/Value-4 70.3ns ± 2% 17.5ns ± 6% -75.08% (p=0.000 n=10+10) Name/Nil-4 70.6ns ± 3% 33.4ns ± 2% -52.66% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Name/Value-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Name/Nil-4 16.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Name/Value-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Name/Nil-4 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I92bd58dc681c57c92612fd5ba7fc066aea34e95a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185460 Reviewed-by: Damien Neil <dneil@google.com>
2019-06-20 03:09:57 -07:00
return &v.sizeCache
cmd/protoc-gen-go: group generation of internal fields together These were originally kept separate to assist Google-internal patches, but it turns out that Google-internal patches do not use the genMessageInternalFields function. Change-Id: Idfa962b943d3bede9982b5b0875ba90c86c6d181 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/188979 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-05 13:09:30 -07:00
case 2:
cmd/protoc-gen-go: unexport implementation-specific XXX fields We modify protoc-gen-go to stop generating exported XXX fields. The unsafe implementation is unaffected by this change since unsafe can access fields regardless of visibility. However, for the purego implementation, we need to respect Go visibility rules as enforced by the reflect package. We work around this by generating a exporter function that given a reference to the message and the field to export, returns a reference to the unexported field value. This exporter function is protected by a constant such that it is not linked into the final binary in non-purego build environment. Updates golang/protobuf#276 Change-Id: Idf5c1f158973fa1c61187ff41440acb21c5dac94 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185141 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-06 13:05:11 -07:00
return &v.unknownFields
default:
return nil
}
}
}
cmd/protoc-gen-go: remove generation of XXX_OneofWrappers Associate the oneof wrapper types with a message by conveying that information to the associated MessageInfo. Change-Id: Iabfca593850e1d6a89498a37eacbf22dbb73bd20 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185239 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-08 10:38:11 -07:00
file_pb2_test_proto_msgTypes[8].OneofWrappers = []interface{}{
(*IndirectRequired_OneofNested)(nil),
}
reflect/protoregistry: provide more informative errors for conflicts The v2 implementation strictly enforces that there are no conflicts at all in the protobuf namespace unlike the prior v1 implementation. This change is almost certainly going to cause loud failures for users that were unknowingly tolerating registration conflicts. We modify internal/filedesc to be able to record the Go package path that the file descriptor is declared within. This information is used by reflect/protoregistry to print both the previous Go package that registered some declaration, and current Go package that is attempting to register some declaration. Change-Id: Ib5eb21c1c98495afc51aa08bd4404bd9d64b5b57 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186177 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-14 23:04:40 -07:00
type x struct{}
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>
2019-06-06 13:01:53 -07:00
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
reflect/protoregistry: provide more informative errors for conflicts The v2 implementation strictly enforces that there are no conflicts at all in the protobuf namespace unlike the prior v1 implementation. This change is almost certainly going to cause loud failures for users that were unknowingly tolerating registration conflicts. We modify internal/filedesc to be able to record the Go package path that the file descriptor is declared within. This information is used by reflect/protoregistry to print both the previous Go package that registered some declaration, and current Go package that is attempting to register some declaration. Change-Id: Ib5eb21c1c98495afc51aa08bd4404bd9d64b5b57 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/186177 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-14 23:04:40 -07:00
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
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>
2019-06-06 13:01:53 -07:00
RawDescriptor: file_pb2_test_proto_rawDesc,
NumEnums: 2,
NumMessages: 20,
NumExtensions: 21,
NumServices: 0,
},
GoTypes: file_pb2_test_proto_goTypes,
DependencyIndexes: file_pb2_test_proto_depIdxs,
cmd/protoc-gen-go, internal/filetype: clean up EnumType construction Drop the dependency from generated files on prototype.Enum: Generated code should only depend on runtime/proto{iface,impl}. Drop the Enums, Messages, and Extensions returns form filetype.Builder.Build. Of these, only Enums was used by generated code. Change the generated init function to pass the builder a slice of values to fill in (as is done for messages and extensions). Remove the filetype dependency on prototype in preparation for eventually dropping the prototype package entirely. Change-Id: I28a3420f5dfcc13fed531a64ef07b9afddfd9d55 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189200 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-06 15:26:36 -07:00
EnumInfos: file_pb2_test_proto_enumTypes,
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>
2019-06-06 13:01:53 -07:00
MessageInfos: file_pb2_test_proto_msgTypes,
all: unify protoV1.ExtensionDesc and proto.ExtensionType Change protoV1.ExtensionDesc to directly implement ExtensionType rather than delegating to one. Unify the previous types protoiface.ExtensionDescV1 and filetype.Extension in impl.ExtensionInfo. The protoV1.ExtensionDesc type becomes an alias to ExtensionInfo. This gives us: - Just one implementation of ExtensionType. - Generated foopb.E_Ext vars are canonical ExtensionTypes. - Generated foopb.E_Ext vars are also v1.ExtensionDescs for backwards compatibility. - Conversion between legacy and modern representations happens transparently when lazily initializing an ExtensionInfo. Overall, a simplification for users of generated code, since they can mostly ignore the ExtensionDesc/ExtentionType distinction and use the same value in either the old or new API. This is change 3/5 in a series of commits changing protoV1.ExtensionDesc to directly implement protoreflect.ExtensionType. 1. [v2] Add protoimpl.ExtensionInfo as an alias for protoiface.ExtensionDescV1. 2. [v1] Update references to protoimpl.ExtensionInfo to use protoiface.ExtensionInfo. 3. [v2] Create protoimpl.ExtensionInfo (an alias to a new type in the impl package) and remove protoiface.ExtensionDescV1. 4. [v1] Remove unneeded explicit conversions between ExtensionDesc and ExtensionType (since the former now directly implements the latter). 5. [v2] Remove stub conversion functions. Change-Id: I96ee890541ec11b2412e1a72c9d7b96e4d7f66b4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189563 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-08 15:45:59 -07:00
ExtensionInfos: file_pb2_test_proto_extTypes,
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>
2019-06-06 13:01:53 -07:00
}.Build()
File_pb2_test_proto = out.File
cmd/protoc-gen-go: drop xxx_ prefix for package-level variables Lower-casing the FileDescriptor variable provides for shorter and more readable global variable names. This has a very minor benefit that the read-only data section of a binary is slightly smaller since function names do end up in the final binary. Change-Id: I077364905e5c9adea69873b3ea580fddc68b9eb8 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/172119 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-15 13:57:56 -07:00
file_pb2_test_proto_rawDesc = nil
file_pb2_test_proto_goTypes = nil
file_pb2_test_proto_depIdxs = nil
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
}
Reference in New Issue Copy Permalink