mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-02 01:38:46 -05:00
0927cf739f
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
135 lines
3.6 KiB
Go
135 lines
3.6 KiB
Go
// Copyright 2019 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 hqt
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"reflect"
|
|
"strings"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
"github.com/gohugoio/hugo/htesting"
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/spf13/cast"
|
|
)
|
|
|
|
// IsSameString asserts that two strings are equal. The two strings
|
|
// are normalized (whitespace removed) before doing a ==.
|
|
// Also note that two strings can be the same even if they're of different
|
|
// types.
|
|
var IsSameString qt.Checker = &stringChecker{
|
|
argNames: []string{"got", "want"},
|
|
}
|
|
|
|
// IsSameType asserts that got is the same type as want.
|
|
var IsSameType qt.Checker = &typeChecker{
|
|
argNames: []string{"got", "want"},
|
|
}
|
|
|
|
type argNames []string
|
|
|
|
func (a argNames) ArgNames() []string {
|
|
return a
|
|
}
|
|
|
|
type typeChecker struct {
|
|
argNames
|
|
}
|
|
|
|
// Check implements Checker.Check by checking that got and args[0] is of the same type.
|
|
func (c *typeChecker) Check(got interface{}, args []interface{}, note func(key string, value interface{})) (err error) {
|
|
if want := args[0]; reflect.TypeOf(got) != reflect.TypeOf(want) {
|
|
if _, ok := got.(error); ok && want == nil {
|
|
return errors.New("got non-nil error")
|
|
}
|
|
return errors.New("values are not of same type")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type stringChecker struct {
|
|
argNames
|
|
}
|
|
|
|
// Check implements Checker.Check by checking that got and args[0] represents the same normalized text (whitespace etc. removed).
|
|
func (c *stringChecker) Check(got interface{}, args []interface{}, note func(key string, value interface{})) (err error) {
|
|
s1, s2 := cast.ToString(got), cast.ToString(args[0])
|
|
|
|
if s1 == s2 {
|
|
return nil
|
|
}
|
|
|
|
s1, s2 = normalizeString(s1), normalizeString(s2)
|
|
|
|
if s1 == s2 {
|
|
return nil
|
|
}
|
|
|
|
return fmt.Errorf("values are not the same text: %s", strings.Join(htesting.DiffStrings(s1, s2), " | "))
|
|
}
|
|
|
|
func normalizeString(s string) string {
|
|
s = strings.ReplaceAll(s, "\r\n", "\n")
|
|
|
|
lines := strings.Split(strings.TrimSpace(s), "\n")
|
|
for i, line := range lines {
|
|
lines[i] = strings.Join(strings.Fields(strings.TrimSpace(line)), "")
|
|
}
|
|
return strings.Join(lines, "\n")
|
|
}
|
|
|
|
// DeepAllowUnexported creates an option to allow compare of unexported types
|
|
// in the given list of types.
|
|
// see https://github.com/google/go-cmp/issues/40#issuecomment-328615283
|
|
func DeepAllowUnexported(vs ...interface{}) cmp.Option {
|
|
m := make(map[reflect.Type]struct{})
|
|
for _, v := range vs {
|
|
structTypes(reflect.ValueOf(v), m)
|
|
}
|
|
var typs []interface{}
|
|
for t := range m {
|
|
typs = append(typs, reflect.New(t).Elem().Interface())
|
|
}
|
|
return cmp.AllowUnexported(typs...)
|
|
}
|
|
|
|
func structTypes(v reflect.Value, m map[reflect.Type]struct{}) {
|
|
if !v.IsValid() {
|
|
return
|
|
}
|
|
switch v.Kind() {
|
|
case reflect.Ptr:
|
|
if !v.IsNil() {
|
|
structTypes(v.Elem(), m)
|
|
}
|
|
case reflect.Interface:
|
|
if !v.IsNil() {
|
|
structTypes(v.Elem(), m)
|
|
}
|
|
case reflect.Slice, reflect.Array:
|
|
for i := 0; i < v.Len(); i++ {
|
|
structTypes(v.Index(i), m)
|
|
}
|
|
case reflect.Map:
|
|
for _, k := range v.MapKeys() {
|
|
structTypes(v.MapIndex(k), m)
|
|
}
|
|
case reflect.Struct:
|
|
m[v.Type()] = struct{}{}
|
|
for i := 0; i < v.NumField(); i++ {
|
|
structTypes(v.Field(i), m)
|
|
}
|
|
}
|
|
}
|