tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix schema initialization paths

Browse Source 
The initialized channel was only closed if the schema's cacheStore did not contain the embeddedCacheKey and there were no errors parsing relations.  If the key existed or an error occurred, it would not be closed. This could leave other goroutines waiting for synchronization that will never occur.

Additionally, the other code paths that wait for initialization to complete did not return the possible error.
This commit is contained in:
Andy Bursavich 2020-12-03 06:42:19 -08:00
parent f2321ca164
commit 30461cc297
No known key found for this signature in database
GPG Key ID: 8304542BB2D65091
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
schema/schema.go
View File

@ -92,7 +92,7 @@ func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error)
if v, ok := cacheStore.Load(modelType); ok {
s := v.(*Schema)
<-s.initialized
return s, nil
return s, s.err
}
modelValue := reflect.New(modelType)
@ -224,6 +224,7 @@ func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error)
}
if s, loaded := cacheStore.LoadOrStore(modelType, schema); !loaded {
defer close(schema.initialized)
if _, embedded := schema.cacheStore.Load(embeddedCacheKey); !embedded {
for _, field := range schema.Fields {
if field.DataType == "" && (field.Creatable || field.Updatable || field.Readable) {
@ -249,11 +250,10 @@ func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error)
field.Schema.DeleteClauses = append(field.Schema.DeleteClauses, fc.DeleteClauses(field)...)
}
}
close(schema.initialized)
}
} else {
<-s.(*Schema).initialized
return s.(*Schema), nil
schema = s.(*Schema)
<-schema.initialized
}
return schema, schema.err