mirror of
https://github.com/gohugoio/hugo.git
synced 2026-08-24 15:28:54 +00:00
555dfa207a
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%
```
213 lines
4.4 KiB
Go
213 lines
4.4 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 hugolib
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/gohugoio/go-radix"
|
|
"github.com/gohugoio/hugo/common/paths"
|
|
"github.com/gohugoio/hugo/common/types"
|
|
"github.com/gohugoio/hugo/hugolib/doctree"
|
|
"github.com/gohugoio/hugo/resources/kinds"
|
|
"github.com/gohugoio/hugo/resources/page"
|
|
)
|
|
|
|
// pageTree holds the treen navigational method for a Page.
|
|
type pageTree struct {
|
|
p *pageState
|
|
}
|
|
|
|
func (pt pageTree) IsAncestor(other any) bool {
|
|
n, ok := other.(contentNode)
|
|
if !ok {
|
|
return false
|
|
}
|
|
|
|
if n.Path() == pt.p.Path() {
|
|
return false
|
|
}
|
|
|
|
return strings.HasPrefix(n.Path(), paths.AddTrailingSlash(pt.p.Path()))
|
|
}
|
|
|
|
func (pt pageTree) IsDescendant(other any) bool {
|
|
n, ok := other.(contentNode)
|
|
if !ok {
|
|
return false
|
|
}
|
|
|
|
if n.Path() == pt.p.Path() {
|
|
return false
|
|
}
|
|
|
|
return strings.HasPrefix(pt.p.Path(), paths.AddTrailingSlash(n.Path()))
|
|
}
|
|
|
|
func (pt pageTree) CurrentSection() page.Page {
|
|
if kinds.IsBranch(pt.p.Kind()) {
|
|
return pt.p
|
|
}
|
|
|
|
dir := pt.p.m.pathInfo.Dir()
|
|
|
|
if dir == "/" {
|
|
if pt.p.s.home == nil {
|
|
panic(fmt.Sprintf("[%v] home page is nil for %q", pt.p.s.siteVector, pt.p.Path()))
|
|
}
|
|
return pt.p.s.home
|
|
}
|
|
|
|
_, n := pt.p.s.pageMap.treePages.LongestPrefix(dir, false, func(n contentNode) bool {
|
|
return cnh.isBranchNode(n)
|
|
})
|
|
|
|
if n != nil {
|
|
return n.(page.Page)
|
|
}
|
|
|
|
panic(fmt.Sprintf("CurrentSection not found for %q for %s", pt.p.Path(), pt.p.s.resolveDimensionNames()))
|
|
}
|
|
|
|
func (pt pageTree) FirstSection() page.Page {
|
|
s := pt.p.m.pathInfo.Dir()
|
|
if s == "/" {
|
|
return pt.p.s.home
|
|
}
|
|
|
|
for {
|
|
k, n := pt.p.s.pageMap.treePages.LongestPrefix(s, false, func(n contentNode) bool { return cnh.isBranchNode(n) })
|
|
if n == nil {
|
|
return nil
|
|
}
|
|
|
|
// /blog
|
|
if strings.Count(k, "/") < 2 {
|
|
return n.(page.Page)
|
|
}
|
|
|
|
if s == "" {
|
|
return nil
|
|
}
|
|
|
|
s = paths.Dir(s)
|
|
|
|
}
|
|
}
|
|
|
|
func (pt pageTree) InSection(other any) bool {
|
|
if pt.p == nil || types.IsNil(other) {
|
|
return false
|
|
}
|
|
|
|
p, ok := other.(page.Page)
|
|
if !ok {
|
|
return false
|
|
}
|
|
|
|
return pt.CurrentSection() == p.CurrentSection()
|
|
}
|
|
|
|
func (pt pageTree) Parent() page.Page {
|
|
if pt.p.IsHome() {
|
|
return nil
|
|
}
|
|
|
|
dir := pt.p.m.pathInfo.ContainerDir()
|
|
|
|
if dir == "" {
|
|
return pt.p.s.home
|
|
}
|
|
|
|
for {
|
|
_, n := pt.p.s.pageMap.treePages.LongestPrefix(dir, false, nil)
|
|
if n == nil {
|
|
return pt.p.s.home
|
|
}
|
|
if pt.p.m.bundled || cnh.isBranchNode(n) {
|
|
return n.(page.Page)
|
|
}
|
|
dir = paths.Dir(dir)
|
|
}
|
|
}
|
|
|
|
func (pt pageTree) Ancestors() page.Pages {
|
|
var ancestors page.Pages
|
|
parent := pt.Parent()
|
|
for parent != nil {
|
|
ancestors = append(ancestors, parent)
|
|
parent = parent.Parent()
|
|
|
|
}
|
|
return ancestors
|
|
}
|
|
|
|
func (pt pageTree) Sections() page.Pages {
|
|
var (
|
|
pages page.Pages
|
|
currentBranchPrefix string
|
|
s = pt.p.Path()
|
|
prefix = paths.AddTrailingSlash(s)
|
|
tree = pt.p.s.pageMap.treePages
|
|
)
|
|
|
|
w := &doctree.NodeShiftTreeWalker[contentNode]{
|
|
Tree: tree,
|
|
Prefix: prefix,
|
|
}
|
|
w.Handle = func(ss string, n contentNode) (radix.WalkFlag, error) {
|
|
if !cnh.isBranchNode(n) {
|
|
return radix.WalkContinue, nil
|
|
}
|
|
if currentBranchPrefix == "" || !strings.HasPrefix(ss, currentBranchPrefix) {
|
|
if p, ok := n.(*pageState); ok && p.IsSection() && p.m.shouldList(false) && p.Parent() == pt.p {
|
|
pages = append(pages, p)
|
|
} else {
|
|
w.SkipPrefix(ss + "/")
|
|
}
|
|
}
|
|
currentBranchPrefix = ss + "/"
|
|
return radix.WalkContinue, nil
|
|
}
|
|
|
|
if err := w.Walk(context.Background()); err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
page.SortByDefault(pages)
|
|
return pages
|
|
}
|
|
|
|
func (pt pageTree) Page() page.Page {
|
|
return pt.p
|
|
}
|
|
|
|
func (p pageTree) SectionsEntries() []string {
|
|
sp := p.SectionsPath()
|
|
if sp == "/" {
|
|
return nil
|
|
}
|
|
entries := strings.Split(sp[1:], "/")
|
|
if len(entries) == 0 {
|
|
return nil
|
|
}
|
|
return entries
|
|
}
|
|
|
|
func (p pageTree) SectionsPath() string {
|
|
return p.CurrentSection().Path()
|
|
}
|