Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(datastore): Handle loading nil values #8544

Merged
merged 7 commits into from
Sep 18, 2023
Merged

fix(datastore): Handle loading nil values #8544

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75fec45
fix(datastore): Handle loading nil values
bhshkh Sep 11, 2023
b7d2eb7
fix(datastore): Backward compatibility with go1.17.13
bhshkh Sep 11, 2023
ccd6053
fix(datastore): Backward compatibility with Go 1.17
bhshkh Sep 11, 2023
b8649e0
fix(datastore): Adding integration test
bhshkh Sep 15, 2023
276c5eb
test(datastore): Backward compatibility with Go 1.17
bhshkh Sep 15, 2023
b7bed13
Merge branch 'main' into fix/issue-8325
bhshkh Sep 18, 2023
7da3cf8
Merge branch 'main' into fix/issue-8325
bhshkh Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions datastore/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,15 @@ func setVal(v reflect.Value, p Property) (s string) {
return fmt.Sprintf("%v is unsettable", v.Type())
}

rpValue := reflect.ValueOf(pValue)
if !rpValue.Type().AssignableTo(v.Type()) {
return fmt.Sprintf("%q is not assignable to %q", rpValue.Type(), v.Type())
if pValue == nil {
v.Set(reflect.Zero(v.Type()))
bhshkh marked this conversation as resolved.
Show resolved Hide resolved
} else {
rpValue := reflect.ValueOf(pValue)
if !rpValue.Type().AssignableTo(v.Type()) {
return fmt.Sprintf("%q is not assignable to %q", rpValue.Type(), v.Type())
}
v.Set(rpValue)
}
v.Set(rpValue)

case reflect.Ptr:
// v must be a pointer to either a Key, an Entity, or one of the supported basic types.
Expand Down
17 changes: 17 additions & 0 deletions datastore/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,23 @@ func TestLoadNull(t *testing.T) {
}
}

func TestLoadNilInterface(t *testing.T) {
bhshkh marked this conversation as resolved.
Show resolved Hide resolved
type WithAny struct {
AnyField interface{}
}

withAny1 := &WithAny{}
err := loadEntityProto(withAny1, &pb.Entity{
Key: keyToProto(testKey0),
Properties: map[string]*pb.Value{
"AnyField": {ValueType: &pb.Value_NullValue{}},
},
})
if err != nil {
t.Fatalf("got: %v, want: nil", err)
}
bhshkh marked this conversation as resolved.
Show resolved Hide resolved
}

type KeyLoaderEnt struct {
A int
K *Key
Expand Down