2024-05-17 11:06:47 -04:00
|
|
|
// Copyright 2024 The Hugo Authors. All rights reserved.
|
2018-11-08 04:24:13 -05:00
|
|
|
//
|
|
|
|
// 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 filecache
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2019-10-21 03:37:46 -04:00
|
|
|
"errors"
|
2018-11-08 04:24:13 -05:00
|
|
|
"io"
|
2018-11-23 03:16:42 -05:00
|
|
|
"os"
|
2018-11-08 04:24:13 -05:00
|
|
|
"path/filepath"
|
|
|
|
"strings"
|
2018-11-14 06:06:46 -05:00
|
|
|
"sync"
|
2018-11-08 04:24:13 -05:00
|
|
|
"time"
|
|
|
|
|
2024-05-17 11:06:47 -04:00
|
|
|
"github.com/gohugoio/httpcache"
|
2018-11-08 04:24:13 -05:00
|
|
|
"github.com/gohugoio/hugo/common/hugio"
|
all: Rework page store, add a dynacache, improve partial rebuilds, and some general spring cleaning
There are some breaking changes in this commit, see #11455.
Closes #11455
Closes #11549
This fixes a set of bugs (see issue list) and it is also paying some technical debt accumulated over the years. We now build with Staticcheck enabled in the CI build.
The performance should be about the same as before for regular sized Hugo sites, but it should perform and scale much better to larger data sets, as objects that uses lots of memory (e.g. rendered Markdown, big JSON files read into maps with transform.Unmarshal etc.) will now get automatically garbage collected if needed. Performance on partial rebuilds when running the server in fast render mode should be the same, but the change detection should be much more accurate.
A list of the notable new features:
* A new dependency tracker that covers (almost) all of Hugo's API and is used to do fine grained partial rebuilds when running the server.
* A new and simpler tree document store which allows fast lookups and prefix-walking in all dimensions (e.g. language) concurrently.
* You can now configure an upper memory limit allowing for much larger data sets and/or running on lower specced PCs.
We have lifted the "no resources in sub folders" restriction for branch bundles (e.g. sections).
Memory Limit
* Hugos will, by default, set aside a quarter of the total system memory, but you can set this via the OS environment variable HUGO_MEMORYLIMIT (in gigabytes). This is backed by a partitioned LRU cache used throughout Hugo. A cache that gets dynamically resized in low memory situations, allowing Go's Garbage Collector to free the memory.
New Dependency Tracker: Hugo has had a rule based coarse grained approach to server rebuilds that has worked mostly pretty well, but there have been some surprises (e.g. stale content). This is now revamped with a new dependency tracker that can quickly calculate the delta given a changed resource (e.g. a content file, template, JS file etc.). This handles transitive relations, e.g. $page -> js.Build -> JS import, or $page1.Content -> render hook -> site.GetPage -> $page2.Title, or $page1.Content -> shortcode -> partial -> site.RegularPages -> $page2.Content -> shortcode ..., and should also handle changes to aggregated values (e.g. site.Lastmod) effectively.
This covers all of Hugo's API with 2 known exceptions (a list that may not be fully exhaustive):
Changes to files loaded with template func os.ReadFile may not be handled correctly. We recommend loading resources with resources.Get
Changes to Hugo objects (e.g. Page) passed in the template context to lang.Translate may not be detected correctly. We recommend having simple i18n templates without too much data context passed in other than simple types such as strings and numbers.
Note that the cachebuster configuration (when A changes then rebuild B) works well with the above, but we recommend that you revise that configuration, as it in most situations should not be needed. One example where it is still needed is with TailwindCSS and using changes to hugo_stats.json to trigger new CSS rebuilds.
Document Store: Previously, a little simplified, we split the document store (where we store pages and resources) in a tree per language. This worked pretty well, but the structure made some operations harder than they needed to be. We have now restructured it into one Radix tree for all languages. Internally the language is considered to be a dimension of that tree, and the tree can be viewed in all dimensions concurrently. This makes some operations re. language simpler (e.g. finding translations is just a slice range), but the idea is that it should also be relatively inexpensive to add more dimensions if needed (e.g. role).
Fixes #10169
Fixes #10364
Fixes #10482
Fixes #10630
Fixes #10656
Fixes #10694
Fixes #10918
Fixes #11262
Fixes #11439
Fixes #11453
Fixes #11457
Fixes #11466
Fixes #11540
Fixes #11551
Fixes #11556
Fixes #11654
Fixes #11661
Fixes #11663
Fixes #11664
Fixes #11669
Fixes #11671
Fixes #11807
Fixes #11808
Fixes #11809
Fixes #11815
Fixes #11840
Fixes #11853
Fixes #11860
Fixes #11883
Fixes #11904
Fixes #7388
Fixes #7425
Fixes #7436
Fixes #7544
Fixes #7882
Fixes #7960
Fixes #8255
Fixes #8307
Fixes #8863
Fixes #8927
Fixes #9192
Fixes #9324
2023-12-24 13:11:05 -05:00
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
2018-11-08 04:24:13 -05:00
|
|
|
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
|
|
|
|
"github.com/BurntSushi/locker"
|
|
|
|
"github.com/spf13/afero"
|
|
|
|
)
|
|
|
|
|
2019-10-21 03:37:46 -04:00
|
|
|
// ErrFatal can be used to signal an unrecoverable error.
|
|
|
|
var ErrFatal = errors.New("fatal filecache error")
|
|
|
|
|
2018-11-14 05:53:45 -05:00
|
|
|
const (
|
2023-01-04 12:24:36 -05:00
|
|
|
FilecacheRootDirname = "filecache"
|
2018-11-14 05:53:45 -05:00
|
|
|
)
|
|
|
|
|
2018-11-08 04:24:13 -05:00
|
|
|
// Cache caches a set of files in a directory. This is usually a file on
|
|
|
|
// disk, but since this is backed by an Afero file system, it can be anything.
|
|
|
|
type Cache struct {
|
|
|
|
Fs afero.Fs
|
|
|
|
|
2018-11-14 04:51:41 -05:00
|
|
|
// Max age for items in this cache. Negative duration means forever,
|
|
|
|
// 0 is effectively turning this cache off.
|
|
|
|
maxAge time.Duration
|
2018-11-08 04:24:13 -05:00
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
// When set, we just remove this entire root directory on expiration.
|
|
|
|
pruneAllRootDir string
|
|
|
|
|
2018-11-14 06:06:46 -05:00
|
|
|
nlocker *lockTracker
|
2023-08-30 05:05:15 -04:00
|
|
|
|
|
|
|
initOnce sync.Once
|
|
|
|
initErr error
|
2018-11-14 06:06:46 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
type lockTracker struct {
|
|
|
|
seenMu sync.RWMutex
|
|
|
|
seen map[string]struct{}
|
|
|
|
|
|
|
|
*locker.Locker
|
|
|
|
}
|
|
|
|
|
|
|
|
// Lock tracks the ids in use. We use this information to do garbage collection
|
|
|
|
// after a Hugo build.
|
|
|
|
func (l *lockTracker) Lock(id string) {
|
|
|
|
l.seenMu.RLock()
|
|
|
|
if _, seen := l.seen[id]; !seen {
|
|
|
|
l.seenMu.RUnlock()
|
|
|
|
l.seenMu.Lock()
|
|
|
|
l.seen[id] = struct{}{}
|
|
|
|
l.seenMu.Unlock()
|
|
|
|
} else {
|
|
|
|
l.seenMu.RUnlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
l.Locker.Lock(id)
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// ItemInfo contains info about a cached file.
|
|
|
|
type ItemInfo struct {
|
|
|
|
// This is the file's name relative to the cache's filesystem.
|
|
|
|
Name string
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewCache creates a new file cache with the given filesystem and max age.
|
2021-12-10 03:55:41 -05:00
|
|
|
func NewCache(fs afero.Fs, maxAge time.Duration, pruneAllRootDir string) *Cache {
|
2018-11-08 04:24:13 -05:00
|
|
|
return &Cache{
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
Fs: fs,
|
|
|
|
nlocker: &lockTracker{Locker: locker.NewLocker(), seen: make(map[string]struct{})},
|
|
|
|
maxAge: maxAge,
|
|
|
|
pruneAllRootDir: pruneAllRootDir,
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// lockedFile is a file with a lock that is released on Close.
|
|
|
|
type lockedFile struct {
|
|
|
|
afero.File
|
|
|
|
unlock func()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *lockedFile) Close() error {
|
|
|
|
defer l.unlock()
|
|
|
|
return l.File.Close()
|
|
|
|
}
|
|
|
|
|
2023-08-30 05:05:15 -04:00
|
|
|
func (c *Cache) init() error {
|
|
|
|
c.initOnce.Do(func() {
|
|
|
|
// Create the base dir if it does not exist.
|
all: Rework page store, add a dynacache, improve partial rebuilds, and some general spring cleaning
There are some breaking changes in this commit, see #11455.
Closes #11455
Closes #11549
This fixes a set of bugs (see issue list) and it is also paying some technical debt accumulated over the years. We now build with Staticcheck enabled in the CI build.
The performance should be about the same as before for regular sized Hugo sites, but it should perform and scale much better to larger data sets, as objects that uses lots of memory (e.g. rendered Markdown, big JSON files read into maps with transform.Unmarshal etc.) will now get automatically garbage collected if needed. Performance on partial rebuilds when running the server in fast render mode should be the same, but the change detection should be much more accurate.
A list of the notable new features:
* A new dependency tracker that covers (almost) all of Hugo's API and is used to do fine grained partial rebuilds when running the server.
* A new and simpler tree document store which allows fast lookups and prefix-walking in all dimensions (e.g. language) concurrently.
* You can now configure an upper memory limit allowing for much larger data sets and/or running on lower specced PCs.
We have lifted the "no resources in sub folders" restriction for branch bundles (e.g. sections).
Memory Limit
* Hugos will, by default, set aside a quarter of the total system memory, but you can set this via the OS environment variable HUGO_MEMORYLIMIT (in gigabytes). This is backed by a partitioned LRU cache used throughout Hugo. A cache that gets dynamically resized in low memory situations, allowing Go's Garbage Collector to free the memory.
New Dependency Tracker: Hugo has had a rule based coarse grained approach to server rebuilds that has worked mostly pretty well, but there have been some surprises (e.g. stale content). This is now revamped with a new dependency tracker that can quickly calculate the delta given a changed resource (e.g. a content file, template, JS file etc.). This handles transitive relations, e.g. $page -> js.Build -> JS import, or $page1.Content -> render hook -> site.GetPage -> $page2.Title, or $page1.Content -> shortcode -> partial -> site.RegularPages -> $page2.Content -> shortcode ..., and should also handle changes to aggregated values (e.g. site.Lastmod) effectively.
This covers all of Hugo's API with 2 known exceptions (a list that may not be fully exhaustive):
Changes to files loaded with template func os.ReadFile may not be handled correctly. We recommend loading resources with resources.Get
Changes to Hugo objects (e.g. Page) passed in the template context to lang.Translate may not be detected correctly. We recommend having simple i18n templates without too much data context passed in other than simple types such as strings and numbers.
Note that the cachebuster configuration (when A changes then rebuild B) works well with the above, but we recommend that you revise that configuration, as it in most situations should not be needed. One example where it is still needed is with TailwindCSS and using changes to hugo_stats.json to trigger new CSS rebuilds.
Document Store: Previously, a little simplified, we split the document store (where we store pages and resources) in a tree per language. This worked pretty well, but the structure made some operations harder than they needed to be. We have now restructured it into one Radix tree for all languages. Internally the language is considered to be a dimension of that tree, and the tree can be viewed in all dimensions concurrently. This makes some operations re. language simpler (e.g. finding translations is just a slice range), but the idea is that it should also be relatively inexpensive to add more dimensions if needed (e.g. role).
Fixes #10169
Fixes #10364
Fixes #10482
Fixes #10630
Fixes #10656
Fixes #10694
Fixes #10918
Fixes #11262
Fixes #11439
Fixes #11453
Fixes #11457
Fixes #11466
Fixes #11540
Fixes #11551
Fixes #11556
Fixes #11654
Fixes #11661
Fixes #11663
Fixes #11664
Fixes #11669
Fixes #11671
Fixes #11807
Fixes #11808
Fixes #11809
Fixes #11815
Fixes #11840
Fixes #11853
Fixes #11860
Fixes #11883
Fixes #11904
Fixes #7388
Fixes #7425
Fixes #7436
Fixes #7544
Fixes #7882
Fixes #7960
Fixes #8255
Fixes #8307
Fixes #8863
Fixes #8927
Fixes #9192
Fixes #9324
2023-12-24 13:11:05 -05:00
|
|
|
if err := c.Fs.MkdirAll("", 0o777); err != nil && !os.IsExist(err) {
|
2023-08-30 05:05:15 -04:00
|
|
|
c.initErr = err
|
|
|
|
}
|
|
|
|
})
|
|
|
|
return c.initErr
|
|
|
|
}
|
|
|
|
|
2018-11-13 12:16:53 -05:00
|
|
|
// WriteCloser returns a transactional writer into the cache.
|
2018-11-08 04:24:13 -05:00
|
|
|
// It's important that it's closed when done.
|
|
|
|
func (c *Cache) WriteCloser(id string) (ItemInfo, io.WriteCloser, error) {
|
2023-08-30 05:05:15 -04:00
|
|
|
if err := c.init(); err != nil {
|
|
|
|
return ItemInfo{}, nil, err
|
|
|
|
}
|
|
|
|
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
|
|
|
|
info := ItemInfo{Name: id}
|
|
|
|
|
|
|
|
f, err := helpers.OpenFileForWriting(c.Fs, id)
|
|
|
|
if err != nil {
|
|
|
|
c.nlocker.Unlock(id)
|
|
|
|
return info, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return info, &lockedFile{
|
|
|
|
File: f,
|
|
|
|
unlock: func() { c.nlocker.Unlock(id) },
|
|
|
|
}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// ReadOrCreate tries to lookup the file in cache.
|
|
|
|
// If found, it is passed to read and then closed.
|
|
|
|
// If not found a new file is created and passed to create, which should close
|
|
|
|
// it when done.
|
|
|
|
func (c *Cache) ReadOrCreate(id string,
|
2019-11-25 06:49:04 -05:00
|
|
|
read func(info ItemInfo, r io.ReadSeeker) error,
|
all: Rework page store, add a dynacache, improve partial rebuilds, and some general spring cleaning
There are some breaking changes in this commit, see #11455.
Closes #11455
Closes #11549
This fixes a set of bugs (see issue list) and it is also paying some technical debt accumulated over the years. We now build with Staticcheck enabled in the CI build.
The performance should be about the same as before for regular sized Hugo sites, but it should perform and scale much better to larger data sets, as objects that uses lots of memory (e.g. rendered Markdown, big JSON files read into maps with transform.Unmarshal etc.) will now get automatically garbage collected if needed. Performance on partial rebuilds when running the server in fast render mode should be the same, but the change detection should be much more accurate.
A list of the notable new features:
* A new dependency tracker that covers (almost) all of Hugo's API and is used to do fine grained partial rebuilds when running the server.
* A new and simpler tree document store which allows fast lookups and prefix-walking in all dimensions (e.g. language) concurrently.
* You can now configure an upper memory limit allowing for much larger data sets and/or running on lower specced PCs.
We have lifted the "no resources in sub folders" restriction for branch bundles (e.g. sections).
Memory Limit
* Hugos will, by default, set aside a quarter of the total system memory, but you can set this via the OS environment variable HUGO_MEMORYLIMIT (in gigabytes). This is backed by a partitioned LRU cache used throughout Hugo. A cache that gets dynamically resized in low memory situations, allowing Go's Garbage Collector to free the memory.
New Dependency Tracker: Hugo has had a rule based coarse grained approach to server rebuilds that has worked mostly pretty well, but there have been some surprises (e.g. stale content). This is now revamped with a new dependency tracker that can quickly calculate the delta given a changed resource (e.g. a content file, template, JS file etc.). This handles transitive relations, e.g. $page -> js.Build -> JS import, or $page1.Content -> render hook -> site.GetPage -> $page2.Title, or $page1.Content -> shortcode -> partial -> site.RegularPages -> $page2.Content -> shortcode ..., and should also handle changes to aggregated values (e.g. site.Lastmod) effectively.
This covers all of Hugo's API with 2 known exceptions (a list that may not be fully exhaustive):
Changes to files loaded with template func os.ReadFile may not be handled correctly. We recommend loading resources with resources.Get
Changes to Hugo objects (e.g. Page) passed in the template context to lang.Translate may not be detected correctly. We recommend having simple i18n templates without too much data context passed in other than simple types such as strings and numbers.
Note that the cachebuster configuration (when A changes then rebuild B) works well with the above, but we recommend that you revise that configuration, as it in most situations should not be needed. One example where it is still needed is with TailwindCSS and using changes to hugo_stats.json to trigger new CSS rebuilds.
Document Store: Previously, a little simplified, we split the document store (where we store pages and resources) in a tree per language. This worked pretty well, but the structure made some operations harder than they needed to be. We have now restructured it into one Radix tree for all languages. Internally the language is considered to be a dimension of that tree, and the tree can be viewed in all dimensions concurrently. This makes some operations re. language simpler (e.g. finding translations is just a slice range), but the idea is that it should also be relatively inexpensive to add more dimensions if needed (e.g. role).
Fixes #10169
Fixes #10364
Fixes #10482
Fixes #10630
Fixes #10656
Fixes #10694
Fixes #10918
Fixes #11262
Fixes #11439
Fixes #11453
Fixes #11457
Fixes #11466
Fixes #11540
Fixes #11551
Fixes #11556
Fixes #11654
Fixes #11661
Fixes #11663
Fixes #11664
Fixes #11669
Fixes #11671
Fixes #11807
Fixes #11808
Fixes #11809
Fixes #11815
Fixes #11840
Fixes #11853
Fixes #11860
Fixes #11883
Fixes #11904
Fixes #7388
Fixes #7425
Fixes #7436
Fixes #7544
Fixes #7882
Fixes #7960
Fixes #8255
Fixes #8307
Fixes #8863
Fixes #8927
Fixes #9192
Fixes #9324
2023-12-24 13:11:05 -05:00
|
|
|
create func(info ItemInfo, w io.WriteCloser) error,
|
|
|
|
) (info ItemInfo, err error) {
|
2023-08-30 05:05:15 -04:00
|
|
|
if err := c.init(); err != nil {
|
|
|
|
return ItemInfo{}, err
|
|
|
|
}
|
|
|
|
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
defer c.nlocker.Unlock(id)
|
|
|
|
|
|
|
|
info = ItemInfo{Name: id}
|
|
|
|
|
|
|
|
if r := c.getOrRemove(id); r != nil {
|
|
|
|
err = read(info, r)
|
|
|
|
defer r.Close()
|
2019-10-21 03:37:46 -04:00
|
|
|
if err == nil || err == ErrFatal {
|
|
|
|
// See https://github.com/gohugoio/hugo/issues/6401
|
|
|
|
// To recover from file corruption we handle read errors
|
|
|
|
// as the cache item was not found.
|
|
|
|
// Any file permission issue will also fail in the next step.
|
|
|
|
return
|
|
|
|
}
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
f, err := helpers.OpenFileForWriting(c.Fs, id)
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
err = create(info, f)
|
|
|
|
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2024-05-17 11:06:47 -04:00
|
|
|
// NamedLock locks the given id. The lock is released when the returned function is called.
|
|
|
|
func (c *Cache) NamedLock(id string) func() {
|
|
|
|
id = cleanID(id)
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
return func() {
|
|
|
|
c.nlocker.Unlock(id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-08 04:24:13 -05:00
|
|
|
// GetOrCreate tries to get the file with the given id from cache. If not found or expired, create will
|
|
|
|
// be invoked and the result cached.
|
|
|
|
// This method is protected by a named lock using the given id as identifier.
|
|
|
|
func (c *Cache) GetOrCreate(id string, create func() (io.ReadCloser, error)) (ItemInfo, io.ReadCloser, error) {
|
2023-08-30 05:05:15 -04:00
|
|
|
if err := c.init(); err != nil {
|
|
|
|
return ItemInfo{}, nil, err
|
|
|
|
}
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
defer c.nlocker.Unlock(id)
|
|
|
|
|
|
|
|
info := ItemInfo{Name: id}
|
|
|
|
|
|
|
|
if r := c.getOrRemove(id); r != nil {
|
|
|
|
return info, r, nil
|
|
|
|
}
|
|
|
|
|
2021-12-02 07:31:22 -05:00
|
|
|
var (
|
|
|
|
r io.ReadCloser
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
2021-12-10 03:55:41 -05:00
|
|
|
r, err = create()
|
2018-11-08 04:24:13 -05:00
|
|
|
if err != nil {
|
|
|
|
return info, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if c.maxAge == 0 {
|
|
|
|
// No caching.
|
|
|
|
return info, hugio.ToReadCloser(r), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var buff bytes.Buffer
|
|
|
|
return info,
|
|
|
|
hugio.ToReadCloser(&buff),
|
2024-05-17 11:06:47 -04:00
|
|
|
c.writeReader(id, io.TeeReader(r, &buff))
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Cache) writeReader(id string, r io.Reader) error {
|
|
|
|
dir := filepath.Dir(id)
|
|
|
|
if dir != "" {
|
|
|
|
_ = c.Fs.MkdirAll(dir, 0o777)
|
|
|
|
}
|
|
|
|
f, err := c.Fs.Create(id)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
_, _ = io.Copy(f, r)
|
|
|
|
|
|
|
|
return nil
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// GetOrCreateBytes is the same as GetOrCreate, but produces a byte slice.
|
|
|
|
func (c *Cache) GetOrCreateBytes(id string, create func() ([]byte, error)) (ItemInfo, []byte, error) {
|
2023-08-30 05:05:15 -04:00
|
|
|
if err := c.init(); err != nil {
|
|
|
|
return ItemInfo{}, nil, err
|
|
|
|
}
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
defer c.nlocker.Unlock(id)
|
|
|
|
|
|
|
|
info := ItemInfo{Name: id}
|
|
|
|
|
|
|
|
if r := c.getOrRemove(id); r != nil {
|
|
|
|
defer r.Close()
|
2023-02-18 17:43:26 -05:00
|
|
|
b, err := io.ReadAll(r)
|
2018-11-08 04:24:13 -05:00
|
|
|
return info, b, err
|
|
|
|
}
|
|
|
|
|
2021-12-02 07:31:22 -05:00
|
|
|
var (
|
|
|
|
b []byte
|
|
|
|
err error
|
|
|
|
)
|
|
|
|
|
2021-12-10 03:55:41 -05:00
|
|
|
b, err = create()
|
2018-11-08 04:24:13 -05:00
|
|
|
if err != nil {
|
|
|
|
return info, nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if c.maxAge == 0 {
|
|
|
|
return info, b, nil
|
|
|
|
}
|
|
|
|
|
2024-05-17 11:06:47 -04:00
|
|
|
if err := c.writeReader(id, bytes.NewReader(b)); err != nil {
|
2018-11-08 04:24:13 -05:00
|
|
|
return info, nil, err
|
|
|
|
}
|
2024-05-17 11:06:47 -04:00
|
|
|
|
2018-11-08 04:24:13 -05:00
|
|
|
return info, b, nil
|
|
|
|
}
|
|
|
|
|
2020-12-16 06:11:32 -05:00
|
|
|
// GetBytes gets the file content with the given id from the cache, nil if none found.
|
2018-11-08 04:24:13 -05:00
|
|
|
func (c *Cache) GetBytes(id string) (ItemInfo, []byte, error) {
|
2023-08-30 05:05:15 -04:00
|
|
|
if err := c.init(); err != nil {
|
|
|
|
return ItemInfo{}, nil, err
|
|
|
|
}
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
defer c.nlocker.Unlock(id)
|
|
|
|
|
|
|
|
info := ItemInfo{Name: id}
|
|
|
|
|
|
|
|
if r := c.getOrRemove(id); r != nil {
|
|
|
|
defer r.Close()
|
2023-02-18 17:43:26 -05:00
|
|
|
b, err := io.ReadAll(r)
|
2018-11-08 04:24:13 -05:00
|
|
|
return info, b, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return info, nil, nil
|
|
|
|
}
|
|
|
|
|
2023-02-18 15:47:35 -05:00
|
|
|
// Get gets the file with the given id from the cache, nil if none found.
|
2018-11-08 04:24:13 -05:00
|
|
|
func (c *Cache) Get(id string) (ItemInfo, io.ReadCloser, error) {
|
2023-08-30 05:05:15 -04:00
|
|
|
if err := c.init(); err != nil {
|
|
|
|
return ItemInfo{}, nil, err
|
|
|
|
}
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
defer c.nlocker.Unlock(id)
|
|
|
|
|
|
|
|
info := ItemInfo{Name: id}
|
|
|
|
|
|
|
|
r := c.getOrRemove(id)
|
|
|
|
|
|
|
|
return info, r, nil
|
|
|
|
}
|
|
|
|
|
2018-11-13 12:16:53 -05:00
|
|
|
// getOrRemove gets the file with the given id. If it's expired, it will
|
2018-11-08 04:24:13 -05:00
|
|
|
// be removed.
|
|
|
|
func (c *Cache) getOrRemove(id string) hugio.ReadSeekCloser {
|
|
|
|
if c.maxAge == 0 {
|
|
|
|
// No caching.
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2024-05-17 11:06:47 -04:00
|
|
|
if removed, err := c.removeIfExpired(id); err != nil || removed {
|
|
|
|
return nil
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
f, err := c.Fs.Open(id)
|
|
|
|
if err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return f
|
|
|
|
}
|
|
|
|
|
2024-05-17 11:06:47 -04:00
|
|
|
func (c *Cache) getBytesAndRemoveIfExpired(id string) ([]byte, bool) {
|
|
|
|
if c.maxAge == 0 {
|
|
|
|
// No caching.
|
|
|
|
return nil, false
|
|
|
|
}
|
|
|
|
|
|
|
|
f, err := c.Fs.Open(id)
|
|
|
|
if err != nil {
|
|
|
|
return nil, false
|
|
|
|
}
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
b, err := io.ReadAll(f)
|
|
|
|
if err != nil {
|
|
|
|
return nil, false
|
|
|
|
}
|
|
|
|
|
|
|
|
removed, err := c.removeIfExpired(id)
|
|
|
|
if err != nil {
|
|
|
|
return nil, false
|
|
|
|
}
|
|
|
|
|
|
|
|
return b, removed
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Cache) removeIfExpired(id string) (bool, error) {
|
|
|
|
if c.maxAge <= 0 {
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
fi, err := c.Fs.Stat(id)
|
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if c.isExpired(fi.ModTime()) {
|
|
|
|
c.Fs.Remove(id)
|
|
|
|
return true, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
return false, nil
|
|
|
|
}
|
|
|
|
|
2018-11-14 06:06:46 -05:00
|
|
|
func (c *Cache) isExpired(modTime time.Time) bool {
|
2018-11-14 11:18:32 -05:00
|
|
|
if c.maxAge < 0 {
|
|
|
|
return false
|
|
|
|
}
|
2022-05-09 04:05:19 -04:00
|
|
|
|
|
|
|
// Note the use of time.Since here.
|
|
|
|
// We cannot use Hugo's global Clock for this.
|
|
|
|
return c.maxAge == 0 || time.Since(modTime) > c.maxAge
|
2018-11-14 06:06:46 -05:00
|
|
|
}
|
|
|
|
|
2018-11-08 04:24:13 -05:00
|
|
|
// For testing
|
2023-01-04 12:24:36 -05:00
|
|
|
func (c *Cache) GetString(id string) string {
|
2018-11-08 04:24:13 -05:00
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
c.nlocker.Lock(id)
|
|
|
|
defer c.nlocker.Unlock(id)
|
|
|
|
|
2018-11-14 06:06:46 -05:00
|
|
|
f, err := c.Fs.Open(id)
|
|
|
|
if err != nil {
|
|
|
|
return ""
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
2018-11-14 06:06:46 -05:00
|
|
|
defer f.Close()
|
2018-11-08 04:24:13 -05:00
|
|
|
|
2023-02-18 17:43:26 -05:00
|
|
|
b, _ := io.ReadAll(f)
|
2018-11-14 06:06:46 -05:00
|
|
|
return string(b)
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Caches is a named set of caches.
|
|
|
|
type Caches map[string]*Cache
|
|
|
|
|
|
|
|
// Get gets a named cache, nil if none found.
|
|
|
|
func (f Caches) Get(name string) *Cache {
|
|
|
|
return f[strings.ToLower(name)]
|
|
|
|
}
|
|
|
|
|
2018-11-23 03:16:42 -05:00
|
|
|
// NewCaches creates a new set of file caches from the given
|
2018-11-08 04:24:13 -05:00
|
|
|
// configuration.
|
2018-11-23 03:16:42 -05:00
|
|
|
func NewCaches(p *helpers.PathSpec) (Caches, error) {
|
2023-01-04 12:24:36 -05:00
|
|
|
dcfg := p.Cfg.GetConfigSection("caches").(Configs)
|
2018-11-08 04:24:13 -05:00
|
|
|
fs := p.Fs.Source
|
|
|
|
|
|
|
|
m := make(Caches)
|
|
|
|
for k, v := range dcfg {
|
2018-11-23 03:16:42 -05:00
|
|
|
var cfs afero.Fs
|
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
if v.IsResourceDir {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
cfs = p.BaseFs.ResourcesCache
|
2018-11-23 03:16:42 -05:00
|
|
|
} else {
|
|
|
|
cfs = fs
|
|
|
|
}
|
|
|
|
|
2019-07-30 03:14:14 -04:00
|
|
|
if cfs == nil {
|
2023-01-04 12:24:36 -05:00
|
|
|
panic("nil fs")
|
2019-07-30 03:14:14 -04:00
|
|
|
}
|
|
|
|
|
2023-01-04 12:24:36 -05:00
|
|
|
baseDir := v.DirCompiled
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
|
all: Rework page store, add a dynacache, improve partial rebuilds, and some general spring cleaning
There are some breaking changes in this commit, see #11455.
Closes #11455
Closes #11549
This fixes a set of bugs (see issue list) and it is also paying some technical debt accumulated over the years. We now build with Staticcheck enabled in the CI build.
The performance should be about the same as before for regular sized Hugo sites, but it should perform and scale much better to larger data sets, as objects that uses lots of memory (e.g. rendered Markdown, big JSON files read into maps with transform.Unmarshal etc.) will now get automatically garbage collected if needed. Performance on partial rebuilds when running the server in fast render mode should be the same, but the change detection should be much more accurate.
A list of the notable new features:
* A new dependency tracker that covers (almost) all of Hugo's API and is used to do fine grained partial rebuilds when running the server.
* A new and simpler tree document store which allows fast lookups and prefix-walking in all dimensions (e.g. language) concurrently.
* You can now configure an upper memory limit allowing for much larger data sets and/or running on lower specced PCs.
We have lifted the "no resources in sub folders" restriction for branch bundles (e.g. sections).
Memory Limit
* Hugos will, by default, set aside a quarter of the total system memory, but you can set this via the OS environment variable HUGO_MEMORYLIMIT (in gigabytes). This is backed by a partitioned LRU cache used throughout Hugo. A cache that gets dynamically resized in low memory situations, allowing Go's Garbage Collector to free the memory.
New Dependency Tracker: Hugo has had a rule based coarse grained approach to server rebuilds that has worked mostly pretty well, but there have been some surprises (e.g. stale content). This is now revamped with a new dependency tracker that can quickly calculate the delta given a changed resource (e.g. a content file, template, JS file etc.). This handles transitive relations, e.g. $page -> js.Build -> JS import, or $page1.Content -> render hook -> site.GetPage -> $page2.Title, or $page1.Content -> shortcode -> partial -> site.RegularPages -> $page2.Content -> shortcode ..., and should also handle changes to aggregated values (e.g. site.Lastmod) effectively.
This covers all of Hugo's API with 2 known exceptions (a list that may not be fully exhaustive):
Changes to files loaded with template func os.ReadFile may not be handled correctly. We recommend loading resources with resources.Get
Changes to Hugo objects (e.g. Page) passed in the template context to lang.Translate may not be detected correctly. We recommend having simple i18n templates without too much data context passed in other than simple types such as strings and numbers.
Note that the cachebuster configuration (when A changes then rebuild B) works well with the above, but we recommend that you revise that configuration, as it in most situations should not be needed. One example where it is still needed is with TailwindCSS and using changes to hugo_stats.json to trigger new CSS rebuilds.
Document Store: Previously, a little simplified, we split the document store (where we store pages and resources) in a tree per language. This worked pretty well, but the structure made some operations harder than they needed to be. We have now restructured it into one Radix tree for all languages. Internally the language is considered to be a dimension of that tree, and the tree can be viewed in all dimensions concurrently. This makes some operations re. language simpler (e.g. finding translations is just a slice range), but the idea is that it should also be relatively inexpensive to add more dimensions if needed (e.g. role).
Fixes #10169
Fixes #10364
Fixes #10482
Fixes #10630
Fixes #10656
Fixes #10694
Fixes #10918
Fixes #11262
Fixes #11439
Fixes #11453
Fixes #11457
Fixes #11466
Fixes #11540
Fixes #11551
Fixes #11556
Fixes #11654
Fixes #11661
Fixes #11663
Fixes #11664
Fixes #11669
Fixes #11671
Fixes #11807
Fixes #11808
Fixes #11809
Fixes #11815
Fixes #11840
Fixes #11853
Fixes #11860
Fixes #11883
Fixes #11904
Fixes #7388
Fixes #7425
Fixes #7436
Fixes #7544
Fixes #7882
Fixes #7960
Fixes #8255
Fixes #8307
Fixes #8863
Fixes #8927
Fixes #9192
Fixes #9324
2023-12-24 13:11:05 -05:00
|
|
|
bfs := hugofs.NewBasePathFs(cfs, baseDir)
|
2018-11-23 03:16:42 -05:00
|
|
|
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
var pruneAllRootDir string
|
2023-01-04 12:24:36 -05:00
|
|
|
if k == CacheKeyModules {
|
Add Hugo Modules
This commit implements Hugo Modules.
This is a broad subject, but some keywords include:
* A new `module` configuration section where you can import almost anything. You can configure both your own file mounts nd the file mounts of the modules you import. This is the new recommended way of configuring what you earlier put in `configDir`, `staticDir` etc. And it also allows you to mount folders in non-Hugo-projects, e.g. the `SCSS` folder in the Bootstrap GitHub project.
* A module consists of a set of mounts to the standard 7 component types in Hugo: `static`, `content`, `layouts`, `data`, `assets`, `i18n`, and `archetypes`. Yes, Theme Components can now include content, which should be very useful, especially in bigger multilingual projects.
* Modules not in your local file cache will be downloaded automatically and even "hot replaced" while the server is running.
* Hugo Modules supports and encourages semver versioned modules, and uses the minimal version selection algorithm to resolve versions.
* A new set of CLI commands are provided to manage all of this: `hugo mod init`, `hugo mod get`, `hugo mod graph`, `hugo mod tidy`, and `hugo mod vendor`.
All of the above is backed by Go Modules.
Fixes #5973
Fixes #5996
Fixes #6010
Fixes #5911
Fixes #5940
Fixes #6074
Fixes #6082
Fixes #6092
2019-05-03 03:16:58 -04:00
|
|
|
pruneAllRootDir = "pkg"
|
|
|
|
}
|
|
|
|
|
2021-12-10 03:55:41 -05:00
|
|
|
m[k] = NewCache(bfs, v.MaxAge, pruneAllRootDir)
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return m, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func cleanID(name string) string {
|
2018-11-14 06:06:46 -05:00
|
|
|
return strings.TrimPrefix(filepath.Clean(name), helpers.FilePathSeparator)
|
2018-11-08 04:24:13 -05:00
|
|
|
}
|
2024-05-17 11:06:47 -04:00
|
|
|
|
|
|
|
// AsHTTPCache returns an httpcache.Cache implementation for this file cache.
|
|
|
|
// Note that none of the methods are protected by named locks, so you need to make sure
|
|
|
|
// to do that in your own code.
|
|
|
|
func (c *Cache) AsHTTPCache() httpcache.Cache {
|
|
|
|
return &httpCache{c: c}
|
|
|
|
}
|
|
|
|
|
|
|
|
type httpCache struct {
|
|
|
|
c *Cache
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *httpCache) Get(id string) (resp []byte, ok bool) {
|
|
|
|
id = cleanID(id)
|
|
|
|
b, removed := h.c.getBytesAndRemoveIfExpired(id)
|
|
|
|
|
|
|
|
return b, !removed
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *httpCache) Set(id string, resp []byte) {
|
|
|
|
if h.c.maxAge == 0 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
id = cleanID(id)
|
|
|
|
|
|
|
|
if err := h.c.writeReader(id, bytes.NewReader(resp)); err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *httpCache) Delete(key string) {
|
|
|
|
h.c.Fs.Remove(key)
|
|
|
|
}
|