BlackForestBytes/goext
20
0
Fork 0
Code Actions

use type instead of value for Reflection in Coll.initFields

Browse Source
This commit is contained in:
Robin Willmann 2023-09-12 10:47:41 +02:00
parent 29a3f73f15
commit 11dc6d2640
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wmo/reflection.go
View File

@ -25,7 +25,7 @@ func (c *Coll[TData]) EnsureInitializedReflection(v TData) {
m := make(map[string]fullTypeRef) m := make(map[string]fullTypeRef)
c.initFields("", rval, m, make([]int, 0)) c.initFields("", rval.Type(), m, make([]int, 0))
c.implDataTypeMap[rval.Type()] = m c.implDataTypeMap[rval.Type()] = m
} }
@ -50,20 +50,17 @@ func (c *Coll[TData]) init() {
c.implDataTypeMap = make(map[reflect.Type]map[string]fullTypeRef) c.implDataTypeMap = make(map[reflect.Type]map[string]fullTypeRef)
v := reflect.ValueOf(example) v := reflect.ValueOf(example)
c.initFields("", v, c.dataTypeMap, make([]int, 0)) c.initFields("", v.Type(), c.dataTypeMap, make([]int, 0))
} }
} }
func (c *Coll[TData]) initFields(prefix string, rval reflect.Value, m map[string]fullTypeRef, idxarr []int) { func (c *Coll[TData]) initFields(prefix string, rtyp reflect.Type, m map[string]fullTypeRef, idxarr []int) {
rtyp := rval.Type()
for i := 0; i < rtyp.NumField(); i++ { for i := 0; i < rtyp.NumField(); i++ {
rsfield := rtyp.Field(i) rsfield := rtyp.Field(i)
rvfield := rval.Field(i)
if !rsfield.IsExported() { if !rsfield.IsExported() {
continue continue
@ -91,21 +88,21 @@ func (c *Coll[TData]) initFields(prefix string, rval reflect.Value, m map[string
newIdxArr := langext.ArrCopy(idxarr) newIdxArr := langext.ArrCopy(idxarr)
newIdxArr = append(newIdxArr, i) newIdxArr = append(newIdxArr, i)
if langext.InArray("inline", bsontags) && rvfield.Kind() == reflect.Struct { if langext.InArray("inline", bsontags) && rsfield.Type.Kind() == reflect.Struct {
// pass-through field // pass-through field
c.initFields(prefix, rvfield, m, newIdxArr) c.initFields(prefix, rsfield.Type, m, newIdxArr)
} else { } else {
if rvfield.Type().Kind() == reflect.Pointer { if rsfield.Type.Kind() == reflect.Pointer {
m[fullKey] = fullTypeRef{ m[fullKey] = fullTypeRef{
IsPointer: true, IsPointer: true,
RealType: rvfield.Type(), RealType: rsfield.Type,
Kind: rvfield.Type().Elem().Kind(), Kind: rsfield.Type.Elem().Kind(),
Type: rvfield.Type().Elem(), Type: rsfield.Type.Elem(),
UnderlyingType: reflectext.Underlying(rvfield.Type().Elem()), UnderlyingType: reflectext.Underlying(rsfield.Type.Elem()),
Name: rsfield.Name, Name: rsfield.Name,
Index: newIdxArr, Index: newIdxArr,
} }
@ -114,20 +111,23 @@ func (c *Coll[TData]) initFields(prefix string, rval reflect.Value, m map[string
m[fullKey] = fullTypeRef{ m[fullKey] = fullTypeRef{
IsPointer: false, IsPointer: false,
RealType: rvfield.Type(), RealType: rsfield.Type,
Kind: rvfield.Type().Kind(), Kind: rsfield.Type.Kind(),
Type: rvfield.Type(), Type: rsfield.Type,
UnderlyingType: reflectext.Underlying(rvfield.Type()), UnderlyingType: reflectext.Underlying(rsfield.Type),
Name: rsfield.Name, Name: rsfield.Name,
Index: newIdxArr, Index: newIdxArr,
} }
} }
if rvfield.Kind() == reflect.Struct { if rsfield.Type.Kind() == reflect.Struct {
c.initFields(fullKey+".", rvfield, m, newIdxArr) c.initFields(fullKey+".", rsfield.Type, m, newIdxArr)
} }
if rsfield.Type.Kind() == reflect.Pointer && rsfield.Type.Elem().Kind() == reflect.Struct {
c.initFields(fullKey+".", rsfield.Type.Elem(), m, newIdxArr)
}
} }
} }

19
wmo/reflection_test.go
View File

@ -23,6 +23,9 @@ func TestReflectionGetFieldType(t *testing.T) {
Sub struct { Sub struct {
A string `bson:"a"` A string `bson:"a"`
} `bson:"sub"` } `bson:"sub"`
SubPtr *struct {
A string `bson:"a"`
} `bson:"subPtr"`
Str string `bson:"str"` Str string `bson:"str"`
Ptr *int `bson:"ptr"` Ptr *int `bson:"ptr"`
MDate rfctime.RFC3339NanoTime `bson:"mdate"` MDate rfctime.RFC3339NanoTime `bson:"mdate"`
@ -43,6 +46,11 @@ func TestReflectionGetFieldType(t *testing.T) {
}{ }{
A: "2", A: "2",
}, },
SubPtr: &struct {
A string `bson:"a"`
}{
A: "4",
},
Str: "3", Str: "3",
Ptr: langext.Ptr(4), Ptr: langext.Ptr(4),
MDate: t1, MDate: t1,
@ -82,6 +90,12 @@ func TestReflectionGetFieldType(t *testing.T) {
tst.AssertEqual(t, gft("sub.a").IsPointer, false) tst.AssertEqual(t, gft("sub.a").IsPointer, false)
tst.AssertEqual(t, gfv("sub.a").(string), "2") tst.AssertEqual(t, gfv("sub.a").(string), "2")
tst.AssertEqual(t, gft("subPtr.a").Kind.String(), "string")
tst.AssertEqual(t, gft("subPtr.a").Type.String(), "string")
tst.AssertEqual(t, gft("subPtr.a").Name, "A")
tst.AssertEqual(t, gft("subPtr.a").IsPointer, false)
tst.AssertEqual(t, gfv("subPtr.a").(string), "4")
tst.AssertEqual(t, gft("str").Kind.String(), "string") tst.AssertEqual(t, gft("str").Kind.String(), "string")
tst.AssertEqual(t, gft("str").Type.String(), "string") tst.AssertEqual(t, gft("str").Type.String(), "string")
tst.AssertEqual(t, gft("str").Name, "Str") tst.AssertEqual(t, gft("str").Name, "Str")
@ -105,6 +119,9 @@ func TestReflectionGetTokenValueAsMongoType(t *testing.T) {
Sub struct { Sub struct {
A string `bson:"a"` A string `bson:"a"`
} `bson:"sub"` } `bson:"sub"`
SubPtr struct {
A string `bson:"a"`
} `bson:"subPtr"`
Str string `bson:"str"` Str string `bson:"str"`
Ptr *int `bson:"ptr"` Ptr *int `bson:"ptr"`
Num int `bson:"num"` Num int `bson:"num"`
@ -130,6 +147,8 @@ func TestReflectionGetTokenValueAsMongoType(t *testing.T) {
} }
tst.AssertEqual(t, gtvasmt("hello", "str").(string), "hello") tst.AssertEqual(t, gtvasmt("hello", "str").(string), "hello")
tst.AssertEqual(t, gtvasmt("hello", "sub.a").(string), "hello")
tst.AssertEqual(t, gtvasmt("hello", "subPtr.a").(string), "hello")
tst.AssertEqual(t, gtvasmt("4", "num").(int), 4) tst.AssertEqual(t, gtvasmt("4", "num").(int), 4)
tst.AssertEqual(t, gtvasmt("asdf", "_id").(IDType), "asdf") tst.AssertEqual(t, gtvasmt("asdf", "_id").(IDType), "asdf")
tst.AssertEqual(t, gtvasmt("", "ptr").(*int), nil) tst.AssertEqual(t, gtvasmt("", "ptr").(*int), nil)