Files
hugo-mirror/hugolib/doctree/simpletree.go
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

217 lines
5.6 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
import (
"iter"
"sync"
radix "github.com/gohugoio/go-radix"
)
// Tree is a non thread safe radix tree that holds T.
type Tree[T any] interface {
TreeCommon[T]
WalkPrefix(s string, f func(s string, v T) (bool, error)) error
WalkPath(s string, f func(s string, v T) (bool, error)) error
All() iter.Seq2[string, T]
}
// TreeThreadSafe is a thread safe radix tree that holds T.
type TreeThreadSafe[T any] interface {
TreeCommon[T]
WalkPrefix(lockType LockType, s string, f func(s string, v T) (bool, error)) error
WalkPath(lockType LockType, s string, f func(s string, v T) (bool, error)) error
All(lockType LockType) iter.Seq2[string, T]
}
type TreeCommon[T any] interface {
Get(s string) T
LongestPrefix(s string) (string, T)
Insert(s string, v T) T
}
func NewSimpleTree[T any]() *SimpleTree[T] {
return &SimpleTree[T]{tree: radix.New[T]()}
}
// SimpleTree is a radix tree that holds T.
// This tree is not thread safe.
type SimpleTree[T any] struct {
tree *radix.Tree[T]
zero T
}
func (tree *SimpleTree[T]) Get(s string) T {
v, _ := tree.tree.Get(s)
return v
}
func (tree *SimpleTree[T]) LongestPrefix(s string) (string, T) {
s, v, _ := tree.tree.LongestPrefix(s)
return s, v
}
func (tree *SimpleTree[T]) Insert(s string, v T) T {
tree.tree.Insert(s, v)
return v
}
func (tree *SimpleTree[T]) Walk(f func(s string, v T) (bool, error)) error {
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
var b bool
b, err := f(s, v)
if b || err != nil {
return radix.WalkStop, tree.zero, err
}
return radix.WalkContinue, tree.zero, nil
}
return tree.tree.Walk(walkFn)
}
func (tree *SimpleTree[T]) WalkPrefix(s string, f func(s string, v T) (bool, error)) error {
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
b, err := f(s, v)
if b || err != nil {
return radix.WalkStop, tree.zero, err
}
return radix.WalkContinue, tree.zero, nil
}
return tree.tree.WalkPrefix(s, walkFn)
}
func (tree *SimpleTree[T]) WalkPath(s string, f func(s string, v T) (bool, error)) error {
var err error
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
var b bool
b, err = f(s, v)
if b || err != nil {
return radix.WalkStop, tree.zero, err
}
return radix.WalkContinue, tree.zero, nil
}
tree.tree.WalkPath(s, walkFn)
return err
}
func (tree *SimpleTree[T]) All() iter.Seq2[string, T] {
return func(yield func(s string, v T) bool) {
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
if !yield(s, v) {
return radix.WalkStop, tree.zero, nil
}
return radix.WalkContinue, tree.zero, nil
}
tree.tree.Walk(walkFn)
}
}
// NewSimpleThreadSafeTree creates a new SimpleTree.
func NewSimpleThreadSafeTree[T any]() *SimpleThreadSafeTree[T] {
return &SimpleThreadSafeTree[T]{tree: radix.New[T](), mu: new(sync.RWMutex)}
}
// SimpleThreadSafeTree is a thread safe radix tree that holds T.
type SimpleThreadSafeTree[T any] struct {
mu *sync.RWMutex
tree *radix.Tree[T]
zero T
}
func (tree *SimpleThreadSafeTree[T]) Get(s string) T {
tree.mu.RLock()
defer tree.mu.RUnlock()
v, _ := tree.tree.Get(s)
return v
}
func (tree *SimpleThreadSafeTree[T]) LongestPrefix(s string) (string, T) {
tree.mu.RLock()
defer tree.mu.RUnlock()
s, v, _ := tree.tree.LongestPrefix(s)
return s, v
}
func (tree *SimpleThreadSafeTree[T]) Insert(s string, v T) T {
tree.mu.Lock()
defer tree.mu.Unlock()
tree.tree.Insert(s, v)
return v
}
func (tree *SimpleThreadSafeTree[T]) Lock(lockType LockType) {
switch lockType {
case LockTypeRead:
tree.mu.RLock()
case LockTypeWrite:
tree.mu.Lock()
}
}
func (tree *SimpleThreadSafeTree[T]) Unlock(lockType LockType) {
switch lockType {
case LockTypeRead:
tree.mu.RUnlock()
case LockTypeWrite:
tree.mu.Unlock()
}
}
func (tree *SimpleThreadSafeTree[T]) WalkPrefix(lockType LockType, s string, f func(s string, v T) (bool, error)) error {
tree.Lock(lockType)
defer tree.Unlock(lockType)
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
var b bool
b, err := f(s, v)
if b || err != nil {
return radix.WalkStop, tree.zero, err
}
return radix.WalkContinue, tree.zero, nil
}
return tree.tree.WalkPrefix(s, walkFn)
}
func (tree *SimpleThreadSafeTree[T]) WalkPath(lockType LockType, s string, f func(s string, v T) (bool, error)) error {
tree.Lock(lockType)
defer tree.Unlock(lockType)
var err error
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
var b bool
b, err = f(s, v)
if b || err != nil {
return radix.WalkStop, tree.zero, err
}
return radix.WalkContinue, tree.zero, nil
}
tree.tree.WalkPath(s, walkFn)
return err
}
func (tree *SimpleThreadSafeTree[T]) All(lockType LockType) iter.Seq2[string, T] {
return func(yield func(s string, v T) bool) {
tree.Lock(lockType)
defer tree.Unlock(lockType)
var walkFn radix.WalkFn[T] = func(s string, v T) (radix.WalkFlag, T, error) {
if !yield(s, v) {
return radix.WalkStop, tree.zero, nil
}
return radix.WalkContinue, tree.zero, nil
}
tree.tree.Walk(walkFn)
}
}