diff options
author | Bjørn Erik Pedersen <[email protected]> | 2022-02-17 16:51:19 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <[email protected]> | 2022-02-17 18:47:36 +0100 |
commit | 929808190fb0649dcfa6def39cd1afe1d380087c (patch) | |
tree | a4405f12f93815351793da666b7ec0dc2d97a7a7 /tpl/collections | |
parent | 667f3a4ba880b14f346161891cd43e2ba9ce9b9d (diff) | |
download | hugo-929808190fb0649dcfa6def39cd1afe1d380087c.tar.gz hugo-929808190fb0649dcfa6def39cd1afe1d380087c.zip |
tpl/partials: Fix recently introduced deadlock in partials cache
The change in lock logic for `partialCached` in 0927cf739fee9646c7fb917965799d9acf080922 was naive as it didn't consider cached partials calling other cached partials.
This changeset may look on the large side for this particular issue, but it pulls in part of a working branch, introducing `context.Context` in the template execution.
Note that the context is only partially implemented in this PR, but the upcoming use cases will, as one example, include having access to the top "dot" (e.g. `Page`) all the way down into partials and shortcodes etc.
The earlier benchmarks rerun against master:
```bash
name old time/op new time/op delta
IncludeCached-10 13.6ms ± 2% 13.8ms ± 1% ~ (p=0.343 n=4+4)
name old alloc/op new alloc/op delta
IncludeCached-10 5.30MB ± 0% 5.35MB ± 0% +0.96% (p=0.029 n=4+4)
name old allocs/op new allocs/op delta
IncludeCached-10 74.7k ± 0% 75.3k ± 0% +0.77% (p=0.029 n=4+4)
```
Fixes #9519
Diffstat (limited to 'tpl/collections')
-rw-r--r-- | tpl/collections/apply_test.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tpl/collections/apply_test.go b/tpl/collections/apply_test.go index 98cb78b51..1afb66808 100644 --- a/tpl/collections/apply_test.go +++ b/tpl/collections/apply_test.go @@ -14,6 +14,7 @@ package collections import ( + "context" "fmt" "io" "reflect" @@ -51,6 +52,10 @@ func (templateFinder) Execute(t tpl.Template, wr io.Writer, data interface{}) er return nil } +func (templateFinder) ExecuteWithContext(ctx context.Context, t tpl.Template, wr io.Writer, data interface{}) error { + return nil +} + func (templateFinder) GetFunc(name string) (reflect.Value, bool) { if name == "dobedobedo" { return reflect.Value{}, false |