mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05: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
312 lines
7.7 KiB
Go
312 lines
7.7 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 (
|
|
"fmt"
|
|
"path"
|
|
"path/filepath"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/gohugoio/hugo/common/herrors"
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
"github.com/gohugoio/hugo/resources/page"
|
|
)
|
|
|
|
// PageCollections contains the page collections for a site.
|
|
type PageCollections struct {
|
|
pageMap *pageMap
|
|
|
|
// Lazy initialized page collections
|
|
pages *lazyPagesFactory
|
|
regularPages *lazyPagesFactory
|
|
allPages *lazyPagesFactory
|
|
allRegularPages *lazyPagesFactory
|
|
}
|
|
|
|
// Pages returns all pages.
|
|
// This is for the current language only.
|
|
func (c *PageCollections) Pages() page.Pages {
|
|
return c.pages.get()
|
|
}
|
|
|
|
// RegularPages returns all the regular pages.
|
|
// This is for the current language only.
|
|
func (c *PageCollections) RegularPages() page.Pages {
|
|
return c.regularPages.get()
|
|
}
|
|
|
|
// AllPages returns all pages for all languages.
|
|
func (c *PageCollections) AllPages() page.Pages {
|
|
return c.allPages.get()
|
|
}
|
|
|
|
// AllPages returns all regular pages for all languages.
|
|
func (c *PageCollections) AllRegularPages() page.Pages {
|
|
return c.allRegularPages.get()
|
|
}
|
|
|
|
type lazyPagesFactory struct {
|
|
pages page.Pages
|
|
|
|
init sync.Once
|
|
factory page.PagesFactory
|
|
}
|
|
|
|
func (l *lazyPagesFactory) get() page.Pages {
|
|
l.init.Do(func() {
|
|
l.pages = l.factory()
|
|
})
|
|
return l.pages
|
|
}
|
|
|
|
func newLazyPagesFactory(factory page.PagesFactory) *lazyPagesFactory {
|
|
return &lazyPagesFactory{factory: factory}
|
|
}
|
|
|
|
func newPageCollections(m *pageMap) *PageCollections {
|
|
if m == nil {
|
|
panic("must provide a pageMap")
|
|
}
|
|
|
|
c := &PageCollections{pageMap: m}
|
|
|
|
c.pages = newLazyPagesFactory(func() page.Pages {
|
|
return m.createListAllPages()
|
|
})
|
|
|
|
c.regularPages = newLazyPagesFactory(func() page.Pages {
|
|
return c.findPagesByKindIn(page.KindPage, c.pages.get())
|
|
})
|
|
|
|
return c
|
|
}
|
|
|
|
// This is an adapter func for the old API with Kind as first argument.
|
|
// This is invoked when you do .Site.GetPage. We drop the Kind and fails
|
|
// if there are more than 2 arguments, which would be ambigous.
|
|
func (c *PageCollections) getPageOldVersion(ref ...string) (page.Page, error) {
|
|
var refs []string
|
|
for _, r := range ref {
|
|
// A common construct in the wild is
|
|
// .Site.GetPage "home" "" or
|
|
// .Site.GetPage "home" "/"
|
|
if r != "" && r != "/" {
|
|
refs = append(refs, r)
|
|
}
|
|
}
|
|
|
|
var key string
|
|
|
|
if len(refs) > 2 {
|
|
// This was allowed in Hugo <= 0.44, but we cannot support this with the
|
|
// new API. This should be the most unusual case.
|
|
return nil, fmt.Errorf(`too many arguments to .Site.GetPage: %v. Use lookups on the form {{ .Site.GetPage "/posts/mypage-md" }}`, ref)
|
|
}
|
|
|
|
if len(refs) == 0 || refs[0] == page.KindHome {
|
|
key = "/"
|
|
} else if len(refs) == 1 {
|
|
if len(ref) == 2 && refs[0] == page.KindSection {
|
|
// This is an old style reference to the "Home Page section".
|
|
// Typically fetched via {{ .Site.GetPage "section" .Section }}
|
|
// See https://github.com/gohugoio/hugo/issues/4989
|
|
key = "/"
|
|
} else {
|
|
key = refs[0]
|
|
}
|
|
} else {
|
|
key = refs[1]
|
|
}
|
|
|
|
key = filepath.ToSlash(key)
|
|
if !strings.HasPrefix(key, "/") {
|
|
key = "/" + key
|
|
}
|
|
|
|
return c.getPageNew(nil, key)
|
|
}
|
|
|
|
// Only used in tests.
|
|
func (c *PageCollections) getPage(typ string, sections ...string) page.Page {
|
|
refs := append([]string{typ}, path.Join(sections...))
|
|
p, _ := c.getPageOldVersion(refs...)
|
|
return p
|
|
}
|
|
|
|
// getPageRef resolves a Page from ref/relRef, with a slightly more comprehensive
|
|
// search path than getPageNew.
|
|
func (c *PageCollections) getPageRef(context page.Page, ref string) (page.Page, error) {
|
|
n, err := c.getContentNode(context, true, ref)
|
|
if err != nil || n == nil || n.p == nil {
|
|
return nil, err
|
|
}
|
|
return n.p, nil
|
|
}
|
|
|
|
func (c *PageCollections) getPageNew(context page.Page, ref string) (page.Page, error) {
|
|
n, err := c.getContentNode(context, false, ref)
|
|
if err != nil || n == nil || n.p == nil {
|
|
return nil, err
|
|
}
|
|
return n.p, nil
|
|
}
|
|
|
|
func (c *PageCollections) getSectionOrPage(ref string) (*contentNode, string) {
|
|
var n *contentNode
|
|
|
|
s, v, found := c.pageMap.sections.LongestPrefix(ref)
|
|
|
|
if found {
|
|
n = v.(*contentNode)
|
|
}
|
|
|
|
if found && s == ref {
|
|
// A section
|
|
return n, ""
|
|
}
|
|
|
|
m := c.pageMap
|
|
filename := strings.TrimPrefix(strings.TrimPrefix(ref, s), "/")
|
|
langSuffix := "." + m.s.Lang()
|
|
|
|
// Trim both extension and any language code.
|
|
name := helpers.PathNoExt(filename)
|
|
name = strings.TrimSuffix(name, langSuffix)
|
|
|
|
// These are reserved bundle names and will always be stored by their owning
|
|
// folder name.
|
|
name = strings.TrimSuffix(name, "/index")
|
|
name = strings.TrimSuffix(name, "/_index")
|
|
|
|
if !found {
|
|
return nil, name
|
|
}
|
|
|
|
// Check if it's a section with filename provided.
|
|
if !n.p.File().IsZero() && n.p.File().LogicalName() == filename {
|
|
return n, name
|
|
}
|
|
|
|
return m.getPage(s, name), name
|
|
|
|
}
|
|
|
|
func (c *PageCollections) getContentNode(context page.Page, isReflink bool, ref string) (*contentNode, error) {
|
|
defer herrors.Recover()
|
|
ref = filepath.ToSlash(strings.ToLower(strings.TrimSpace(ref)))
|
|
if ref == "" {
|
|
ref = "/"
|
|
}
|
|
inRef := ref
|
|
|
|
var doSimpleLookup bool
|
|
if isReflink || context == nil {
|
|
// For Ref/Reflink and .Site.GetPage do simple name lookups for the potentially ambigous myarticle.md and /myarticle.md,
|
|
// but not when we get ./myarticle*, section/myarticle.
|
|
doSimpleLookup = ref[0] != '.' || ref[0] == '/' && strings.Count(ref, "/") == 1
|
|
}
|
|
|
|
if context != nil && !strings.HasPrefix(ref, "/") {
|
|
// Try the page-relative path.
|
|
var base string
|
|
if context.File().IsZero() {
|
|
base = context.SectionsPath()
|
|
} else {
|
|
base = filepath.ToSlash(filepath.Dir(context.File().FileInfo().Meta().Path()))
|
|
}
|
|
ref = path.Join("/", strings.ToLower(base), ref)
|
|
}
|
|
|
|
if !strings.HasPrefix(ref, "/") {
|
|
ref = "/" + ref
|
|
}
|
|
|
|
m := c.pageMap
|
|
|
|
// It's either a section, a page in a section or a taxonomy node.
|
|
// Start with the most likely:
|
|
n, name := c.getSectionOrPage(ref)
|
|
if n != nil {
|
|
return n, nil
|
|
}
|
|
|
|
if !strings.HasPrefix(inRef, "/") {
|
|
// Many people will have "post/foo.md" in their content files.
|
|
if n, _ := c.getSectionOrPage("/" + inRef); n != nil {
|
|
return n, nil
|
|
}
|
|
}
|
|
|
|
// Check if it's a taxonomy node
|
|
s, v, found := m.taxonomies.LongestPrefix(ref)
|
|
if found {
|
|
if !m.onSameLevel(ref, s) {
|
|
return nil, nil
|
|
}
|
|
return v.(*contentNode), nil
|
|
}
|
|
|
|
getByName := func(s string) (*contentNode, error) {
|
|
n := m.pageReverseIndex.Get(s)
|
|
if n != nil {
|
|
if n == ambigousContentNode {
|
|
return nil, fmt.Errorf("page reference %q is ambiguous", ref)
|
|
}
|
|
return n, nil
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
var module string
|
|
if context != nil && !context.File().IsZero() {
|
|
module = context.File().FileInfo().Meta().Module()
|
|
}
|
|
|
|
if module == "" && !c.pageMap.s.home.File().IsZero() {
|
|
module = c.pageMap.s.home.File().FileInfo().Meta().Module()
|
|
}
|
|
|
|
if module != "" {
|
|
n, err := getByName(module + ref)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if n != nil {
|
|
return n, nil
|
|
}
|
|
}
|
|
|
|
if !doSimpleLookup {
|
|
return nil, nil
|
|
}
|
|
|
|
// Ref/relref supports this potentially ambigous lookup.
|
|
return getByName(name)
|
|
|
|
}
|
|
|
|
func (*PageCollections) findPagesByKindIn(kind string, inPages page.Pages) page.Pages {
|
|
var pages page.Pages
|
|
for _, p := range inPages {
|
|
if p.Kind() == kind {
|
|
pages = append(pages, p)
|
|
}
|
|
}
|
|
return pages
|
|
}
|