mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
597e418cb0
The main motivation of this commit is to add a `page.Page` interface to replace the very file-oriented `hugolib.Page` struct. This is all a preparation step for issue #5074, "pages from other data sources". But this also fixes a set of annoying limitations, especially related to custom output formats, and shortcodes. Most notable changes: * The inner content of shortcodes using the `{{%` as the outer-most delimiter will now be sent to the content renderer, e.g. Blackfriday. This means that any markdown will partake in the global ToC and footnote context etc. * The Custom Output formats are now "fully virtualized". This removes many of the current limitations. * The taxonomy list type now has a reference to the `Page` object. This improves the taxonomy template `.Title` situation and make common template constructs much simpler. See #5074 Fixes #5763 Fixes #5758 Fixes #5090 Fixes #5204 Fixes #4695 Fixes #5607 Fixes #5707 Fixes #5719 Fixes #3113 Fixes #5706 Fixes #5767 Fixes #5723 Fixes #5769 Fixes #5770 Fixes #5771 Fixes #5759 Fixes #5776 Fixes #5777 Fixes #5778
308 lines
6.9 KiB
Go
308 lines
6.9 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 related
|
|
|
|
import (
|
|
"fmt"
|
|
"math/rand"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
type testDoc struct {
|
|
keywords map[string][]Keyword
|
|
date time.Time
|
|
name string
|
|
}
|
|
|
|
func (d *testDoc) String() string {
|
|
s := "\n"
|
|
for k, v := range d.keywords {
|
|
s += k + ":\t\t"
|
|
for _, vv := range v {
|
|
s += " " + vv.String()
|
|
}
|
|
s += "\n"
|
|
}
|
|
return s
|
|
}
|
|
|
|
func (d *testDoc) Name() string {
|
|
return d.name
|
|
}
|
|
|
|
func newTestDoc(name string, keywords ...string) *testDoc {
|
|
time.Sleep(1 * time.Millisecond)
|
|
return newTestDocWithDate(name, time.Now(), keywords...)
|
|
}
|
|
|
|
func newTestDocWithDate(name string, date time.Time, keywords ...string) *testDoc {
|
|
km := make(map[string][]Keyword)
|
|
|
|
kw := &testDoc{keywords: km, date: date}
|
|
|
|
kw.addKeywords(name, keywords...)
|
|
return kw
|
|
}
|
|
|
|
func (d *testDoc) addKeywords(name string, keywords ...string) *testDoc {
|
|
keywordm := createTestKeywords(name, keywords...)
|
|
|
|
for k, v := range keywordm {
|
|
keywords := make([]Keyword, len(v))
|
|
for i := 0; i < len(v); i++ {
|
|
keywords[i] = StringKeyword(v[i])
|
|
}
|
|
d.keywords[k] = keywords
|
|
}
|
|
return d
|
|
}
|
|
|
|
func createTestKeywords(name string, keywords ...string) map[string][]string {
|
|
return map[string][]string{
|
|
name: keywords,
|
|
}
|
|
}
|
|
|
|
func (d *testDoc) RelatedKeywords(cfg IndexConfig) ([]Keyword, error) {
|
|
return d.keywords[cfg.Name], nil
|
|
}
|
|
|
|
func (d *testDoc) PublishDate() time.Time {
|
|
return d.date
|
|
}
|
|
|
|
func TestSearch(t *testing.T) {
|
|
|
|
config := Config{
|
|
Threshold: 90,
|
|
IncludeNewer: false,
|
|
Indices: IndexConfigs{
|
|
IndexConfig{Name: "tags", Weight: 50},
|
|
IndexConfig{Name: "keywords", Weight: 65},
|
|
},
|
|
}
|
|
|
|
idx := NewInvertedIndex(config)
|
|
//idx.debug = true
|
|
|
|
docs := []Document{
|
|
newTestDoc("tags", "a", "b", "c", "d"),
|
|
newTestDoc("tags", "b", "d", "g"),
|
|
newTestDoc("tags", "b", "h").addKeywords("keywords", "a"),
|
|
newTestDoc("tags", "g", "h").addKeywords("keywords", "a", "b"),
|
|
}
|
|
|
|
idx.Add(docs...)
|
|
|
|
t.Run("count", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
assert.Len(idx.index, 2)
|
|
set1, found := idx.index["tags"]
|
|
assert.True(found)
|
|
// 6 tags
|
|
assert.Len(set1, 6)
|
|
|
|
set2, found := idx.index["keywords"]
|
|
assert.True(found)
|
|
assert.Len(set2, 2)
|
|
|
|
})
|
|
|
|
t.Run("search-tags", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
m, err := idx.search(newQueryElement("tags", StringsToKeywords("a", "b", "d", "z")...))
|
|
assert.NoError(err)
|
|
assert.Len(m, 2)
|
|
assert.Equal(docs[0], m[0])
|
|
assert.Equal(docs[1], m[1])
|
|
})
|
|
|
|
t.Run("search-tags-and-keywords", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
m, err := idx.search(
|
|
newQueryElement("tags", StringsToKeywords("a", "b", "z")...),
|
|
newQueryElement("keywords", StringsToKeywords("a", "b")...))
|
|
assert.NoError(err)
|
|
assert.Len(m, 3)
|
|
assert.Equal(docs[3], m[0])
|
|
assert.Equal(docs[2], m[1])
|
|
assert.Equal(docs[0], m[2])
|
|
})
|
|
|
|
t.Run("searchdoc-all", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
doc := newTestDoc("tags", "a").addKeywords("keywords", "a")
|
|
m, err := idx.SearchDoc(doc)
|
|
assert.NoError(err)
|
|
assert.Len(m, 2)
|
|
assert.Equal(docs[3], m[0])
|
|
assert.Equal(docs[2], m[1])
|
|
})
|
|
|
|
t.Run("searchdoc-tags", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
doc := newTestDoc("tags", "a", "b", "d", "z").addKeywords("keywords", "a", "b")
|
|
m, err := idx.SearchDoc(doc, "tags")
|
|
assert.NoError(err)
|
|
assert.Len(m, 2)
|
|
assert.Equal(docs[0], m[0])
|
|
assert.Equal(docs[1], m[1])
|
|
})
|
|
|
|
t.Run("searchdoc-keywords-date", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
doc := newTestDoc("tags", "a", "b", "d", "z").addKeywords("keywords", "a", "b")
|
|
// This will get a date newer than the others.
|
|
newDoc := newTestDoc("keywords", "a", "b")
|
|
idx.Add(newDoc)
|
|
|
|
m, err := idx.SearchDoc(doc, "keywords")
|
|
assert.NoError(err)
|
|
assert.Len(m, 2)
|
|
assert.Equal(docs[3], m[0])
|
|
})
|
|
|
|
t.Run("searchdoc-keywords-same-date", func(t *testing.T) {
|
|
assert := require.New(t)
|
|
idx := NewInvertedIndex(config)
|
|
|
|
date := time.Now()
|
|
|
|
doc := newTestDocWithDate("keywords", date, "a", "b")
|
|
doc.name = "thedoc"
|
|
|
|
for i := 0; i < 10; i++ {
|
|
docc := *doc
|
|
docc.name = fmt.Sprintf("doc%d", i)
|
|
idx.Add(&docc)
|
|
}
|
|
|
|
m, err := idx.SearchDoc(doc, "keywords")
|
|
assert.NoError(err)
|
|
assert.Len(m, 10)
|
|
for i := 0; i < 10; i++ {
|
|
assert.Equal(fmt.Sprintf("doc%d", i), m[i].Name())
|
|
}
|
|
})
|
|
|
|
}
|
|
|
|
func BenchmarkRelatedNewIndex(b *testing.B) {
|
|
|
|
pages := make([]*testDoc, 100)
|
|
numkeywords := 30
|
|
allKeywords := make([]string, numkeywords)
|
|
for i := 0; i < numkeywords; i++ {
|
|
allKeywords[i] = fmt.Sprintf("keyword%d", i+1)
|
|
}
|
|
|
|
for i := 0; i < len(pages); i++ {
|
|
start := rand.Intn(len(allKeywords))
|
|
end := start + 3
|
|
if end >= len(allKeywords) {
|
|
end = start + 1
|
|
}
|
|
|
|
kw := newTestDoc("tags", allKeywords[start:end]...)
|
|
if i%5 == 0 {
|
|
start := rand.Intn(len(allKeywords))
|
|
end := start + 3
|
|
if end >= len(allKeywords) {
|
|
end = start + 1
|
|
}
|
|
kw.addKeywords("keywords", allKeywords[start:end]...)
|
|
}
|
|
|
|
pages[i] = kw
|
|
}
|
|
|
|
cfg := Config{
|
|
Threshold: 50,
|
|
Indices: IndexConfigs{
|
|
IndexConfig{Name: "tags", Weight: 100},
|
|
IndexConfig{Name: "keywords", Weight: 200},
|
|
},
|
|
}
|
|
|
|
b.Run("singles", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
idx := NewInvertedIndex(cfg)
|
|
for _, doc := range pages {
|
|
idx.Add(doc)
|
|
}
|
|
}
|
|
})
|
|
|
|
b.Run("all", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
idx := NewInvertedIndex(cfg)
|
|
docs := make([]Document, len(pages))
|
|
for i := 0; i < len(pages); i++ {
|
|
docs[i] = pages[i]
|
|
}
|
|
idx.Add(docs...)
|
|
}
|
|
})
|
|
|
|
}
|
|
|
|
func BenchmarkRelatedMatchesIn(b *testing.B) {
|
|
|
|
q1 := newQueryElement("tags", StringsToKeywords("keyword2", "keyword5", "keyword32", "asdf")...)
|
|
q2 := newQueryElement("keywords", StringsToKeywords("keyword3", "keyword4")...)
|
|
|
|
docs := make([]*testDoc, 1000)
|
|
numkeywords := 20
|
|
allKeywords := make([]string, numkeywords)
|
|
for i := 0; i < numkeywords; i++ {
|
|
allKeywords[i] = fmt.Sprintf("keyword%d", i+1)
|
|
}
|
|
|
|
cfg := Config{
|
|
Threshold: 20,
|
|
Indices: IndexConfigs{
|
|
IndexConfig{Name: "tags", Weight: 100},
|
|
IndexConfig{Name: "keywords", Weight: 200},
|
|
},
|
|
}
|
|
|
|
idx := NewInvertedIndex(cfg)
|
|
|
|
for i := 0; i < len(docs); i++ {
|
|
start := rand.Intn(len(allKeywords))
|
|
end := start + 3
|
|
if end >= len(allKeywords) {
|
|
end = start + 1
|
|
}
|
|
|
|
index := "tags"
|
|
if i%5 == 0 {
|
|
index = "keywords"
|
|
}
|
|
|
|
idx.Add(newTestDoc(index, allKeywords[start:end]...))
|
|
}
|
|
|
|
b.ResetTimer()
|
|
for i := 0; i < b.N; i++ {
|
|
if i%10 == 0 {
|
|
idx.search(q2)
|
|
} else {
|
|
idx.search(q1)
|
|
}
|
|
}
|
|
}
|