Files
hugo/hugolib/doctree/nodeshiftree_test.go
T
Bjørn Erik Pedersen 555dfa207a Speedup and simplify page assembly for deeper content trees
This commit moves to a forked version go-radix (fork source has not had any updates in 3 years.), whith 2 notable changes:

* It's generic (using Go generics) and thus removes a lot of type conversions/assertions.
* It allows nodes to be replaced during walk, which allows to partition the tree for parallel processing without worrying about locking.

For this repo, this means:

* The assembly step now processes nested sections in parallel, which gives a speedup for deep content trees with a slight allocation penalty (see benchmarks below).
* Nodes that needs to be reinserted are inserted directly.
* Also, there are some drive-by fixes of some allocation issues, e.g. avoid wrapping mutexes in returned anonomous functions, a common source of hidden allocations.

```
                                                                                   │ master.bench │           perf-p3.bench            │
                                                                                   │    sec/op    │   sec/op     vs base               │
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=1/pagesPerSection=50-10     6.958m ± 3%   7.015m ± 3%        ~ (p=0.589 n=6)
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=6/pagesPerSection=100-10    14.25m ± 1%   14.56m ± 8%        ~ (p=0.394 n=6)
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=6/pagesPerSection=500-10    48.07m ± 3%   49.23m ± 3%        ~ (p=0.394 n=6)
AssembleDeepSiteWithManySections/depth=2/sectionsPerLevel=6/pagesPerSection=100-10    66.66m ± 4%   66.47m ± 6%        ~ (p=0.485 n=6)
AssembleDeepSiteWithManySections/depth=4/sectionsPerLevel=2/pagesPerSection=100-10    59.57m ± 4%   50.73m ± 5%  -14.85% (p=0.002 n=6)
geomean                                                                               28.54m        27.92m        -2.18%

                                                                                   │ master.bench │           perf-p3.bench            │
                                                                                   │     B/op     │     B/op      vs base              │
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=1/pagesPerSection=50-10    4.513Mi ± 0%   4.527Mi ± 0%  +0.33% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=6/pagesPerSection=100-10   15.35Mi ± 0%   15.49Mi ± 0%  +0.94% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=6/pagesPerSection=500-10   62.50Mi ± 0%   63.19Mi ± 0%  +1.10% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=2/sectionsPerLevel=6/pagesPerSection=100-10   86.78Mi ± 0%   87.73Mi ± 0%  +1.09% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=4/sectionsPerLevel=2/pagesPerSection=100-10   62.96Mi ± 0%   63.66Mi ± 0%  +1.12% (p=0.002 n=6)
geomean                                                                              29.84Mi        30.11Mi       +0.92%

                                                                                   │ master.bench │           perf-p3.bench           │
                                                                                   │  allocs/op   │  allocs/op   vs base              │
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=1/pagesPerSection=50-10     60.44k ± 0%   60.97k ± 0%  +0.87% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=6/pagesPerSection=100-10    205.8k ± 0%   211.4k ± 0%  +2.70% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=1/sectionsPerLevel=6/pagesPerSection=500-10    831.1k ± 0%   858.3k ± 0%  +3.27% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=2/sectionsPerLevel=6/pagesPerSection=100-10    1.157M ± 0%   1.197M ± 0%  +3.41% (p=0.002 n=6)
AssembleDeepSiteWithManySections/depth=4/sectionsPerLevel=2/pagesPerSection=100-10    839.9k ± 0%   867.8k ± 0%  +3.31% (p=0.002 n=6)
geomean                                                                               398.5k        409.3k       +2.71%
```
2025-11-25 11:37:05 +01:00

395 lines
9.3 KiB
Go

// Copyright 2024 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 doctree_test
import (
"context"
"fmt"
"math/rand"
"path"
"strings"
"testing"
qt "github.com/frankban/quicktest"
radix "github.com/gohugoio/go-radix"
"github.com/gohugoio/hugo/common/para"
"github.com/gohugoio/hugo/hugolib/doctree"
"github.com/gohugoio/hugo/hugolib/sitesmatrix"
"github.com/google/go-cmp/cmp"
)
var eq = qt.CmpEquals(
cmp.Comparer(func(n1, n2 *testValue) bool {
if n1 == n2 {
return true
}
return n1.ID == n2.ID && n1.Lang == n2.Lang
}),
)
func TestTree(t *testing.T) {
c := qt.New(t)
zeroZero := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{},
},
)
a := &testValue{ID: "/a"}
zeroZero.Insert("/a", a)
ab := &testValue{ID: "/a/b"}
zeroZero.Insert("/a/b", ab)
c.Assert(zeroZero.Get("/a"), eq, &testValue{ID: "/a", Lang: 0})
s, v := zeroZero.LongestPrefix("/a/b/c", false, nil)
c.Assert(v, eq, ab)
c.Assert(s, eq, "/a/b")
// Change language.
oneZero := zeroZero.Shape(sitesmatrix.Vector{1, 0, 0})
c.Assert(zeroZero.Get("/a"), eq, &testValue{ID: "/a", Lang: 0})
c.Assert(oneZero.Get("/a"), eq, &testValue{ID: "/a", Lang: 1})
}
func TestTreeData(t *testing.T) {
c := qt.New(t)
tree := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{},
},
)
tree.Insert("", &testValue{ID: "HOME"})
tree.Insert("/a", &testValue{ID: "/a"})
tree.Insert("/a/b", &testValue{ID: "/a/b"})
tree.Insert("/b", &testValue{ID: "/b"})
tree.Insert("/b/c", &testValue{ID: "/b/c"})
tree.Insert("/b/c/d", &testValue{ID: "/b/c/d"})
var values []string
ctx := &doctree.WalkContext[*testValue]{}
w := &doctree.NodeShiftTreeWalker[*testValue]{
Tree: tree,
WalkContext: ctx,
Handle: func(s string, t *testValue) (radix.WalkFlag, error) {
ctx.Data().Insert(s, map[string]any{
"id": t.ID,
})
if s != "" {
p, v := ctx.Data().LongestPrefix(path.Dir(s))
values = append(values, fmt.Sprintf("%s:%s:%v", s, p, v))
}
return radix.WalkContinue, nil
},
}
w.Walk(context.Background())
c.Assert(strings.Join(values, "|"), qt.Equals, "/a::map[id:HOME]|/a/b:/a:map[id:/a]|/b::map[id:HOME]|/b/c:/b:map[id:/b]|/b/c/d:/b/c:map[id:/b/c]")
}
func TestTreeEvents(t *testing.T) {
c := qt.New(t)
tree := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{echo: true},
},
)
tree.Insert("/a", &testValue{ID: "/a", Weight: 2, IsBranch: true})
tree.Insert("/a/p1", &testValue{ID: "/a/p1", Weight: 5})
tree.Insert("/a/p", &testValue{ID: "/a/p2", Weight: 6})
tree.Insert("/a/s1", &testValue{ID: "/a/s1", Weight: 5, IsBranch: true})
tree.Insert("/a/s1/p1", &testValue{ID: "/a/s1/p1", Weight: 8})
tree.Insert("/a/s1/p1", &testValue{ID: "/a/s1/p2", Weight: 9})
tree.Insert("/a/s1/s2", &testValue{ID: "/a/s1/s2", Weight: 6, IsBranch: true})
tree.Insert("/a/s1/s2/p1", &testValue{ID: "/a/s1/s2/p1", Weight: 8})
tree.Insert("/a/s1/s2/p2", &testValue{ID: "/a/s1/s2/p2", Weight: 7})
w := &doctree.NodeShiftTreeWalker[*testValue]{
Tree: tree,
WalkContext: &doctree.WalkContext[*testValue]{},
}
w.Handle = func(s string, t *testValue) (radix.WalkFlag, error) {
if t.IsBranch {
w.WalkContext.AddEventListener("weight", s, func(e *doctree.Event[*testValue]) {
if e.Source.Weight > t.Weight {
t.Weight = e.Source.Weight
w.WalkContext.SendEvent(&doctree.Event[*testValue]{Source: t, Path: s, Name: "weight"})
}
// Reduces the amount of events bubbling up the tree. If the weight for this branch has
// increased, that will be announced in its own event.
e.StopPropagation()
})
} else {
w.WalkContext.SendEvent(&doctree.Event[*testValue]{Source: t, Path: s, Name: "weight"})
}
return radix.WalkContinue, nil
}
c.Assert(w.Walk(context.Background()), qt.IsNil)
c.Assert(w.WalkContext.HandleEventsAndHooks(), qt.IsNil)
c.Assert(tree.Get("/a").Weight, eq, 9)
c.Assert(tree.Get("/a/s1").Weight, eq, 9)
c.Assert(tree.Get("/a/p").Weight, eq, 6)
c.Assert(tree.Get("/a/s1/s2").Weight, eq, 8)
c.Assert(tree.Get("/a/s1/s2/p2").Weight, eq, 7)
}
func TestTreeInsert(t *testing.T) {
c := qt.New(t)
tree := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{},
},
)
a := &testValue{ID: "/a"}
tree.Insert("/a", a)
ab := &testValue{ID: "/a/b"}
tree.Insert("/a/b", ab)
c.Assert(tree.Get("/a"), eq, &testValue{ID: "/a", Lang: 0})
c.Assert(tree.Get("/notfound"), qt.IsNil)
ab2 := &testValue{ID: "/a/b", Lang: 0}
v, _, ok := tree.Insert("/a/b", ab2)
c.Assert(ok, qt.IsTrue)
c.Assert(v, qt.DeepEquals, ab2)
tree1 := tree.Shape(sitesmatrix.Vector{1, 0, 0})
c.Assert(tree1.Get("/a/b"), qt.DeepEquals, &testValue{ID: "/a/b", Lang: 1})
}
func TestTreePara(t *testing.T) {
c := qt.New(t)
p := para.New(4)
r, _ := p.Start(context.Background())
tree := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{},
},
)
for i := range 8 {
r.Run(func() error {
a := &testValue{ID: "/a"}
tree.Lock(true)
defer tree.Unlock(true)
tree.Insert("/a", a)
ab := &testValue{ID: "/a/b"}
tree.Insert("/a/b", ab)
key := fmt.Sprintf("/a/b/c/%d", i)
val := &testValue{ID: key}
tree.Insert(key, val)
c.Assert(tree.Get(key), eq, val)
// s, _ := tree.LongestPrefix(key, nil)
// c.Assert(s, eq, "/a/b")
return nil
})
}
c.Assert(r.Wait(), qt.IsNil)
}
func TestValidateKey(t *testing.T) {
c := qt.New(t)
c.Assert(doctree.ValidateKey(""), qt.IsNil)
c.Assert(doctree.ValidateKey("/a/b/c"), qt.IsNil)
c.Assert(doctree.ValidateKey("/"), qt.IsNotNil)
c.Assert(doctree.ValidateKey("a"), qt.IsNotNil)
c.Assert(doctree.ValidateKey("abc"), qt.IsNotNil)
c.Assert(doctree.ValidateKey("/abc/"), qt.IsNotNil)
}
type testShifter struct {
echo bool
}
func (s *testShifter) ForEeachInDimension(n *testValue, v sitesmatrix.Vector, d int, f func(n *testValue) bool) {
if d != sitesmatrix.Language {
panic("not implemented")
}
f(n)
}
func (s *testShifter) ForEeachInAllDimensions(n *testValue, f func(*testValue) bool) {
if n == nil {
return
}
if !f(n) {
return
}
for _, v := range s.All(n) {
if v != n && !f(v) {
return
}
}
}
func (s *testShifter) Insert(old, new *testValue) (*testValue, *testValue, bool) {
return new, old, true
}
func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, bool, bool) {
return nil, true, true
}
func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) bool {
return f(v)
}
func (s *testShifter) Shift(n *testValue, dimension sitesmatrix.Vector, fallback bool) (v *testValue, ok bool) {
ok = true
v = n
if s.echo {
return
}
if n.NoCopy {
if n.Lang == dimension[0] {
return
}
v = nil
ok = false
return
}
c := *n
c.Lang = dimension[0]
v = &c
return
}
func (s *testShifter) All(n *testValue) []*testValue {
return []*testValue{n}
}
type testValue struct {
ID string
Lang int
Weight int
IsBranch bool
NoCopy bool
}
func BenchmarkTreeInsert(b *testing.B) {
runBench := func(b *testing.B, numElements int) {
for b.Loop() {
tree := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{},
},
)
for i := range numElements {
lang := rand.Intn(2)
tree.Insert(fmt.Sprintf("/%d", i), &testValue{ID: fmt.Sprintf("/%d", i), Lang: lang, Weight: i, NoCopy: true})
}
}
}
b.Run("1000", func(b *testing.B) {
runBench(b, 1000)
})
b.Run("10000", func(b *testing.B) {
runBench(b, 10000)
})
b.Run("100000", func(b *testing.B) {
runBench(b, 100000)
})
b.Run("300000", func(b *testing.B) {
runBench(b, 300000)
})
}
func BenchmarkWalk(b *testing.B) {
const numElements = 1000
createTree := func() *doctree.NodeShiftTree[*testValue] {
tree := doctree.New(
doctree.Config[*testValue]{
Shifter: &testShifter{},
},
)
for i := range numElements {
lang := rand.Intn(2)
tree.Insert(fmt.Sprintf("/%d", i), &testValue{ID: fmt.Sprintf("/%d", i), Lang: lang, Weight: i, NoCopy: true})
}
return tree
}
handle := func(s string, t *testValue) (radix.WalkFlag, error) {
return radix.WalkContinue, nil
}
for _, numElements := range []int{1000, 10000, 100000} {
b.Run(fmt.Sprintf("Walk one dimension %d", numElements), func(b *testing.B) {
tree := createTree()
b.ResetTimer()
for b.Loop() {
w := &doctree.NodeShiftTreeWalker[*testValue]{
Tree: tree,
Handle: handle,
}
if err := w.Walk(context.Background()); err != nil {
b.Fatal(err)
}
}
})
b.Run(fmt.Sprintf("Walk all dimensions %d", numElements), func(b *testing.B) {
base := createTree()
b.ResetTimer()
for b.Loop() {
for d1 := range 1 {
for d2 := range 2 {
tree := base.Shape(sitesmatrix.Vector{d1, d2, 0})
w := &doctree.NodeShiftTreeWalker[*testValue]{
Tree: tree,
Handle: handle,
}
if err := w.Walk(context.Background()); err != nil {
b.Fatal(err)
}
}
}
}
})
}
}