mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-17 21:01:26 +02:00
Introduce a tree map for all content
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
This commit is contained in:
Bjørn Erik Pedersen
@@ -50,7 +50,7 @@ YAML frontmatter with tags and categories taxonomy.`
|
||||
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})
|
||||
|
||||
st := make([]string, 0)
|
||||
for _, t := range s.Taxonomies["tags"].ByCount() {
|
||||
for _, t := range s.Taxonomies()["tags"].ByCount() {
|
||||
st = append(st, t.Page().Title()+":"+t.Name)
|
||||
}
|
||||
|
||||
@@ -166,9 +166,10 @@ permalinkeds:
|
||||
}
|
||||
|
||||
for taxonomy, count := range taxonomyTermPageCounts {
|
||||
msg := qt.Commentf(taxonomy)
|
||||
term := s.getPage(page.KindTaxonomyTerm, taxonomy)
|
||||
b.Assert(term, qt.Not(qt.IsNil))
|
||||
b.Assert(len(term.Pages()), qt.Equals, count, qt.Commentf(taxonomy))
|
||||
b.Assert(term, qt.Not(qt.IsNil), msg)
|
||||
b.Assert(len(term.Pages()), qt.Equals, count, msg)
|
||||
|
||||
for _, p := range term.Pages() {
|
||||
b.Assert(p.Kind(), qt.Equals, page.KindTaxonomy)
|
||||
@@ -258,8 +259,18 @@ title: "This is S3s"
|
||||
|
||||
s := b.H.Sites[0]
|
||||
|
||||
ta := s.findPagesByKind(page.KindTaxonomy)
|
||||
te := s.findPagesByKind(page.KindTaxonomyTerm)
|
||||
filterbyKind := func(kind string) page.Pages {
|
||||
var pages page.Pages
|
||||
for _, p := range s.Pages() {
|
||||
if p.Kind() == kind {
|
||||
pages = append(pages, p)
|
||||
}
|
||||
}
|
||||
return pages
|
||||
}
|
||||
|
||||
ta := filterbyKind(page.KindTaxonomy)
|
||||
te := filterbyKind(page.KindTaxonomyTerm)
|
||||
|
||||
b.Assert(len(te), qt.Equals, 4)
|
||||
b.Assert(len(ta), qt.Equals, 7)
|
||||
@@ -353,9 +364,6 @@ categories: ["regular"]
|
||||
|
||||
}
|
||||
|
||||
// See https://github.com/gohugoio/hugo/issues/6222
|
||||
// We need to revisit this once we figure out what to do with the
|
||||
// draft etc _index pages, but for now we need to avoid the crash.
|
||||
func TestTaxonomiesIndexDraft(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
@@ -366,9 +374,18 @@ title: "The Categories"
|
||||
draft: true
|
||||
---
|
||||
|
||||
This is the invisible content.
|
||||
Content.
|
||||
|
||||
`)
|
||||
`,
|
||||
"page.md", `---
|
||||
title: "The Page"
|
||||
categories: ["cool"]
|
||||
---
|
||||
|
||||
Content.
|
||||
|
||||
`,
|
||||
)
|
||||
|
||||
b.WithTemplates("index.html", `
|
||||
{{ range .Site.Pages }}
|
||||
@@ -378,7 +395,145 @@ This is the invisible content.
|
||||
|
||||
b.Build(BuildCfg{})
|
||||
|
||||
// We publish the index page, but the content will be empty.
|
||||
b.AssertFileContent("public/index.html", " /categories/|The Categories|0||")
|
||||
b.AssertFileContentFn("public/index.html", func(s string) bool {
|
||||
return !strings.Contains(s, "categories")
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
// https://github.com/gohugoio/hugo/issues/6173
|
||||
func TestTaxonomiesWithBundledResources(t *testing.T) {
|
||||
b := newTestSitesBuilder(t)
|
||||
b.WithTemplates("_default/list.html", `
|
||||
List {{ .Title }}:
|
||||
{{ range .Resources }}
|
||||
Resource: {{ .RelPermalink }}|{{ .MediaType }}
|
||||
{{ end }}
|
||||
`)
|
||||
|
||||
b.WithContent("p1.md", `---
|
||||
title: Page
|
||||
categories: ["funny"]
|
||||
---
|
||||
`,
|
||||
"categories/_index.md", "---\ntitle: Categories Page\n---",
|
||||
"categories/data.json", "Category data",
|
||||
"categories/funny/_index.md", "---\ntitle: Funnny Category\n---",
|
||||
"categories/funny/funnydata.json", "Category funny data",
|
||||
)
|
||||
|
||||
b.Build(BuildCfg{})
|
||||
|
||||
b.AssertFileContent("public/categories/index.html", `Resource: /categories/data.json|application/json`)
|
||||
b.AssertFileContent("public/categories/funny/index.html", `Resource: /categories/funny/funnydata.json|application/json`)
|
||||
|
||||
}
|
||||
|
||||
func TestTaxonomiesRemoveOne(t *testing.T) {
|
||||
b := newTestSitesBuilder(t).Running()
|
||||
b.WithTemplates("index.html", `
|
||||
{{ $cats := .Site.Taxonomies.categories.cats }}
|
||||
{{ if $cats }}
|
||||
Len cats: {{ len $cats }}
|
||||
{{ range $cats }}
|
||||
Cats:|{{ .Page.RelPermalink }}|
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{ $funny := .Site.Taxonomies.categories.funny }}
|
||||
{{ if $funny }}
|
||||
Len funny: {{ len $funny }}
|
||||
{{ range $funny }}
|
||||
Funny:|{{ .Page.RelPermalink }}|
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
`)
|
||||
|
||||
b.WithContent("p1.md", `---
|
||||
title: Page
|
||||
categories: ["funny", "cats"]
|
||||
---
|
||||
`, "p2.md", `---
|
||||
title: Page2
|
||||
categories: ["funny", "cats"]
|
||||
---
|
||||
`,
|
||||
)
|
||||
|
||||
b.Build(BuildCfg{})
|
||||
|
||||
b.AssertFileContent("public/index.html", `
|
||||
Len cats: 2
|
||||
Len funny: 2
|
||||
Cats:|/p1/|
|
||||
Cats:|/p2/|
|
||||
Funny:|/p1/|
|
||||
Funny:|/p2/|`)
|
||||
|
||||
// Remove one category from one of the pages.
|
||||
b.EditFiles("content/p1.md", `---
|
||||
title: Page
|
||||
categories: ["funny"]
|
||||
---
|
||||
`)
|
||||
|
||||
b.Build(BuildCfg{})
|
||||
|
||||
b.AssertFileContent("public/index.html", `
|
||||
Len cats: 1
|
||||
Len funny: 2
|
||||
Cats:|/p2/|
|
||||
Funny:|/p1/|
|
||||
Funny:|/p2/|`)
|
||||
|
||||
}
|
||||
|
||||
//https://github.com/gohugoio/hugo/issues/6590
|
||||
func TestTaxonomiesListPages(t *testing.T) {
|
||||
b := newTestSitesBuilder(t)
|
||||
b.WithTemplates("_default/list.html", `
|
||||
|
||||
{{ template "print-taxo" "categories.cats" }}
|
||||
{{ template "print-taxo" "categories.funny" }}
|
||||
|
||||
{{ define "print-taxo" }}
|
||||
{{ $node := index site.Taxonomies (split $ ".") }}
|
||||
{{ if $node }}
|
||||
Len {{ $ }}: {{ len $node }}
|
||||
{{ range $node }}
|
||||
{{ $ }}:|{{ .Page.RelPermalink }}|
|
||||
{{ end }}
|
||||
{{ else }}
|
||||
{{ $ }} not found.
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
`)
|
||||
|
||||
b.WithContent("_index.md", `---
|
||||
title: Home
|
||||
categories: ["funny", "cats"]
|
||||
---
|
||||
`, "blog/p1.md", `---
|
||||
title: Page1
|
||||
categories: ["funny"]
|
||||
---
|
||||
`, "blog/_index.md", `---
|
||||
title: Blog Section
|
||||
categories: ["cats"]
|
||||
---
|
||||
`,
|
||||
)
|
||||
|
||||
b.Build(BuildCfg{})
|
||||
|
||||
b.AssertFileContent("public/index.html", `
|
||||
|
||||
Len categories.cats: 2
|
||||
categories.cats:|/blog/|
|
||||
categories.cats:|/|
|
||||
|
||||
Len categories.funny: 2
|
||||
categories.funny:|/|
|
||||
categories.funny:|/blog/p1/|
|
||||
`)
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user