mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-25 01:12:39 +00:00
022c479551
This commit started out investigating a `concurrent map read write` issue, ending by replacing the map with a struct. This is easier to reason about, and it's more effective: ``` name old time/op new time/op delta SiteNew/Regular_Deep_content_tree-16 71.5ms ± 3% 69.4ms ± 5% ~ (p=0.200 n=4+4) name old alloc/op new alloc/op delta SiteNew/Regular_Deep_content_tree-16 29.7MB ± 0% 27.9MB ± 0% -5.82% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Regular_Deep_content_tree-16 313k ± 0% 303k ± 0% -3.35% (p=0.029 n=4+4) ``` See #8749
60 lines
1.7 KiB
Go
60 lines
1.7 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 hugofs
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/spf13/afero"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
)
|
|
|
|
func TestGlob(t *testing.T) {
|
|
c := qt.New(t)
|
|
|
|
fs := NewBaseFileDecorator(afero.NewMemMapFs())
|
|
|
|
create := func(filename string) {
|
|
err := afero.WriteFile(fs, filepath.FromSlash(filename), []byte("content "+filename), 0777)
|
|
c.Assert(err, qt.IsNil)
|
|
}
|
|
|
|
collect := func(pattern string) []string {
|
|
var paths []string
|
|
h := func(fi FileMetaInfo) (bool, error) {
|
|
paths = append(paths, fi.Meta().Path)
|
|
return false, nil
|
|
}
|
|
err := Glob(fs, pattern, h)
|
|
c.Assert(err, qt.IsNil)
|
|
return paths
|
|
}
|
|
|
|
create("root.json")
|
|
create("jsonfiles/d1.json")
|
|
create("jsonfiles/d2.json")
|
|
create("jsonfiles/sub/d3.json")
|
|
create("jsonfiles/d1.xml")
|
|
create("a/b/c/e/f.json")
|
|
|
|
c.Assert(collect("**.json"), qt.HasLen, 5)
|
|
c.Assert(collect("**"), qt.HasLen, 6)
|
|
c.Assert(collect(""), qt.HasLen, 0)
|
|
c.Assert(collect("jsonfiles/*.json"), qt.HasLen, 2)
|
|
c.Assert(collect("*.json"), qt.HasLen, 1)
|
|
c.Assert(collect("**.xml"), qt.HasLen, 1)
|
|
c.Assert(collect(filepath.FromSlash("/jsonfiles/*.json")), qt.HasLen, 2)
|
|
}
|