2018-09-12 16:20:37 -07:00
|
|
|
// Copyright 2018 The Go Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package impl
|
|
|
|
|
|
|
|
import (
|
2018-09-13 14:24:37 -07:00
|
|
|
"fmt"
|
2018-09-12 16:20:37 -07:00
|
|
|
"reflect"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
2018-09-13 14:24:37 -07:00
|
|
|
"sync"
|
2018-09-12 16:20:37 -07:00
|
|
|
|
2018-11-26 22:32:06 -08:00
|
|
|
pvalue "github.com/golang/protobuf/v2/internal/value"
|
2018-09-21 17:44:00 -07:00
|
|
|
pref "github.com/golang/protobuf/v2/reflect/protoreflect"
|
2018-09-12 16:20:37 -07:00
|
|
|
)
|
|
|
|
|
2018-09-13 14:24:37 -07:00
|
|
|
// MessageType provides protobuf related functionality for a given Go type
|
|
|
|
// that represents a message. A given instance of MessageType is tied to
|
|
|
|
// exactly one Go type, which must be a pointer to a struct type.
|
|
|
|
type MessageType struct {
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
// Type is the underlying message type and must be populated.
|
2018-09-13 14:24:37 -07:00
|
|
|
// Once set, this field must never be mutated.
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
Type pref.MessageType
|
2018-09-13 14:24:37 -07:00
|
|
|
|
|
|
|
once sync.Once // protects all unexported fields
|
|
|
|
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
goType reflect.Type // pointer to struct
|
2018-09-13 14:24:37 -07:00
|
|
|
|
2018-09-12 16:20:37 -07:00
|
|
|
// TODO: Split fields into dense and sparse maps similar to the current
|
|
|
|
// table-driven implementation in v1?
|
|
|
|
fields map[pref.FieldNumber]*fieldInfo
|
2018-10-23 18:31:18 -07:00
|
|
|
|
|
|
|
unknownFields func(*messageDataType) pref.UnknownFields
|
|
|
|
extensionFields func(*messageDataType) pref.KnownFields
|
2018-09-12 16:20:37 -07:00
|
|
|
}
|
|
|
|
|
2018-09-13 14:24:37 -07:00
|
|
|
// init lazily initializes the MessageType upon first use and
|
|
|
|
// also checks that the provided pointer p is of the correct Go type.
|
|
|
|
//
|
|
|
|
// It must be called at the start of every exported method.
|
|
|
|
func (mi *MessageType) init(p interface{}) {
|
|
|
|
mi.once.Do(func() {
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
t := reflect.TypeOf(p)
|
2018-09-13 14:24:37 -07:00
|
|
|
if t.Kind() != reflect.Ptr && t.Elem().Kind() != reflect.Struct {
|
|
|
|
panic(fmt.Sprintf("got %v, want *struct kind", t))
|
|
|
|
}
|
|
|
|
mi.goType = t
|
|
|
|
|
2018-10-31 18:23:42 -07:00
|
|
|
mi.makeKnownFieldsFunc(t.Elem())
|
|
|
|
mi.makeUnknownFieldsFunc(t.Elem())
|
|
|
|
mi.makeExtensionFieldsFunc(t.Elem())
|
2018-09-13 14:24:37 -07:00
|
|
|
})
|
|
|
|
|
|
|
|
// TODO: Remove this check? This API is primarily used by generated code,
|
|
|
|
// and should not violate this assumption. Leave this check in for now to
|
|
|
|
// provide some sanity checks during development. This can be removed if
|
|
|
|
// it proves to be detrimental to performance.
|
|
|
|
if reflect.TypeOf(p) != mi.goType {
|
|
|
|
panic(fmt.Sprintf("type mismatch: got %T, want %v", p, mi.goType))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
// makeKnownFieldsFunc generates functions for operations that can be performed
|
|
|
|
// on each protobuf message field. It takes in a reflect.Type representing the
|
|
|
|
// Go struct and matches message fields with struct fields.
|
2018-09-12 16:20:37 -07:00
|
|
|
//
|
|
|
|
// This code assumes that the struct is well-formed and panics if there are
|
|
|
|
// any discrepancies.
|
2018-10-31 18:23:42 -07:00
|
|
|
func (mi *MessageType) makeKnownFieldsFunc(t reflect.Type) {
|
2018-09-12 16:20:37 -07:00
|
|
|
// Generate a mapping of field numbers and names to Go struct field or type.
|
|
|
|
fields := map[pref.FieldNumber]reflect.StructField{}
|
|
|
|
oneofs := map[pref.Name]reflect.StructField{}
|
|
|
|
oneofFields := map[pref.FieldNumber]reflect.Type{}
|
|
|
|
special := map[string]reflect.StructField{}
|
|
|
|
fieldLoop:
|
|
|
|
for i := 0; i < t.NumField(); i++ {
|
|
|
|
f := t.Field(i)
|
|
|
|
for _, s := range strings.Split(f.Tag.Get("protobuf"), ",") {
|
|
|
|
if len(s) > 0 && strings.Trim(s, "0123456789") == "" {
|
|
|
|
n, _ := strconv.ParseUint(s, 10, 64)
|
|
|
|
fields[pref.FieldNumber(n)] = f
|
|
|
|
continue fieldLoop
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if s := f.Tag.Get("protobuf_oneof"); len(s) > 0 {
|
|
|
|
oneofs[pref.Name(s)] = f
|
|
|
|
continue fieldLoop
|
|
|
|
}
|
|
|
|
switch f.Name {
|
|
|
|
case "XXX_weak", "XXX_unrecognized", "XXX_sizecache", "XXX_extensions", "XXX_InternalExtensions":
|
|
|
|
special[f.Name] = f
|
|
|
|
continue fieldLoop
|
|
|
|
}
|
|
|
|
}
|
2018-11-26 12:57:27 -08:00
|
|
|
var oneofWrappers []interface{}
|
2018-10-17 11:46:52 -07:00
|
|
|
if fn, ok := reflect.PtrTo(t).MethodByName("XXX_OneofFuncs"); ok {
|
2018-11-26 12:57:27 -08:00
|
|
|
oneofWrappers = fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))})[3].Interface().([]interface{})
|
|
|
|
}
|
|
|
|
if fn, ok := reflect.PtrTo(t).MethodByName("XXX_OneofWrappers"); ok {
|
|
|
|
oneofWrappers = fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))})[0].Interface().([]interface{})
|
|
|
|
}
|
|
|
|
for _, v := range oneofWrappers {
|
|
|
|
tf := reflect.TypeOf(v).Elem()
|
|
|
|
f := tf.Field(0)
|
|
|
|
for _, s := range strings.Split(f.Tag.Get("protobuf"), ",") {
|
|
|
|
if len(s) > 0 && strings.Trim(s, "0123456789") == "" {
|
|
|
|
n, _ := strconv.ParseUint(s, 10, 64)
|
|
|
|
oneofFields[pref.FieldNumber(n)] = tf
|
|
|
|
break
|
2018-09-12 16:20:37 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mi.fields = map[pref.FieldNumber]*fieldInfo{}
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
for i := 0; i < mi.Type.Fields().Len(); i++ {
|
|
|
|
fd := mi.Type.Fields().Get(i)
|
2018-09-12 16:20:37 -07:00
|
|
|
fs := fields[fd.Number()]
|
|
|
|
var fi fieldInfo
|
|
|
|
switch {
|
|
|
|
case fd.IsWeak():
|
|
|
|
fi = fieldInfoForWeak(fd, special["XXX_weak"])
|
|
|
|
case fd.OneofType() != nil:
|
|
|
|
fi = fieldInfoForOneof(fd, oneofs[fd.OneofType().Name()], oneofFields[fd.Number()])
|
|
|
|
case fd.IsMap():
|
|
|
|
fi = fieldInfoForMap(fd, fs)
|
|
|
|
case fd.Cardinality() == pref.Repeated:
|
all: rename Vector as List
The terminology Vector does not occur in protobuf documentation at all,
so we should rename the Go use of the term to something more recognizable.
As such, all instances that match the regexp "[Vv]ect(or)?" were replaced.
The C++ documentation uses the term "Repeated", which is a reasonable name.
However, the term became overloaded in 2014, when maps were added as a feature
and implementated under the hood as repeated fields. This is confusing as it
means "repeated" could either refer to repeated fields proper (i.e., explicitly
marked with the "repeated" label in the proto file) or map fields. In the case
of the C++ reflective API, this is not a problem since repeated fields proper
and map fields are interacted with through the same RepeatedField type.
In Go, we do not use a single type to handle both types of repeated fields:
1) We are coming up with the Go protobuf reflection API for the first time
and so do not need to piggy-back on the repeated fields API to remain backwards
compatible since no former usages of Go protobuf reflection exists.
2) Map fields are commonly represented in Go as the Go map type, which do not
preserve ordering information. As such it is fundamentally impossible to present
an unordered map as a consistently ordered list. Thus, Go needs two different
interfaces for lists and maps.
Given the above situation, "Repeated" is not a great term to use since it
refers to two different things (when we only want one of the meanings).
To distinguish between the two, we'll use the terms "List" and "Map" instead.
There is some precedence for the term "List" in the protobuf codebase
(e.g., "getRepeatedInt32List").
Change-Id: Iddcdb6b78e1e60c14fa4ca213c15f45e214b967b
Reviewed-on: https://go-review.googlesource.com/c/149657
Reviewed-by: Damien Neil <dneil@google.com>
2018-11-14 14:05:19 -08:00
|
|
|
fi = fieldInfoForList(fd, fs)
|
2018-09-13 14:24:37 -07:00
|
|
|
case fd.Kind() == pref.MessageKind || fd.Kind() == pref.GroupKind:
|
2018-09-12 16:20:37 -07:00
|
|
|
fi = fieldInfoForMessage(fd, fs)
|
2018-09-13 14:24:37 -07:00
|
|
|
default:
|
|
|
|
fi = fieldInfoForScalar(fd, fs)
|
2018-09-12 16:20:37 -07:00
|
|
|
}
|
|
|
|
mi.fields[fd.Number()] = &fi
|
|
|
|
}
|
|
|
|
}
|
2018-09-13 14:24:37 -07:00
|
|
|
|
2018-10-31 18:23:42 -07:00
|
|
|
func (mi *MessageType) makeUnknownFieldsFunc(t reflect.Type) {
|
|
|
|
if f := makeLegacyUnknownFieldsFunc(t); f != nil {
|
2018-10-25 14:06:56 -07:00
|
|
|
mi.unknownFields = f
|
|
|
|
return
|
|
|
|
}
|
2018-10-23 18:31:18 -07:00
|
|
|
mi.unknownFields = func(*messageDataType) pref.UnknownFields {
|
|
|
|
return emptyUnknownFields{}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-31 18:23:42 -07:00
|
|
|
func (mi *MessageType) makeExtensionFieldsFunc(t reflect.Type) {
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
if f := makeLegacyExtensionFieldsFunc(t); f != nil {
|
|
|
|
mi.extensionFields = f
|
|
|
|
return
|
|
|
|
}
|
2018-10-23 18:31:18 -07:00
|
|
|
mi.extensionFields = func(*messageDataType) pref.KnownFields {
|
|
|
|
return emptyExtensionFields{}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-26 22:32:06 -08:00
|
|
|
func (mi *MessageType) MessageOf(p interface{}) pref.Message {
|
|
|
|
return (*messageWrapper)(mi.dataTypeOf(p))
|
|
|
|
}
|
|
|
|
|
2018-09-13 14:24:37 -07:00
|
|
|
func (mi *MessageType) KnownFieldsOf(p interface{}) pref.KnownFields {
|
|
|
|
return (*knownFields)(mi.dataTypeOf(p))
|
|
|
|
}
|
|
|
|
|
|
|
|
func (mi *MessageType) UnknownFieldsOf(p interface{}) pref.UnknownFields {
|
2018-10-23 18:31:18 -07:00
|
|
|
return mi.unknownFields(mi.dataTypeOf(p))
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
func (mi *MessageType) dataTypeOf(p interface{}) *messageDataType {
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
mi.init(p)
|
2018-12-01 04:57:09 -08:00
|
|
|
return &messageDataType{pointerOfIface(p), mi}
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// messageDataType is a tuple of a pointer to the message data and
|
|
|
|
// a pointer to the message type.
|
|
|
|
//
|
|
|
|
// TODO: Unfortunately, we need to close over a pointer and MessageType,
|
|
|
|
// which incurs an an allocation. This pair is similar to a Go interface,
|
|
|
|
// which is essentially a tuple of the same thing. We can make this efficient
|
|
|
|
// with reflect.NamedOf (see https://golang.org/issues/16522).
|
|
|
|
//
|
|
|
|
// With that hypothetical API, we could dynamically create a new named type
|
|
|
|
// that has the same underlying type as MessageType.goType, and
|
|
|
|
// dynamically create methods that close over MessageType.
|
|
|
|
// Since the new type would have the same underlying type, we could directly
|
|
|
|
// convert between pointers of those types, giving us an efficient way to swap
|
|
|
|
// out the method set.
|
|
|
|
//
|
|
|
|
// Barring the ability to dynamically create named types, the workaround is
|
|
|
|
// 1. either to accept the cost of an allocation for this wrapper struct or
|
|
|
|
// 2. generate more types and methods, at the expense of binary size increase.
|
|
|
|
type messageDataType struct {
|
|
|
|
p pointer
|
|
|
|
mi *MessageType
|
|
|
|
}
|
|
|
|
|
2018-11-26 22:32:06 -08:00
|
|
|
type messageWrapper messageDataType
|
|
|
|
|
|
|
|
func (m *messageWrapper) Type() pref.MessageType {
|
|
|
|
return m.mi.Type
|
|
|
|
}
|
|
|
|
func (m *messageWrapper) KnownFields() pref.KnownFields {
|
|
|
|
return (*knownFields)(m)
|
|
|
|
}
|
|
|
|
func (m *messageWrapper) UnknownFields() pref.UnknownFields {
|
|
|
|
return m.mi.unknownFields((*messageDataType)(m))
|
|
|
|
}
|
|
|
|
func (m *messageWrapper) Interface() pref.ProtoMessage {
|
|
|
|
if m, ok := m.ProtoUnwrap().(pref.ProtoMessage); ok {
|
|
|
|
return m
|
|
|
|
}
|
|
|
|
return m
|
|
|
|
}
|
|
|
|
func (m *messageWrapper) ProtoReflect() pref.Message {
|
|
|
|
return m
|
|
|
|
}
|
|
|
|
func (m *messageWrapper) ProtoUnwrap() interface{} {
|
2018-12-01 04:57:09 -08:00
|
|
|
return m.p.AsIfaceOf(m.mi.goType.Elem())
|
2018-11-26 22:32:06 -08:00
|
|
|
}
|
|
|
|
func (m *messageWrapper) ProtoMutable() {}
|
|
|
|
|
|
|
|
var _ pvalue.Unwrapper = (*messageWrapper)(nil)
|
|
|
|
|
2018-09-13 14:24:37 -07:00
|
|
|
type knownFields messageDataType
|
|
|
|
|
|
|
|
func (fs *knownFields) Len() (cnt int) {
|
|
|
|
for _, fi := range fs.mi.fields {
|
|
|
|
if fi.has(fs.p) {
|
|
|
|
cnt++
|
|
|
|
}
|
|
|
|
}
|
2018-10-23 18:31:18 -07:00
|
|
|
return cnt + fs.extensionFields().Len()
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) Has(n pref.FieldNumber) bool {
|
|
|
|
if fi := fs.mi.fields[n]; fi != nil {
|
|
|
|
return fi.has(fs.p)
|
|
|
|
}
|
2018-10-23 18:31:18 -07:00
|
|
|
return fs.extensionFields().Has(n)
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) Get(n pref.FieldNumber) pref.Value {
|
|
|
|
if fi := fs.mi.fields[n]; fi != nil {
|
|
|
|
return fi.get(fs.p)
|
|
|
|
}
|
2018-10-23 18:31:18 -07:00
|
|
|
return fs.extensionFields().Get(n)
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) Set(n pref.FieldNumber, v pref.Value) {
|
|
|
|
if fi := fs.mi.fields[n]; fi != nil {
|
|
|
|
fi.set(fs.p, v)
|
|
|
|
return
|
|
|
|
}
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
if fs.mi.Type.ExtensionRanges().Has(n) {
|
|
|
|
fs.extensionFields().Set(n, v)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
panic(fmt.Sprintf("invalid field: %d", n))
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) Clear(n pref.FieldNumber) {
|
|
|
|
if fi := fs.mi.fields[n]; fi != nil {
|
|
|
|
fi.clear(fs.p)
|
|
|
|
return
|
|
|
|
}
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
if fs.mi.Type.ExtensionRanges().Has(n) {
|
|
|
|
fs.extensionFields().Clear(n)
|
|
|
|
return
|
|
|
|
}
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) Mutable(n pref.FieldNumber) pref.Mutable {
|
|
|
|
if fi := fs.mi.fields[n]; fi != nil {
|
|
|
|
return fi.mutable(fs.p)
|
|
|
|
}
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
if fs.mi.Type.ExtensionRanges().Has(n) {
|
|
|
|
return fs.extensionFields().Mutable(n)
|
|
|
|
}
|
|
|
|
panic(fmt.Sprintf("invalid field: %d", n))
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) Range(f func(pref.FieldNumber, pref.Value) bool) {
|
|
|
|
for n, fi := range fs.mi.fields {
|
|
|
|
if fi.has(fs.p) {
|
|
|
|
if !f(n, fi.get(fs.p)) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-10-23 18:31:18 -07:00
|
|
|
fs.extensionFields().Range(f)
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
func (fs *knownFields) ExtensionTypes() pref.ExtensionFieldTypes {
|
2018-10-23 18:31:18 -07:00
|
|
|
return fs.extensionFields().ExtensionTypes()
|
|
|
|
}
|
|
|
|
func (fs *knownFields) extensionFields() pref.KnownFields {
|
|
|
|
return fs.mi.extensionFields((*messageDataType)(fs))
|
2018-09-13 14:24:37 -07:00
|
|
|
}
|
|
|
|
|
2018-10-23 18:31:18 -07:00
|
|
|
type emptyUnknownFields struct{}
|
|
|
|
|
|
|
|
func (emptyUnknownFields) Len() int { return 0 }
|
|
|
|
func (emptyUnknownFields) Get(pref.FieldNumber) pref.RawFields { return nil }
|
2018-11-07 16:39:49 -08:00
|
|
|
func (emptyUnknownFields) Set(pref.FieldNumber, pref.RawFields) { return } // noop
|
|
|
|
func (emptyUnknownFields) Range(func(pref.FieldNumber, pref.RawFields) bool) { return }
|
2018-10-23 18:31:18 -07:00
|
|
|
func (emptyUnknownFields) IsSupported() bool { return false }
|
|
|
|
|
|
|
|
type emptyExtensionFields struct{}
|
2018-09-13 14:24:37 -07:00
|
|
|
|
internal/impl: support legacy extension fields
Implement support for extension fields for messages that use the v1
data structures for extensions. The legacyExtensionFields type wraps a
v1 map to implement the v2 protoreflect.KnownFields interface.
Working on this change revealed a bug in the dynamic construction of
message types for protobuf messages that had cyclic dependencies (e.g.,
message Foo has a sub-field of message Bar, and Bar has a sub-field of Foo).
In such a situation, a deadlock occurs because initialization code depends on
the very initialization code that is currently running. To break these cycles,
we make some systematic changes listed in the following paragraphs.
Generally speaking, we separate the logic for construction and wrapping,
where constuction does not recursively rely on dependencies,
while wrapping may recursively inspect dependencies.
Promote the MessageType.MessageOf method as a standalone MessageOf function
that dynamically finds the proper *MessageType to use. We make it such that
MessageType only supports two forms of messages types:
* Those that fully implement the v2 API.
* Those that do not implement the v2 API at all.
This removes support for the hybrid form that was exploited by message_test.go
In impl/message_test.go, switch each message to look more like how future
generated messages will look like. This is done in reaction to the fact that
MessageType.MessageOf no longer exists.
In value/{map,vector}.go, fix Unwrap to return a pointer since the underlying
reflect.Value is addressable reference value, not a pointer value.
In value/convert.go, split the logic apart so that obtaining a v2 type and
wrapping a type as v2 are distinct operations. Wrapping requires further
initialization than simply creating the initial message type, and calling it
during initial construction would lead to a deadlock.
In protoreflect/go_type.go, we switch back to a lazy initialization of GoType
to avoid a deadlock since the user-provided fn may rely on the fact that
prototype.GoMessage returned.
Change-Id: I5dea00e36fe1a9899bd2ac0aed2c8e51d5d87420
Reviewed-on: https://go-review.googlesource.com/c/148826
Reviewed-by: Herbie Ong <herbie@google.com>
2018-11-06 13:05:20 -08:00
|
|
|
func (emptyExtensionFields) Len() int { return 0 }
|
|
|
|
func (emptyExtensionFields) Has(pref.FieldNumber) bool { return false }
|
|
|
|
func (emptyExtensionFields) Get(pref.FieldNumber) pref.Value { return pref.Value{} }
|
|
|
|
func (emptyExtensionFields) Set(pref.FieldNumber, pref.Value) { panic("extensions not supported") }
|
|
|
|
func (emptyExtensionFields) Clear(pref.FieldNumber) { return } // noop
|
|
|
|
func (emptyExtensionFields) Mutable(pref.FieldNumber) pref.Mutable { panic("extensions not supported") }
|
|
|
|
func (emptyExtensionFields) Range(func(pref.FieldNumber, pref.Value) bool) { return }
|
|
|
|
func (emptyExtensionFields) ExtensionTypes() pref.ExtensionFieldTypes { return emptyExtensionTypes{} }
|
2018-09-13 14:24:37 -07:00
|
|
|
|
2018-10-23 18:31:18 -07:00
|
|
|
type emptyExtensionTypes struct{}
|
2018-09-13 14:24:37 -07:00
|
|
|
|
2018-10-23 18:31:18 -07:00
|
|
|
func (emptyExtensionTypes) Len() int { return 0 }
|
|
|
|
func (emptyExtensionTypes) Register(pref.ExtensionType) { panic("extensions not supported") }
|
2018-11-07 16:39:49 -08:00
|
|
|
func (emptyExtensionTypes) Remove(pref.ExtensionType) { return } // noop
|
2018-10-23 18:31:18 -07:00
|
|
|
func (emptyExtensionTypes) ByNumber(pref.FieldNumber) pref.ExtensionType { return nil }
|
|
|
|
func (emptyExtensionTypes) ByName(pref.FullName) pref.ExtensionType { return nil }
|
2018-11-07 16:39:49 -08:00
|
|
|
func (emptyExtensionTypes) Range(func(pref.ExtensionType) bool) { return }
|