Commitdb89836

committed

hmm...

1 parent0fa1f6b commitdb89836Copy full SHA for db89836

File tree

-8

lines changed

-8

lines changed

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,12 +160,14 @@ func (c *Cache) Acquire(ctx context.Context, db database.Store, fileID uuid.UUID`
`160`	`160`
`161`	`161`	`// Check if the caller's context was canceled`
`162`	`162`	`iferr:=ctx.Err();err!=nil {`
	`163`	`+e.close()`
`163`	`164`	`returnnil,err`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`// Check that the caller is authorized to access the file`
`167`	`168`	`subject,ok:=dbauthz.ActorFromContext(ctx)`
`168`	`169`	`if!ok {`
	`170`	`+e.close()`
`169`	`171`	`returnnil,dbauthz.ErrNoActor`
`170`	`172`	`}`
`171`	`173`	`iferr:=c.authz.Authorize(ctx,subject,policy.ActionRead,ev.Object);err!=nil {`
`@@ -196,11 +198,6 @@ func (c Cache) prepare(db database.Store, fileID uuid.UUID) cacheEntry {`
`196`	`198`	`hitLabel="false"`
`197`	`199`
`198`	`200`	`varpurgeOnce sync.Once`
`199`		`-purge:=func() {`
`200`		`-purgeOnce.Do(func() {`
`201`		`-c.purge(fileID)`
`202`		`-})`
`203`		`-}`
`204`	`201`	`entry=&cacheEntry{`
`205`	`202`	`refCount:0,`
`206`	`203`	`value:lazy.NewWithError(func() (CacheEntryValue,error) {`
`@@ -226,10 +223,14 @@ func (c Cache) prepare(db database.Store, fileID uuid.UUID) cacheEntry {`
`226`	`223`	`return`
`227`	`224`	`}`
`228`	`225`
`229`		`-purge()`
	`226`	`+entry.purge()`
`230`	`227`	`},`
`231`	`228`
`232`		`-purge:purge,`
	`229`	`+purge:func() {`
	`230`	`+purgeOnce.Do(func() {`
	`231`	`+c.purge(fileID)`
	`232`	`+})`
	`233`	`+},`
`233`	`234`	`}`
`234`	`235`	`c.data[fileID]=entry`
`235`	`236`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ func TestCancelledFetch(t *testing.T) {`
`61`	`61`	`// First call that will fail`
`62`	`62`	`wg.Add(1)`
`63`	`63`	`gofunc() {`
`64`		`-close(rdy)`
`65`	`64`	`_,err:=cache.Acquire(ctx,dbM,fileID)`
	`65`	`+close(rdy)`
`66`	`66`	`assert.ErrorIs(t,err,context.Canceled)`
`67`	`67`	`wg.Done()`
`68`	`68`	`}()`

Comments

(0)