This commit revises the locking strategy for `partialCached`. We have added a benchmark that may be a little artificial, but it should at least show that we're not losing any performance over this: ```bash name old time/op new time/op delta IncludeCached-10 12.2ms ± 2% 11.3ms ± 1% -7.36% (p=0.029 n=4+4) name old alloc/op new alloc/op delta IncludeCached-10 7.17MB ± 0% 5.09MB ± 0% -29.00% (p=0.029 n=4+4) name old allocs/op new allocs/op delta IncludeCached-10 128k ± 1% 70k ± 0% -45.42% (p=0.029 n=4+4) ``` This commit also revises the template metrics hints logic a little, and add a test for it, which output is currently this: ```bash cumulative average maximum cache percent cached total duration duration duration potential cached count count template ---------- -------- -------- --------- ------- ------ ----- -------- 163.334µs 163.334µs 163.334µs 0 0 0 1 index.html 23.749µs 5.937µs 19.916µs 25 50 2 4 partials/dynamic1.html 9.625µs 4.812µs 6.75µs 100 50 1 2 partials/static1.html 7.625µs 7.625µs 7.625µs 100 0 0 1 partials/static2.html ``` Some notes: * The duration now includes the cached invocations (which should be very short) * A cached template gets executed once before it gets cached, so the "percent cached" will never be 100. Fixes #4086 Fixes #9506
201 lines
4.6 KiB
Go
201 lines
4.6 KiB
Go
// Copyright 2022 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package partials_test
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"regexp"
|
|
"sort"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/gohugoio/hugo/htesting/hqt"
|
|
"github.com/gohugoio/hugo/hugolib"
|
|
)
|
|
|
|
func TestInclude(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
files := `
|
|
-- config.toml --
|
|
baseURL = 'http://example.com/'
|
|
-- layouts/index.html --
|
|
partial: {{ partials.Include "foo.html" . }}
|
|
-- layouts/partials/foo.html --
|
|
foo
|
|
`
|
|
|
|
b := hugolib.NewIntegrationTestBuilder(
|
|
hugolib.IntegrationTestConfig{
|
|
T: t,
|
|
TxtarString: files,
|
|
},
|
|
).Build()
|
|
|
|
b.AssertFileContent("public/index.html", `
|
|
partial: foo
|
|
`)
|
|
}
|
|
|
|
func TestIncludeCached(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
files := `
|
|
-- config.toml --
|
|
baseURL = 'http://example.com/'
|
|
-- layouts/index.html --
|
|
partialCached: {{ partials.IncludeCached "foo.html" . }}
|
|
partialCached: {{ partials.IncludeCached "foo.html" . }}
|
|
-- layouts/partials/foo.html --
|
|
foo
|
|
`
|
|
|
|
b := hugolib.NewIntegrationTestBuilder(
|
|
hugolib.IntegrationTestConfig{
|
|
T: t,
|
|
TxtarString: files,
|
|
},
|
|
).Build()
|
|
|
|
b.AssertFileContent("public/index.html", `
|
|
partialCached: foo
|
|
partialCached: foo
|
|
`)
|
|
}
|
|
|
|
func TestIncludeCacheHints(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
files := `
|
|
-- config.toml --
|
|
baseURL = 'http://example.com/'
|
|
templateMetrics=true
|
|
templateMetricsHints=true
|
|
disableKinds = ["page", "section", "taxonomy", "term", "sitemap"]
|
|
[outputs]
|
|
home = ["HTML"]
|
|
-- layouts/index.html --
|
|
{{ partials.IncludeCached "static1.html" . }}
|
|
{{ partials.IncludeCached "static1.html" . }}
|
|
{{ partials.Include "static2.html" . }}
|
|
|
|
D1I: {{ partials.Include "dynamic1.html" . }}
|
|
D1C: {{ partials.IncludeCached "dynamic1.html" . }}
|
|
D1C: {{ partials.IncludeCached "dynamic1.html" . }}
|
|
D1C: {{ partials.IncludeCached "dynamic1.html" . }}
|
|
H1I: {{ partials.Include "halfdynamic1.html" . }}
|
|
H1C: {{ partials.IncludeCached "halfdynamic1.html" . }}
|
|
H1C: {{ partials.IncludeCached "halfdynamic1.html" . }}
|
|
|
|
-- layouts/partials/static1.html --
|
|
P1
|
|
-- layouts/partials/static2.html --
|
|
P2
|
|
-- layouts/partials/dynamic1.html --
|
|
{{ math.Counter }}
|
|
-- layouts/partials/halfdynamic1.html --
|
|
D1
|
|
{{ math.Counter }}
|
|
|
|
|
|
`
|
|
|
|
b := hugolib.NewIntegrationTestBuilder(
|
|
hugolib.IntegrationTestConfig{
|
|
T: t,
|
|
TxtarString: files,
|
|
},
|
|
).Build()
|
|
|
|
// fmt.Println(b.FileContent("public/index.html"))
|
|
|
|
var buf bytes.Buffer
|
|
b.H.Metrics.WriteMetrics(&buf)
|
|
|
|
got := buf.String()
|
|
|
|
// Get rid of all the durations, they are never the same.
|
|
durationRe := regexp.MustCompile(`\b[\.\d]*(ms|µs|s)\b`)
|
|
|
|
normalize := func(s string) string {
|
|
s = durationRe.ReplaceAllString(s, "")
|
|
linesIn := strings.Split(s, "\n")[3:]
|
|
var lines []string
|
|
for _, l := range linesIn {
|
|
l = strings.TrimSpace(l)
|
|
if l == "" {
|
|
continue
|
|
}
|
|
lines = append(lines, l)
|
|
}
|
|
|
|
sort.Strings(lines)
|
|
|
|
return strings.Join(lines, "\n")
|
|
}
|
|
|
|
got = normalize(got)
|
|
|
|
expect := `
|
|
0 0 0 1 index.html
|
|
100 0 0 1 partials/static2.html
|
|
100 50 1 2 partials/static1.html
|
|
25 50 2 4 partials/dynamic1.html
|
|
66 33 1 3 partials/halfdynamic1.html
|
|
`
|
|
|
|
b.Assert(got, hqt.IsSameString, expect)
|
|
}
|
|
|
|
// gobench --package ./tpl/partials
|
|
func BenchmarkIncludeCached(b *testing.B) {
|
|
files := `
|
|
-- config.toml --
|
|
baseURL = 'http://example.com/'
|
|
-- layouts/index.html --
|
|
-- layouts/_default/single.html --
|
|
{{ partialCached "heavy.html" "foo" }}
|
|
-- layouts/partials/heavy.html --
|
|
{{ $result := slice }}
|
|
{{ range site.RegularPages }}
|
|
{{ $result = $result | append (dict "title" .Title "link" .RelPermalink "readingTime" .ReadingTime) }}
|
|
{{ end }}
|
|
{{ range $result }}
|
|
* {{ .title }} {{ .link }} {{ .readingTime }}
|
|
{{ end }}
|
|
|
|
|
|
`
|
|
|
|
for i := 1; i < 100; i++ {
|
|
files += fmt.Sprintf("\n-- content/p%d.md --\n---\ntitle: page\n---\n"+strings.Repeat("FOO ", i), i)
|
|
}
|
|
|
|
cfg := hugolib.IntegrationTestConfig{
|
|
T: b,
|
|
TxtarString: files,
|
|
}
|
|
builders := make([]*hugolib.IntegrationTestBuilder, b.N)
|
|
|
|
for i, _ := range builders {
|
|
builders[i] = hugolib.NewIntegrationTestBuilder(cfg)
|
|
}
|
|
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
builders[i].Build()
|
|
}
|
|
}
|