2017-05-25 05:32:02 -04:00
|
|
|
// Copyright 2017 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"
|
|
|
|
"math/rand"
|
|
|
|
"path"
|
|
|
|
"path/filepath"
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2017-06-13 12:42:45 -04:00
|
|
|
"github.com/gohugoio/hugo/deps"
|
2017-05-25 05:32:02 -04:00
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
)
|
|
|
|
|
|
|
|
const pageCollectionsPageTemplate = `---
|
|
|
|
title: "%s"
|
|
|
|
categories:
|
|
|
|
- Hugo
|
|
|
|
---
|
|
|
|
# Doc
|
|
|
|
`
|
|
|
|
|
|
|
|
func BenchmarkGetPage(b *testing.B) {
|
|
|
|
var (
|
|
|
|
cfg, fs = newTestCfg()
|
|
|
|
r = rand.New(rand.NewSource(time.Now().UnixNano()))
|
|
|
|
)
|
|
|
|
|
|
|
|
for i := 0; i < 10; i++ {
|
|
|
|
for j := 0; j < 100; j++ {
|
|
|
|
writeSource(b, fs, filepath.Join("content", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", j)), "CONTENT")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
s := buildSingleSite(b, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
|
|
|
|
|
|
|
|
pagePaths := make([]string, b.N)
|
|
|
|
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
pagePaths[i] = fmt.Sprintf("sect%d", r.Intn(10))
|
|
|
|
}
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
2018-07-17 05:18:29 -04:00
|
|
|
home, _ := s.getPageNew(nil, "/")
|
2017-05-25 05:32:02 -04:00
|
|
|
if home == nil {
|
|
|
|
b.Fatal("Home is nil")
|
|
|
|
}
|
|
|
|
|
2018-07-17 05:18:29 -04:00
|
|
|
p, _ := s.getPageNew(nil, pagePaths[i])
|
2017-05-25 05:32:02 -04:00
|
|
|
if p == nil {
|
|
|
|
b.Fatal("Section is nil")
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func BenchmarkGetPageRegular(b *testing.B) {
|
|
|
|
var (
|
|
|
|
cfg, fs = newTestCfg()
|
|
|
|
r = rand.New(rand.NewSource(time.Now().UnixNano()))
|
|
|
|
)
|
|
|
|
|
|
|
|
for i := 0; i < 10; i++ {
|
|
|
|
for j := 0; j < 100; j++ {
|
|
|
|
content := fmt.Sprintf(pageCollectionsPageTemplate, fmt.Sprintf("Title%d_%d", i, j))
|
|
|
|
writeSource(b, fs, filepath.Join("content", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", j)), content)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
s := buildSingleSite(b, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
|
|
|
|
|
|
|
|
pagePaths := make([]string, b.N)
|
|
|
|
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
pagePaths[i] = path.Join(fmt.Sprintf("sect%d", r.Intn(10)), fmt.Sprintf("page%d.md", r.Intn(100)))
|
|
|
|
}
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
2018-07-17 05:18:29 -04:00
|
|
|
page, _ := s.getPageNew(nil, pagePaths[i])
|
2017-05-25 05:32:02 -04:00
|
|
|
require.NotNil(b, page)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGetPage(t *testing.T) {
|
|
|
|
|
|
|
|
var (
|
|
|
|
assert = require.New(t)
|
|
|
|
cfg, fs = newTestCfg()
|
|
|
|
)
|
|
|
|
|
|
|
|
for i := 0; i < 10; i++ {
|
|
|
|
for j := 0; j < 10; j++ {
|
|
|
|
content := fmt.Sprintf(pageCollectionsPageTemplate, fmt.Sprintf("Title%d_%d", i, j))
|
|
|
|
writeSource(t, fs, filepath.Join("content", fmt.Sprintf("sect%d", i), fmt.Sprintf("page%d.md", j)), content)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-26 03:12:19 -04:00
|
|
|
content := fmt.Sprintf(pageCollectionsPageTemplate, "UniqueBase")
|
|
|
|
writeSource(t, fs, filepath.Join("content", "sect3", "unique.md"), content)
|
|
|
|
|
2017-05-25 05:32:02 -04:00
|
|
|
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
|
|
|
|
|
|
|
|
tests := []struct {
|
|
|
|
kind string
|
|
|
|
path []string
|
|
|
|
expectedTitle string
|
|
|
|
}{
|
|
|
|
{KindHome, []string{}, ""},
|
|
|
|
{KindSection, []string{"sect3"}, "Sect3s"},
|
2018-07-17 05:18:29 -04:00
|
|
|
{KindPage, []string{"sect3/page1.md"}, "Title3_1"},
|
2017-05-25 05:32:02 -04:00
|
|
|
{KindPage, []string{"sect4/page2.md"}, "Title4_2"},
|
|
|
|
{KindPage, []string{filepath.FromSlash("sect5/page3.md")}, "Title5_3"},
|
2017-05-26 03:12:19 -04:00
|
|
|
// Ref/Relref supports this potentially ambiguous lookup.
|
|
|
|
{KindPage, []string{"unique.md"}, "UniqueBase"},
|
2017-05-25 05:32:02 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for i, test := range tests {
|
|
|
|
errorMsg := fmt.Sprintf("Test %d", i)
|
2018-05-29 21:35:27 -04:00
|
|
|
|
|
|
|
// test legacy public Site.GetPage
|
2018-07-17 05:18:29 -04:00
|
|
|
args := append([]string{test.kind}, test.path...)
|
|
|
|
page, err := s.Info.GetPage(args...)
|
|
|
|
assert.NoError(err)
|
2017-05-25 05:32:02 -04:00
|
|
|
assert.NotNil(page, errorMsg)
|
:sparkles: Implement Page bundling and image handling
This commit is not the smallest in Hugo's history.
Some hightlights include:
* Page bundles (for complete articles, keeping images and content together etc.).
* Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`.
* Processed images are cached inside `resources/_gen/images` (default) in your project.
* Symbolic links (both files and dirs) are now allowed anywhere inside /content
* A new table based build summary
* The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below).
A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory:
```bash
▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render"
benchmark old ns/op new ns/op delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86%
benchmark old allocs new allocs delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30%
benchmark old bytes new bytes delta
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12%
BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35%
BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64%
```
Fixes #3651
Closes #3158
Fixes #1014
Closes #2021
Fixes #1240
Updates #3757
2017-07-24 03:00:23 -04:00
|
|
|
assert.Equal(test.kind, page.Kind, errorMsg)
|
2018-01-15 14:40:39 -05:00
|
|
|
assert.Equal(test.expectedTitle, page.title)
|
2018-05-29 21:35:27 -04:00
|
|
|
|
|
|
|
// test new internal Site.getPage
|
|
|
|
var ref string
|
|
|
|
if len(test.path) == 1 {
|
|
|
|
ref = filepath.ToSlash(test.path[0])
|
|
|
|
} else {
|
|
|
|
ref = path.Join(test.path...)
|
|
|
|
}
|
2018-07-17 05:18:29 -04:00
|
|
|
page2, err := s.getPageNew(nil, ref)
|
|
|
|
assert.NoError(err)
|
2018-05-29 21:35:27 -04:00
|
|
|
assert.NotNil(page2, errorMsg)
|
|
|
|
assert.Equal(test.kind, page2.Kind, errorMsg)
|
|
|
|
assert.Equal(test.expectedTitle, page2.title)
|
|
|
|
|
2017-05-25 05:32:02 -04:00
|
|
|
}
|
|
|
|
|
2018-05-29 21:35:27 -04:00
|
|
|
// vas(todo) add ambiguity detection tests
|
|
|
|
|
2017-05-25 05:32:02 -04:00
|
|
|
}
|