7072863b0c
Previously by default the presence of a missing field in a udt would result in an error reported. The Unsafe mechanism could be used to ignore these fields. This PR changes the default behavior to ignoring missing fields and only reporting an error if Strict mode is used. This approach is in line with the gocql.
79 lines
1.8 KiB
Go
79 lines
1.8 KiB
Go
// Copyright (C) 2017 ScyllaDB
|
|
// Use of this source code is governed by a ALv2-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package gocqlx
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"github.com/gocql/gocql"
|
|
"github.com/scylladb/go-reflectx"
|
|
)
|
|
|
|
// UDT is a marker interface that needs to be embedded in a struct if you want
|
|
// to marshal or unmarshal it as a User Defined Type.
|
|
type UDT interface {
|
|
udt()
|
|
}
|
|
|
|
var (
|
|
_ gocql.UDTMarshaler = udt{}
|
|
_ gocql.UDTUnmarshaler = udt{}
|
|
)
|
|
|
|
type udt struct {
|
|
field map[string]reflect.Value
|
|
value reflect.Value
|
|
strict bool
|
|
}
|
|
|
|
func makeUDT(value reflect.Value, mapper *reflectx.Mapper, strict bool) udt {
|
|
return udt{
|
|
value: value,
|
|
field: mapper.FieldMap(value),
|
|
strict: strict,
|
|
}
|
|
}
|
|
|
|
func (u udt) MarshalUDT(name string, info gocql.TypeInfo) ([]byte, error) {
|
|
value, ok := u.field[name]
|
|
if ok {
|
|
return gocql.Marshal(info, value.Interface())
|
|
}
|
|
if !u.strict {
|
|
return nil, nil
|
|
}
|
|
return nil, fmt.Errorf("missing name %q in %s", name, u.value.Type())
|
|
}
|
|
|
|
func (u udt) UnmarshalUDT(name string, info gocql.TypeInfo, data []byte) error {
|
|
value, ok := u.field[name]
|
|
if ok {
|
|
return gocql.Unmarshal(info, data, value.Addr().Interface())
|
|
}
|
|
if !u.strict {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("missing name %q in %s", name, u.value.Type())
|
|
}
|
|
|
|
// udtWrapValue adds UDT wrapper if needed.
|
|
func udtWrapValue(value reflect.Value, mapper *reflectx.Mapper, strict bool) interface{} {
|
|
if value.Type().Implements(autoUDTInterface) {
|
|
return makeUDT(value, mapper, strict)
|
|
}
|
|
return value.Interface()
|
|
}
|
|
|
|
// udtWrapSlice adds UDT wrapper if needed.
|
|
func udtWrapSlice(mapper *reflectx.Mapper, strict bool, v []interface{}) []interface{} {
|
|
for i := range v {
|
|
if _, ok := v[i].(UDT); ok {
|
|
v[i] = makeUDT(reflect.ValueOf(v[i]), mapper, strict)
|
|
}
|
|
}
|
|
return v
|
|
}
|