fix: Use model.Type() as cache key instead of model itself by max-stytch · Pull Request #62 · blockloop/scan · GitHub
Skip to content

fix: Use model.Type() as cache key instead of model itself #62

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

Merged
blockloop merged 2 commits into from
Jul 27, 2023
Merged

fix: Use model.Type() as cache key instead of model itself #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d7cb13
fix: Use model.Type() as cache key instead of model itself
max-stytch Jul 27, 2023
766c9a4
fix: update TestValuesReadsFromCacheFirst to match TestColumnsReadsFr…
max-stytch Jul 27, 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
11 changes: 9 additions & 2 deletions columns.go
View file
Open in desktop
33 changes: 31 additions & 2 deletions columns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,15 +231,44 @@ func TestColumnsReadsFromCacheFirst(t *testing.T) {
Name string
}

v := reflect.Indirect(reflect.ValueOf(&person))
key := cacheKey{
Type: reflect.Indirect(reflect.ValueOf(&person)).Type(),
Strict: false,
}
expected := []string{"fake"}
columnsCache.Store(v, expected)
columnsCache.Store(key, expected)

cols, err := Columns(&person)
assert.NoError(t, err)
assert.EqualValues(t, expected, cols)
}

func TestColumnsStoresOneCacheEntryPerInstance(t *testing.T) {
type person struct {
ID int64
Name string
}

before := 0
columnsCache.Range(func(key interface{}, value interface{}) bool {
before += 1
return true
})

for i := 0; i < 10; i++ {
_, err := Columns(&person{})
assert.NoError(t, err)
}

after := 0
columnsCache.Range(func(key interface{}, value interface{}) bool {
after += 1
return true
})

assert.Equal(t, 1, after-before, "Cache size grew unexpectedly")
}

func BenchmarkColumnsLargeStruct(b *testing.B) {
ls := &largeStruct{ID: "test", Index: 88, UUID: "test", IsActive: false, Balance: "test", Picture: "test", Age: 88, EyeColor: "test", Name: "test", Gender: "test", Company: "test", Email: "test", Phone: "test", Address: "test", About: "test", Registered: "test", Latitude: 0.566439688205719, Longitude: 0.48440760374069214, Greeting: "test", FavoriteFruit: "test", AID: "test", AIndex: 19, AUUID: "test", AIsActive: true, ABalance: "test", APicture: "test", AAge: 12, AEyeColor: "test", AName: "test", AGender: "test", ACompany: "test", AEmail: "test", APhone: "test", AAddress: "test", AAbout: "test", ARegistered: "test", ALatitude: 0.16338545083999634, ALongitude: 0.24648870527744293, AGreeting: "test", AFavoriteFruit: "test"}

Expand Down
4 changes: 2 additions & 2 deletions values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func Values(cols []string, v interface{}) ([]interface{}, error) {
}

func loadFields(val reflect.Value) map[string][]int {
if cache, cached := valuesCache.Load(val); cached {
if cache, cached := valuesCache.Load(val.Type()); cached {
return cache.(map[string][]int)
}
return writeFieldsCache(val)
Expand All @@ -41,7 +41,7 @@ func loadFields(val reflect.Value) map[string][]int {
func writeFieldsCache(val reflect.Value) map[string][]int {
m := map[string][]int{}
writeFields(val, m, []int{})
valuesCache.Store(val, m)
valuesCache.Store(val.Type(), m)
return m
}

Expand Down
6 changes: 3 additions & 3 deletions values_test.go
View file
Open in desktop