arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

database: fix cache collision (feature & feature versions)

Browse Source
This commit is contained in:
Quentin Machu 2016-01-19 19:37:20 -05:00 committed by Jimmy Zelinskie
parent 99de759224
commit 248fc7df72
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
database/pgsql/feature.go
View File

@ -28,7 +28,8 @@ func (pgSQL *pgSQL) insertFeature(feature database.Feature) (int, error) {
} }
if pgSQL.cache != nil { if pgSQL.cache != nil {
if id, found := pgSQL.cache.Get("feature:" + feature.Name); found { id, found := pgSQL.cache.Get("feature:" + feature.Namespace.Name + ":" + feature.Name)
if found {
return id.(int), nil return id.(int), nil
} }
} }
@ -47,7 +48,7 @@ func (pgSQL *pgSQL) insertFeature(feature database.Feature) (int, error) {
} }
if pgSQL.cache != nil { if pgSQL.cache != nil {
pgSQL.cache.Add("feature:"+feature.Name, id) pgSQL.cache.Add("feature:"+feature.Namespace.Name+":"+feature.Name, id)
} }
return id, nil return id, nil
@ -59,8 +60,9 @@ func (pgSQL *pgSQL) insertFeatureVersion(featureVersion database.FeatureVersion)
} }
if pgSQL.cache != nil { if pgSQL.cache != nil {
if id, found := pgSQL.cache.Get("featureversion:" + featureVersion.Feature.Name + ":" + id, found := pgSQL.cache.Get("featureversion:" + featureVersion.Feature.Namespace.Name + ":" +
featureVersion.Version.String()); found { featureVersion.Feature.Name + ":" + featureVersion.Version.String())
if found {
return id.(int), nil return id.(int), nil
} }
} }
@ -118,7 +120,7 @@ func (pgSQL *pgSQL) insertFeatureVersion(featureVersion database.FeatureVersion)
if pgSQL.cache != nil { if pgSQL.cache != nil {
pgSQL.cache.Add("featureversion:"+featureVersion.Feature.Name+":"+ pgSQL.cache.Add("featureversion:"+featureVersion.Feature.Name+":"+
featureVersion.Version.String(), featureVersion.ID) featureVersion.Feature.Namespace.Name+":"+featureVersion.Version.String(), featureVersion.ID)
} }
return featureVersion.ID, nil return featureVersion.ID, nil