Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 15:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-11-21 10:40:42 +08:00
commit 79d3a3e7db
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/model/search.go
View file

@ -378,7 +378,12 @@ func fullTextSearchCount(query, box, path, filter string) (matchedBlockCount, ma
return
}
stmt := "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM `blocks_fts` WHERE `blocks_fts` MATCH '" + columnFilter() + ":(" + query + ")' AND type IN " + filter
table := "blocks_fts" // 大小写敏感
if !Conf.Search.CaseSensitive {
table = "blocks_fts_case_insensitive"
}
stmt := "SELECT COUNT(id) AS `matches`, COUNT(DISTINCT(root_id)) AS `docs` FROM `" + table + "` WHERE `" + table + "` MATCH '" + columnFilter() + ":(" + query + ")' AND type IN " + filter
if "" != box {
stmt += " AND box = '" + box + "'"
}

1
kernel/sql/block_query.go
View file

@ -502,6 +502,7 @@ func scanBlockRow(row *sql.Row) (ret *Block) {
return
}
ret = &block
putBlockCache(ret)
return
}

10
kernel/sql/cache.go
View file

@ -23,7 +23,9 @@ import (
"github.com/88250/lute/ast"
"github.com/88250/lute/parse"
"github.com/dgraph-io/ristretto"
"github.com/jinzhu/copier"
gcache "github.com/patrickmn/go-cache"
"github.com/siyuan-note/logging"
)
var memCache, _ = ristretto.NewCache(&ristretto.Config{
@ -50,7 +52,13 @@ func putBlockCache(block *Block) {
if disabled {
return
}
memCache.Set(block.ID, block, 1)
cloned := &Block{}
if err := copier.Copy(cloned, block); nil != err {
logging.LogErrorf("clone block failed: %v", err)
return
}
memCache.Set(cloned.ID, cloned, 1)
}
func getBlockCache(id string) (ret *Block) {