mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-25 01:42:09 +00:00
eada236f87
This commit introduces a new data structure to store pages and their resources. This data structure is backed by radix trees. This simplies tree operations, makes all pages a bundle, and paves the way for #6310. It also solves a set of annoying issues (see list below). Not a motivation behind this, but this commit also makes Hugo in general a little bit faster and more memory effective (see benchmarks). Especially for partial rebuilds on content edits, but also when taxonomies is in use. ``` name old time/op new time/op delta SiteNew/Bundle_with_image/Edit-16 1.32ms ± 8% 1.00ms ± 9% -24.42% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 1.28ms ± 0% 0.94ms ± 0% -26.26% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 33.9ms ± 2% 21.8ms ± 1% -35.67% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 40.6ms ± 1% 37.7ms ± 3% -7.20% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 56.7ms ± 0% 51.7ms ± 1% -8.82% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 19.9ms ± 2% 18.3ms ± 3% -7.64% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 37.9ms ± 4% 34.0ms ± 2% -10.28% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 10.7ms ± 0% 10.6ms ± 0% -1.15% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 10.8ms ± 0% 10.7ms ± 0% -1.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 43.2ms ± 1% 39.6ms ± 1% -8.35% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 47.6ms ± 1% 47.3ms ± 0% ~ (p=0.057 n=4+4) SiteNew/Deep_content_tree-16 73.0ms ± 1% 74.2ms ± 1% ~ (p=0.114 n=4+4) SiteNew/Many_HTML_templates-16 37.9ms ± 0% 38.1ms ± 1% ~ (p=0.114 n=4+4) SiteNew/Page_collections-16 53.6ms ± 1% 54.7ms ± 1% +2.09% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Bundle_with_image/Edit-16 486kB ± 0% 430kB ± 0% -11.47% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 265kB ± 0% 209kB ± 0% -21.06% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 13.6MB ± 0% 8.8MB ± 0% -34.93% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 66.5MB ± 0% 63.9MB ± 0% -3.95% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 28.8MB ± 0% 25.8MB ± 0% -10.55% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 6.16MB ± 0% 5.56MB ± 0% -9.86% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 16.9MB ± 0% 16.0MB ± 0% -5.19% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 2.28MB ± 0% 2.29MB ± 0% +0.35% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 2.07MB ± 0% 2.07MB ± 0% ~ (p=0.114 n=4+4) SiteNew/Tags_and_categories-16 14.3MB ± 0% 13.2MB ± 0% -7.30% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 69.1MB ± 0% 69.0MB ± 0% ~ (p=0.343 n=4+4) SiteNew/Deep_content_tree-16 31.3MB ± 0% 31.8MB ± 0% +1.49% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 10.8MB ± 0% 10.9MB ± 0% +1.11% (p=0.029 n=4+4) SiteNew/Page_collections-16 21.4MB ± 0% 21.6MB ± 0% +1.15% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Bundle_with_image/Edit-16 4.74k ± 0% 3.86k ± 0% -18.57% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file/Edit-16 4.73k ± 0% 3.85k ± 0% -18.58% (p=0.029 n=4+4) SiteNew/Tags_and_categories/Edit-16 301k ± 0% 198k ± 0% -34.14% (p=0.029 n=4+4) SiteNew/Canonify_URLs/Edit-16 389k ± 0% 373k ± 0% -4.07% (p=0.029 n=4+4) SiteNew/Deep_content_tree/Edit-16 338k ± 0% 262k ± 0% -22.63% (p=0.029 n=4+4) SiteNew/Many_HTML_templates/Edit-16 102k ± 0% 88k ± 0% -13.81% (p=0.029 n=4+4) SiteNew/Page_collections/Edit-16 176k ± 0% 152k ± 0% -13.32% (p=0.029 n=4+4) SiteNew/Bundle_with_image-16 26.8k ± 0% 26.8k ± 0% +0.05% (p=0.029 n=4+4) SiteNew/Bundle_with_JSON_file-16 26.8k ± 0% 26.8k ± 0% +0.05% (p=0.029 n=4+4) SiteNew/Tags_and_categories-16 273k ± 0% 245k ± 0% -10.36% (p=0.029 n=4+4) SiteNew/Canonify_URLs-16 396k ± 0% 398k ± 0% +0.39% (p=0.029 n=4+4) SiteNew/Deep_content_tree-16 317k ± 0% 325k ± 0% +2.53% (p=0.029 n=4+4) SiteNew/Many_HTML_templates-16 146k ± 0% 147k ± 0% +0.98% (p=0.029 n=4+4) SiteNew/Page_collections-16 210k ± 0% 215k ± 0% +2.44% (p=0.029 n=4+4) ``` Fixes #6312 Fixes #6087 Fixes #6738 Fixes #6412 Fixes #6743 Fixes #6875 Fixes #6034 Fixes #6902 Fixes #6173 Fixes #6590
441 lines
10 KiB
Go
441 lines
10 KiB
Go
// Copyright 2017 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 compare
|
|
|
|
import (
|
|
"path"
|
|
"reflect"
|
|
"runtime"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/gohugoio/hugo/htesting/hqt"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
"github.com/gohugoio/hugo/common/hugo"
|
|
"github.com/spf13/cast"
|
|
)
|
|
|
|
type T struct {
|
|
NonEmptyInterfaceNil I
|
|
NonEmptyInterfaceTypedNil I
|
|
}
|
|
|
|
type I interface {
|
|
Foo() string
|
|
}
|
|
|
|
func (t *T) Foo() string {
|
|
return "foo"
|
|
}
|
|
|
|
var testT = &T{
|
|
NonEmptyInterfaceTypedNil: (*T)(nil),
|
|
}
|
|
|
|
type tstEqerType1 string
|
|
type tstEqerType2 string
|
|
|
|
func (t tstEqerType2) Eq(other interface{}) bool {
|
|
return cast.ToString(t) == cast.ToString(other)
|
|
}
|
|
|
|
func (t tstEqerType2) String() string {
|
|
return string(t)
|
|
}
|
|
|
|
func (t tstEqerType1) Eq(other interface{}) bool {
|
|
return cast.ToString(t) == cast.ToString(other)
|
|
}
|
|
|
|
func (t tstEqerType1) String() string {
|
|
return string(t)
|
|
}
|
|
|
|
type stringType string
|
|
|
|
type tstCompareType int
|
|
|
|
const (
|
|
tstEq tstCompareType = iota
|
|
tstNe
|
|
tstGt
|
|
tstGe
|
|
tstLt
|
|
tstLe
|
|
)
|
|
|
|
func tstIsEq(tp tstCompareType) bool { return tp == tstEq || tp == tstGe || tp == tstLe }
|
|
func tstIsGt(tp tstCompareType) bool { return tp == tstGt || tp == tstGe }
|
|
func tstIsLt(tp tstCompareType) bool { return tp == tstLt || tp == tstLe }
|
|
|
|
func TestDefaultFunc(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
then := time.Now()
|
|
now := time.Now()
|
|
ns := New(false)
|
|
|
|
for i, test := range []struct {
|
|
dflt interface{}
|
|
given interface{}
|
|
expect interface{}
|
|
}{
|
|
{true, false, false},
|
|
{"5", 0, "5"},
|
|
|
|
{"test1", "set", "set"},
|
|
{"test2", "", "test2"},
|
|
{"test3", nil, "test3"},
|
|
|
|
{[2]int{10, 20}, [2]int{1, 2}, [2]int{1, 2}},
|
|
{[2]int{10, 20}, [0]int{}, [2]int{10, 20}},
|
|
{[2]int{100, 200}, nil, [2]int{100, 200}},
|
|
|
|
{[]string{"one"}, []string{"uno"}, []string{"uno"}},
|
|
{[]string{"two"}, []string{}, []string{"two"}},
|
|
{[]string{"three"}, nil, []string{"three"}},
|
|
|
|
{map[string]int{"one": 1}, map[string]int{"uno": 1}, map[string]int{"uno": 1}},
|
|
{map[string]int{"one": 1}, map[string]int{}, map[string]int{"one": 1}},
|
|
{map[string]int{"two": 2}, nil, map[string]int{"two": 2}},
|
|
|
|
{10, 1, 1},
|
|
{10, 0, 10},
|
|
{20, nil, 20},
|
|
|
|
{float32(10), float32(1), float32(1)},
|
|
{float32(10), 0, float32(10)},
|
|
{float32(20), nil, float32(20)},
|
|
|
|
{complex(2, -2), complex(1, -1), complex(1, -1)},
|
|
{complex(2, -2), complex(0, 0), complex(2, -2)},
|
|
{complex(3, -3), nil, complex(3, -3)},
|
|
|
|
{struct{ f string }{f: "one"}, struct{}{}, struct{}{}},
|
|
{struct{ f string }{f: "two"}, nil, struct{ f string }{f: "two"}},
|
|
|
|
{then, now, now},
|
|
{then, time.Time{}, then},
|
|
} {
|
|
|
|
eq := qt.CmpEquals(hqt.DeepAllowUnexported(test.dflt))
|
|
|
|
errMsg := qt.Commentf("[%d] %v", i, test)
|
|
|
|
result, err := ns.Default(test.dflt, test.given)
|
|
|
|
c.Assert(err, qt.IsNil, errMsg)
|
|
c.Assert(result, eq, test.expect, errMsg)
|
|
}
|
|
}
|
|
|
|
func TestCompare(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
n := New(false)
|
|
|
|
twoEq := func(a, b interface{}) bool {
|
|
return n.Eq(a, b)
|
|
}
|
|
|
|
twoGt := func(a, b interface{}) bool {
|
|
return n.Gt(a, b)
|
|
}
|
|
|
|
twoLt := func(a, b interface{}) bool {
|
|
return n.Lt(a, b)
|
|
}
|
|
|
|
twoGe := func(a, b interface{}) bool {
|
|
return n.Ge(a, b)
|
|
}
|
|
|
|
twoLe := func(a, b interface{}) bool {
|
|
return n.Le(a, b)
|
|
}
|
|
|
|
twoNe := func(a, b interface{}) bool {
|
|
return n.Ne(a, b)
|
|
}
|
|
|
|
for _, test := range []struct {
|
|
tstCompareType
|
|
funcUnderTest func(a, b interface{}) bool
|
|
}{
|
|
{tstGt, twoGt},
|
|
{tstLt, twoLt},
|
|
{tstGe, twoGe},
|
|
{tstLe, twoLe},
|
|
{tstEq, twoEq},
|
|
{tstNe, twoNe},
|
|
} {
|
|
doTestCompare(t, test.tstCompareType, test.funcUnderTest)
|
|
}
|
|
}
|
|
|
|
func doTestCompare(t *testing.T, tp tstCompareType, funcUnderTest func(a, b interface{}) bool) {
|
|
for i, test := range []struct {
|
|
left interface{}
|
|
right interface{}
|
|
expectIndicator int
|
|
}{
|
|
{5, 8, -1},
|
|
{8, 5, 1},
|
|
{5, 5, 0},
|
|
{int(5), int64(5), 0},
|
|
{int32(5), int(5), 0},
|
|
{int16(4), int(5), -1},
|
|
{uint(15), uint64(15), 0},
|
|
{-2, 1, -1},
|
|
{2, -5, 1},
|
|
{0.0, 1.23, -1},
|
|
{1.1, 1.1, 0},
|
|
{float32(1.0), float64(1.0), 0},
|
|
{1.23, 0.0, 1},
|
|
{"5", "5", 0},
|
|
{"8", "5", 1},
|
|
{"5", "0001", 1},
|
|
{[]int{100, 99}, []int{1, 2, 3, 4}, -1},
|
|
{cast.ToTime("2015-11-20"), cast.ToTime("2015-11-20"), 0},
|
|
{cast.ToTime("2015-11-19"), cast.ToTime("2015-11-20"), -1},
|
|
{cast.ToTime("2015-11-20"), cast.ToTime("2015-11-19"), 1},
|
|
{"a", "a", 0},
|
|
{"a", "b", -1},
|
|
{"b", "a", 1},
|
|
{tstEqerType1("a"), tstEqerType1("a"), 0},
|
|
{tstEqerType1("a"), tstEqerType2("a"), 0},
|
|
{tstEqerType2("a"), tstEqerType1("a"), 0},
|
|
{tstEqerType2("a"), tstEqerType1("b"), -1},
|
|
{hugo.MustParseVersion("0.32.1").Version(), hugo.MustParseVersion("0.32").Version(), 1},
|
|
{hugo.MustParseVersion("0.35").Version(), hugo.MustParseVersion("0.32").Version(), 1},
|
|
{hugo.MustParseVersion("0.36").Version(), hugo.MustParseVersion("0.36").Version(), 0},
|
|
{hugo.MustParseVersion("0.32").Version(), hugo.MustParseVersion("0.36").Version(), -1},
|
|
{hugo.MustParseVersion("0.32").Version(), "0.36", -1},
|
|
{"0.36", hugo.MustParseVersion("0.32").Version(), 1},
|
|
{"0.36", hugo.MustParseVersion("0.36").Version(), 0},
|
|
{"0.37", hugo.MustParseVersion("0.37-DEV").Version(), 1},
|
|
{"0.37-DEV", hugo.MustParseVersion("0.37").Version(), -1},
|
|
{"0.36", hugo.MustParseVersion("0.37-DEV").Version(), -1},
|
|
{"0.37-DEV", hugo.MustParseVersion("0.37-DEV").Version(), 0},
|
|
// https://github.com/gohugoio/hugo/issues/5905
|
|
{nil, nil, 0},
|
|
{testT.NonEmptyInterfaceNil, nil, 0},
|
|
{testT.NonEmptyInterfaceTypedNil, nil, 0},
|
|
} {
|
|
|
|
result := funcUnderTest(test.left, test.right)
|
|
success := false
|
|
|
|
if test.expectIndicator == 0 {
|
|
if tstIsEq(tp) {
|
|
success = result
|
|
} else {
|
|
success = !result
|
|
}
|
|
}
|
|
|
|
if test.expectIndicator < 0 {
|
|
success = result && (tstIsLt(tp) || tp == tstNe)
|
|
success = success || (!result && !tstIsLt(tp))
|
|
}
|
|
|
|
if test.expectIndicator > 0 {
|
|
success = result && (tstIsGt(tp) || tp == tstNe)
|
|
success = success || (!result && (!tstIsGt(tp) || tp != tstNe))
|
|
}
|
|
|
|
if !success {
|
|
t.Fatalf("[%d][%s] %v compared to %v: %t", i, path.Base(runtime.FuncForPC(reflect.ValueOf(funcUnderTest).Pointer()).Name()), test.left, test.right, result)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEqualExtend(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
ns := New(false)
|
|
|
|
for _, test := range []struct {
|
|
first interface{}
|
|
others []interface{}
|
|
expect bool
|
|
}{
|
|
{1, []interface{}{1, 2}, true},
|
|
{1, []interface{}{2, 1}, true},
|
|
{1, []interface{}{2, 3}, false},
|
|
{tstEqerType1("a"), []interface{}{tstEqerType1("a"), tstEqerType1("b")}, true},
|
|
{tstEqerType1("a"), []interface{}{tstEqerType1("b"), tstEqerType1("a")}, true},
|
|
{tstEqerType1("a"), []interface{}{tstEqerType1("b"), tstEqerType1("c")}, false},
|
|
} {
|
|
|
|
result := ns.Eq(test.first, test.others...)
|
|
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestNotEqualExtend(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
ns := New(false)
|
|
|
|
for _, test := range []struct {
|
|
first interface{}
|
|
others []interface{}
|
|
expect bool
|
|
}{
|
|
{1, []interface{}{2, 3}, true},
|
|
{1, []interface{}{2, 1}, false},
|
|
{1, []interface{}{1, 2}, false},
|
|
} {
|
|
result := ns.Ne(test.first, test.others...)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestGreaterEqualExtend(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
ns := New(false)
|
|
|
|
for _, test := range []struct {
|
|
first interface{}
|
|
others []interface{}
|
|
expect bool
|
|
}{
|
|
{5, []interface{}{2, 3}, true},
|
|
{5, []interface{}{5, 5}, true},
|
|
{3, []interface{}{4, 2}, false},
|
|
{3, []interface{}{2, 4}, false},
|
|
} {
|
|
result := ns.Ge(test.first, test.others...)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestGreaterThanExtend(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
ns := New(false)
|
|
|
|
for _, test := range []struct {
|
|
first interface{}
|
|
others []interface{}
|
|
expect bool
|
|
}{
|
|
{5, []interface{}{2, 3}, true},
|
|
{5, []interface{}{5, 4}, false},
|
|
{3, []interface{}{4, 2}, false},
|
|
} {
|
|
result := ns.Gt(test.first, test.others...)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestLessEqualExtend(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
ns := New(false)
|
|
|
|
for _, test := range []struct {
|
|
first interface{}
|
|
others []interface{}
|
|
expect bool
|
|
}{
|
|
{1, []interface{}{2, 3}, true},
|
|
{1, []interface{}{1, 2}, true},
|
|
{2, []interface{}{1, 2}, false},
|
|
{3, []interface{}{2, 4}, false},
|
|
} {
|
|
result := ns.Le(test.first, test.others...)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestLessThanExtend(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
ns := New(false)
|
|
|
|
for _, test := range []struct {
|
|
first interface{}
|
|
others []interface{}
|
|
expect bool
|
|
}{
|
|
{1, []interface{}{2, 3}, true},
|
|
{1, []interface{}{1, 2}, false},
|
|
{2, []interface{}{1, 2}, false},
|
|
{3, []interface{}{2, 4}, false},
|
|
} {
|
|
result := ns.Lt(test.first, test.others...)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestCase(t *testing.T) {
|
|
c := qt.New(t)
|
|
n := New(false)
|
|
|
|
c.Assert(n.Eq("az", "az"), qt.Equals, true)
|
|
c.Assert(n.Eq("az", stringType("az")), qt.Equals, true)
|
|
|
|
}
|
|
|
|
func TestStringType(t *testing.T) {
|
|
c := qt.New(t)
|
|
n := New(true)
|
|
|
|
c.Assert(n.Lt("az", "Za"), qt.Equals, true)
|
|
c.Assert(n.Gt("ab", "Ab"), qt.Equals, true)
|
|
}
|
|
|
|
func TestTimeUnix(t *testing.T) {
|
|
t.Parallel()
|
|
var sec int64 = 1234567890
|
|
tv := reflect.ValueOf(time.Unix(sec, 0))
|
|
i := 1
|
|
|
|
res := toTimeUnix(tv)
|
|
if sec != res {
|
|
t.Errorf("[%d] timeUnix got %v but expected %v", i, res, sec)
|
|
}
|
|
|
|
i++
|
|
func(t *testing.T) {
|
|
defer func() {
|
|
if err := recover(); err == nil {
|
|
t.Errorf("[%d] timeUnix didn't return an expected error", i)
|
|
}
|
|
}()
|
|
iv := reflect.ValueOf(sec)
|
|
toTimeUnix(iv)
|
|
}(t)
|
|
}
|
|
|
|
func TestConditional(t *testing.T) {
|
|
c := qt.New(t)
|
|
n := New(false)
|
|
a, b := "a", "b"
|
|
|
|
c.Assert(n.Conditional(true, a, b), qt.Equals, a)
|
|
c.Assert(n.Conditional(false, a, b), qt.Equals, b)
|
|
}
|