mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-27 07:21:54 +00:00
4576c82ed4
The isolated benchmark for the function is obviously much faster: ```bash name old time/op new time/op delta GetMethodByName-10 1.21µs ± 7% 0.23µs ± 5% -81.42% (p=0.029 n=4+4) name old alloc/op new alloc/op delta GetMethodByName-10 680B ± 0% 0B -100.00% (p=0.029 n=4+4) name old allocs/op new allocs/op delta GetMethodByName-10 20.0 ± 0% 0.0 -100.00% (p=0.029 n=4+4) ``` But more pleasing is the overall performance looking at the site benchmarks: ```bash name old time/op new time/op delta SiteNew/Regular_Bundle_with_image-10 6.25ms ± 2% 6.10ms ± 2% ~ (p=0.057 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 6.30ms ± 2% 5.66ms ±11% ~ (p=0.057 n=4+4) SiteNew/Regular_Tags_and_categories-10 22.2ms ± 2% 17.4ms ± 1% -21.88% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 108ms ± 0% 107ms ± 0% -1.20% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 36.1ms ± 1% 33.8ms ± 1% -6.44% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 24.9ms ± 1% 22.6ms ± 1% -9.30% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 17.9ms ± 1% 16.7ms ± 1% -6.43% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 23.3ms ± 1% 22.0ms ± 0% -5.58% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 8.00ms ± 1% 7.63ms ± 0% -4.62% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Regular_Bundle_with_image-10 2.10MB ± 0% 2.07MB ± 0% -1.46% (p=0.029 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 1.88MB ± 0% 1.85MB ± 0% -1.76% (p=0.029 n=4+4) SiteNew/Regular_Tags_and_categories-10 13.5MB ± 0% 11.6MB ± 0% -13.99% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 96.1MB ± 0% 95.8MB ± 0% -0.40% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 28.4MB ± 0% 27.3MB ± 0% -3.83% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 16.9MB ± 0% 15.1MB ± 0% -10.58% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 8.98MB ± 0% 8.44MB ± 0% -6.04% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 17.1MB ± 0% 16.5MB ± 0% -3.91% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 3.92MB ± 0% 3.72MB ± 0% -5.03% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Regular_Bundle_with_image-10 25.8k ± 0% 24.9k ± 0% -3.49% (p=0.029 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 25.8k ± 0% 24.9k ± 0% -3.49% (p=0.029 n=4+4) SiteNew/Regular_Tags_and_categories-10 288k ± 0% 233k ± 0% -18.90% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 375k ± 0% 364k ± 0% -2.80% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 314k ± 0% 283k ± 0% -9.77% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 302k ± 0% 252k ± 0% -16.55% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 133k ± 0% 117k ± 0% -11.81% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 202k ± 0% 183k ± 0% -9.55% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 55.6k ± 0% 49.8k ± 0% -10.40% (p=0.029 n=4+4) ``` Thanks to @quasilyte for the suggestion. Fixes 9386
181 lines
4.7 KiB
Go
181 lines
4.7 KiB
Go
// Copyright 2020 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 postpub
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/spf13/cast"
|
|
|
|
"github.com/gohugoio/hugo/common/hreflect"
|
|
"github.com/gohugoio/hugo/common/maps"
|
|
"github.com/gohugoio/hugo/media"
|
|
"github.com/gohugoio/hugo/resources/resource"
|
|
)
|
|
|
|
type PostPublishedResource interface {
|
|
resource.ResourceTypeProvider
|
|
resource.ResourceLinksProvider
|
|
resource.ResourceMetaProvider
|
|
resource.ResourceParamsProvider
|
|
resource.ResourceDataProvider
|
|
resource.OriginProvider
|
|
|
|
MediaType() map[string]interface{}
|
|
}
|
|
|
|
const (
|
|
PostProcessPrefix = "__h_pp_l1"
|
|
|
|
// The suffix has an '=' in it to prevent the minifier to remove any enclosing
|
|
// quoutes around the attribute values.
|
|
// See issue #8884.
|
|
PostProcessSuffix = "__e="
|
|
)
|
|
|
|
func NewPostPublishResource(id int, r resource.Resource) PostPublishedResource {
|
|
return &PostPublishResource{
|
|
prefix: PostProcessPrefix + "_" + strconv.Itoa(id) + "_",
|
|
delegate: r,
|
|
}
|
|
}
|
|
|
|
// postPublishResource holds a Resource to be transformed post publishing.
|
|
type PostPublishResource struct {
|
|
prefix string
|
|
delegate resource.Resource
|
|
}
|
|
|
|
func (r *PostPublishResource) field(name string) string {
|
|
return r.prefix + name + PostProcessSuffix
|
|
}
|
|
|
|
func (r *PostPublishResource) Permalink() string {
|
|
return r.field("Permalink")
|
|
}
|
|
|
|
func (r *PostPublishResource) RelPermalink() string {
|
|
return r.field("RelPermalink")
|
|
}
|
|
|
|
func (r *PostPublishResource) Origin() resource.Resource {
|
|
return r.delegate
|
|
}
|
|
|
|
func (r *PostPublishResource) GetFieldString(pattern string) (string, bool) {
|
|
if r == nil {
|
|
panic("resource is nil")
|
|
}
|
|
prefixIdx := strings.Index(pattern, r.prefix)
|
|
if prefixIdx == -1 {
|
|
// Not a method on this resource.
|
|
return "", false
|
|
}
|
|
|
|
fieldAccessor := pattern[prefixIdx+len(r.prefix) : strings.Index(pattern, PostProcessSuffix)]
|
|
|
|
d := r.delegate
|
|
switch {
|
|
case fieldAccessor == "RelPermalink":
|
|
return d.RelPermalink(), true
|
|
case fieldAccessor == "Permalink":
|
|
return d.Permalink(), true
|
|
case fieldAccessor == "Name":
|
|
return d.Name(), true
|
|
case fieldAccessor == "Title":
|
|
return d.Title(), true
|
|
case fieldAccessor == "ResourceType":
|
|
return d.ResourceType(), true
|
|
case fieldAccessor == "Content":
|
|
content, err := d.(resource.ContentProvider).Content()
|
|
if err != nil {
|
|
return "", true
|
|
}
|
|
return cast.ToString(content), true
|
|
case strings.HasPrefix(fieldAccessor, "MediaType"):
|
|
return r.fieldToString(d.MediaType(), fieldAccessor), true
|
|
case fieldAccessor == "Data.Integrity":
|
|
return cast.ToString((d.Data().(map[string]interface{})["Integrity"])), true
|
|
default:
|
|
panic(fmt.Sprintf("unknown field accessor %q", fieldAccessor))
|
|
}
|
|
}
|
|
|
|
func (r *PostPublishResource) fieldToString(receiver interface{}, path string) string {
|
|
fieldname := strings.Split(path, ".")[1]
|
|
|
|
receiverv := reflect.ValueOf(receiver)
|
|
switch receiverv.Kind() {
|
|
case reflect.Map:
|
|
v := receiverv.MapIndex(reflect.ValueOf(fieldname))
|
|
return cast.ToString(v.Interface())
|
|
default:
|
|
v := receiverv.FieldByName(fieldname)
|
|
if !v.IsValid() {
|
|
method := hreflect.GetMethodByName(receiverv, fieldname)
|
|
if method.IsValid() {
|
|
vals := method.Call(nil)
|
|
if len(vals) > 0 {
|
|
v = vals[0]
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
if v.IsValid() {
|
|
return cast.ToString(v.Interface())
|
|
}
|
|
return ""
|
|
}
|
|
}
|
|
|
|
func (r *PostPublishResource) Data() interface{} {
|
|
m := map[string]interface{}{
|
|
"Integrity": "",
|
|
}
|
|
insertFieldPlaceholders("Data", m, r.field)
|
|
return m
|
|
}
|
|
|
|
func (r *PostPublishResource) MediaType() map[string]interface{} {
|
|
m := structToMapWithPlaceholders("MediaType", media.Type{}, r.field)
|
|
return m
|
|
}
|
|
|
|
func (r *PostPublishResource) ResourceType() string {
|
|
return r.field("ResourceType")
|
|
}
|
|
|
|
func (r *PostPublishResource) Name() string {
|
|
return r.field("Name")
|
|
}
|
|
|
|
func (r *PostPublishResource) Title() string {
|
|
return r.field("Title")
|
|
}
|
|
|
|
func (r *PostPublishResource) Params() maps.Params {
|
|
panic(r.fieldNotSupported("Params"))
|
|
}
|
|
|
|
func (r *PostPublishResource) Content() (interface{}, error) {
|
|
return r.field("Content"), nil
|
|
}
|
|
|
|
func (r *PostPublishResource) fieldNotSupported(name string) string {
|
|
return fmt.Sprintf("method .%s is currently not supported in post-publish transformations.", name)
|
|
}
|