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
268 lines
8.5 KiB
Go
268 lines
8.5 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 (
|
|
"testing"
|
|
|
|
"fmt"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
"github.com/gohugoio/hugo/resources/page"
|
|
)
|
|
|
|
func TestDisable(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
newSitesBuilder := func(c *qt.C, disableKind string) *sitesBuilder {
|
|
config := fmt.Sprintf(`
|
|
baseURL = "http://example.com/blog"
|
|
enableRobotsTXT = true
|
|
disableKinds = [%q]
|
|
`, disableKind)
|
|
|
|
b := newTestSitesBuilder(c)
|
|
b.WithConfigFile("toml", config).WithContent("sect/page.md", `
|
|
---
|
|
title: Page
|
|
categories: ["mycat"]
|
|
tags: ["mytag"]
|
|
---
|
|
|
|
`, "sect/no-list.md", `
|
|
---
|
|
title: No List
|
|
_build:
|
|
list: false
|
|
---
|
|
|
|
`, "sect/no-render.md", `
|
|
---
|
|
title: No List
|
|
_build:
|
|
render: false
|
|
---
|
|
`, "sect/no-publishresources/index.md", `
|
|
---
|
|
title: No Publish Resources
|
|
_build:
|
|
publishResources: false
|
|
---
|
|
|
|
`, "sect/headlessbundle/index.md", `
|
|
---
|
|
title: Headless
|
|
headless: true
|
|
---
|
|
|
|
`)
|
|
b.WithSourceFile("content/sect/headlessbundle/data.json", "DATA")
|
|
b.WithSourceFile("content/sect/no-publishresources/data.json", "DATA")
|
|
|
|
return b
|
|
|
|
}
|
|
|
|
getPage := func(b *sitesBuilder, ref string) page.Page {
|
|
b.Helper()
|
|
p, err := b.H.Sites[0].getPageNew(nil, ref)
|
|
b.Assert(err, qt.IsNil)
|
|
return p
|
|
}
|
|
|
|
getPageInSitePages := func(b *sitesBuilder, ref string) page.Page {
|
|
b.Helper()
|
|
for _, pages := range []page.Pages{b.H.Sites[0].Pages(), b.H.Sites[0].RegularPages()} {
|
|
for _, p := range pages {
|
|
if ref == p.(*pageState).sourceRef() {
|
|
return p
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
getPageInPagePages := func(p page.Page, ref string) page.Page {
|
|
for _, pages := range []page.Pages{p.Pages(), p.RegularPages(), p.Sections()} {
|
|
for _, p := range pages {
|
|
if ref == p.(*pageState).sourceRef() {
|
|
return p
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
disableKind := page.KindPage
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
s := b.H.Sites[0]
|
|
b.Assert(getPage(b, "/sect/page.md"), qt.IsNil)
|
|
b.Assert(b.CheckExists("public/sect/page/index.html"), qt.Equals, false)
|
|
b.Assert(getPageInSitePages(b, "/sect/page.md"), qt.IsNil)
|
|
b.Assert(getPageInPagePages(getPage(b, "/"), "/sect/page.md"), qt.IsNil)
|
|
|
|
// Also check the side effects
|
|
b.Assert(b.CheckExists("public/categories/mycat/index.html"), qt.Equals, false)
|
|
b.Assert(len(s.Taxonomies()["categories"]), qt.Equals, 0)
|
|
})
|
|
|
|
disableKind = page.KindTaxonomy
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
s := b.H.Sites[0]
|
|
b.Assert(b.CheckExists("public/categories/index.html"), qt.Equals, true)
|
|
b.Assert(b.CheckExists("public/categories/mycat/index.html"), qt.Equals, false)
|
|
b.Assert(len(s.Taxonomies()["categories"]), qt.Equals, 0)
|
|
b.Assert(getPage(b, "/categories"), qt.Not(qt.IsNil))
|
|
b.Assert(getPage(b, "/categories/mycat"), qt.IsNil)
|
|
})
|
|
|
|
disableKind = page.KindTaxonomyTerm
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
s := b.H.Sites[0]
|
|
b.Assert(b.CheckExists("public/categories/mycat/index.html"), qt.Equals, true)
|
|
b.Assert(b.CheckExists("public/categories/index.html"), qt.Equals, false)
|
|
b.Assert(len(s.Taxonomies()["categories"]), qt.Equals, 1)
|
|
b.Assert(getPage(b, "/categories/mycat"), qt.Not(qt.IsNil))
|
|
categories := getPage(b, "/categories")
|
|
b.Assert(categories, qt.Not(qt.IsNil))
|
|
b.Assert(categories.RelPermalink(), qt.Equals, "")
|
|
b.Assert(getPageInSitePages(b, "/categories"), qt.IsNil)
|
|
b.Assert(getPageInPagePages(getPage(b, "/"), "/categories"), qt.IsNil)
|
|
})
|
|
|
|
disableKind = page.KindHome
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/index.html"), qt.Equals, false)
|
|
home := getPage(b, "/")
|
|
b.Assert(home, qt.Not(qt.IsNil))
|
|
b.Assert(home.RelPermalink(), qt.Equals, "")
|
|
b.Assert(getPageInSitePages(b, "/"), qt.IsNil)
|
|
b.Assert(getPageInPagePages(home, "/"), qt.IsNil)
|
|
b.Assert(getPage(b, "/sect/page.md"), qt.Not(qt.IsNil))
|
|
})
|
|
|
|
disableKind = page.KindSection
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/sect/index.html"), qt.Equals, false)
|
|
sect := getPage(b, "/sect")
|
|
b.Assert(sect, qt.Not(qt.IsNil))
|
|
b.Assert(sect.RelPermalink(), qt.Equals, "")
|
|
b.Assert(getPageInSitePages(b, "/sect"), qt.IsNil)
|
|
home := getPage(b, "/")
|
|
b.Assert(getPageInPagePages(home, "/sect"), qt.IsNil)
|
|
b.Assert(home.OutputFormats(), qt.HasLen, 2)
|
|
page := getPage(b, "/sect/page.md")
|
|
b.Assert(page, qt.Not(qt.IsNil))
|
|
b.Assert(page.CurrentSection(), qt.Equals, sect)
|
|
b.Assert(getPageInPagePages(sect, "/sect/page.md"), qt.Not(qt.IsNil))
|
|
b.AssertFileContent("public/sitemap.xml", "sitemap")
|
|
b.AssertFileContent("public/index.xml", "rss")
|
|
|
|
})
|
|
|
|
disableKind = kindRSS
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/index.xml"), qt.Equals, false)
|
|
home := getPage(b, "/")
|
|
b.Assert(home.OutputFormats(), qt.HasLen, 1)
|
|
})
|
|
|
|
disableKind = kindSitemap
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/sitemap.xml"), qt.Equals, false)
|
|
})
|
|
|
|
disableKind = kind404
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/404.html"), qt.Equals, false)
|
|
})
|
|
|
|
disableKind = kindRobotsTXT
|
|
c.Run("Disable "+disableKind, func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.WithTemplatesAdded("robots.txt", "myrobots")
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/robots.txt"), qt.Equals, false)
|
|
})
|
|
|
|
c.Run("Headless bundle", func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/sect/headlessbundle/index.html"), qt.Equals, false)
|
|
b.Assert(b.CheckExists("public/sect/headlessbundle/data.json"), qt.Equals, true)
|
|
bundle := getPage(b, "/sect/headlessbundle/index.md")
|
|
b.Assert(bundle, qt.Not(qt.IsNil))
|
|
b.Assert(bundle.RelPermalink(), qt.Equals, "")
|
|
resource := bundle.Resources()[0]
|
|
b.Assert(resource.RelPermalink(), qt.Equals, "/blog/sect/headlessbundle/data.json")
|
|
b.Assert(bundle.OutputFormats(), qt.HasLen, 0)
|
|
b.Assert(bundle.AlternativeOutputFormats(), qt.HasLen, 0)
|
|
})
|
|
|
|
c.Run("Build config, no list", func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
ref := "/sect/no-list.md"
|
|
b.Assert(b.CheckExists("public/sect/no-list/index.html"), qt.Equals, true)
|
|
p := getPage(b, ref)
|
|
b.Assert(p, qt.Not(qt.IsNil))
|
|
b.Assert(p.RelPermalink(), qt.Equals, "/blog/sect/no-list/")
|
|
b.Assert(getPageInSitePages(b, ref), qt.IsNil)
|
|
sect := getPage(b, "/sect")
|
|
b.Assert(getPageInPagePages(sect, ref), qt.IsNil)
|
|
|
|
})
|
|
|
|
c.Run("Build config, no render", func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
ref := "/sect/no-render.md"
|
|
b.Assert(b.CheckExists("public/sect/no-render/index.html"), qt.Equals, false)
|
|
p := getPage(b, ref)
|
|
b.Assert(p, qt.Not(qt.IsNil))
|
|
b.Assert(p.RelPermalink(), qt.Equals, "")
|
|
b.Assert(p.OutputFormats(), qt.HasLen, 0)
|
|
b.Assert(getPageInSitePages(b, ref), qt.Not(qt.IsNil))
|
|
sect := getPage(b, "/sect")
|
|
b.Assert(getPageInPagePages(sect, ref), qt.Not(qt.IsNil))
|
|
})
|
|
|
|
c.Run("Build config, no publish resources", func(c *qt.C) {
|
|
b := newSitesBuilder(c, disableKind)
|
|
b.Build(BuildCfg{})
|
|
b.Assert(b.CheckExists("public/sect/no-publishresources/index.html"), qt.Equals, true)
|
|
b.Assert(b.CheckExists("public/sect/no-publishresources/data.json"), qt.Equals, false)
|
|
bundle := getPage(b, "/sect/no-publishresources/index.md")
|
|
b.Assert(bundle, qt.Not(qt.IsNil))
|
|
b.Assert(bundle.RelPermalink(), qt.Equals, "/blog/sect/no-publishresources/")
|
|
b.Assert(bundle.Resources(), qt.HasLen, 1)
|
|
resource := bundle.Resources()[0]
|
|
b.Assert(resource.RelPermalink(), qt.Equals, "/blog/sect/no-publishresources/data.json")
|
|
})
|
|
}
|