Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve search index ignore for virtual refs https://github.com/siyuan-note/siyuan/issues/11827

Browse source
This commit is contained in:
Daniel 2024-06-28 22:13:23 +08:00
parent 7b1dcd269c
commit 1011cd4900
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 54 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/model/search.go
View file

@ -1152,12 +1152,12 @@ func fullTextSearchRefBlock(keyword string, beforeLen int, onlyDoc bool) (ret []
if ignoreLines := getRefSearchIgnoreLines(); 0 < len(ignoreLines) { if ignoreLines := getRefSearchIgnoreLines(); 0 < len(ignoreLines) {
// Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089 // Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089
notLike := bytes.Buffer{} buf := bytes.Buffer{}
for _, line := range ignoreLines { for _, line := range ignoreLines {
notLike.WriteString(" AND ") buf.WriteString(" AND ")
notLike.WriteString(line) buf.WriteString(line)
} }
stmt += notLike.String() stmt += buf.String()
} }
orderBy := ` ORDER BY CASE orderBy := ` ORDER BY CASE
@ -1272,12 +1272,12 @@ func fullTextSearchByFTS(query, boxFilter, pathFilter, typeFilter, orderBy strin
if ignoreLines := getSearchIgnoreLines(); 0 < len(ignoreLines) { if ignoreLines := getSearchIgnoreLines(); 0 < len(ignoreLines) {
// Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089 // Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089
notLike := bytes.Buffer{} buf := bytes.Buffer{}
for _, line := range ignoreLines { for _, line := range ignoreLines {
notLike.WriteString(" AND ") buf.WriteString(" AND ")
notLike.WriteString(line) buf.WriteString(line)
} }
stmt += notLike.String() stmt += buf.String()
} }
stmt += " " + orderBy stmt += " " + orderBy

4
kernel/model/virutalref.go
View file

@ -112,7 +112,9 @@ func ResetVirtualBlockRefCache() {
return return
} }
keywords := sql.QueryVirtualRefKeywords(Conf.Search.VirtualRefName, Conf.Search.VirtualRefAlias, Conf.Search.VirtualRefAnchor, Conf.Search.VirtualRefDoc) searchIgnoreLines := getSearchIgnoreLines()
refSearchIgnoreLines := getRefSearchIgnoreLines()
keywords := sql.QueryVirtualRefKeywords(Conf.Search.VirtualRefName, Conf.Search.VirtualRefAlias, Conf.Search.VirtualRefAnchor, Conf.Search.VirtualRefDoc, searchIgnoreLines, refSearchIgnoreLines)
virtualBlockRefCache.Set("virtual_ref", keywords, 1) virtualBlockRefCache.Set("virtual_ref", keywords, 1)
} }

30
kernel/sql/block_query.go
View file

@ -180,9 +180,16 @@ func QueryBlockAliases(rootID string) (ret []string) {
return return
} }
func queryNames() (ret []string) { func queryNames(searchIgnoreLines []string) (ret []string) {
ret = []string{} ret = []string{}
sqlStmt := "SELECT name FROM blocks WHERE name != '' LIMIT ?" sqlStmt := "SELECT name FROM blocks WHERE name != ''"
buf := bytes.Buffer{}
for _, line := range searchIgnoreLines {
buf.WriteString(" AND ")
buf.WriteString(line)
}
sqlStmt += buf.String()
sqlStmt += " LIMIT ?"
rows, err := query(sqlStmt, 10240) rows, err := query(sqlStmt, 10240)
if nil != err { if nil != err {
logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err) logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)
@ -213,9 +220,16 @@ func queryNames() (ret []string) {
return return
} }
func queryAliases() (ret []string) { func queryAliases(searchIgnoreLines []string) (ret []string) {
ret = []string{} ret = []string{}
sqlStmt := "SELECT alias FROM blocks WHERE alias != '' LIMIT ?" sqlStmt := "SELECT alias FROM blocks WHERE alias != ''"
buf := bytes.Buffer{}
for _, line := range searchIgnoreLines {
buf.WriteString(" AND ")
buf.WriteString(line)
}
sqlStmt += buf.String()
sqlStmt += " LIMIT ?"
rows, err := query(sqlStmt, 10240) rows, err := query(sqlStmt, 10240)
if nil != err { if nil != err {
logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err) logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)
@ -274,9 +288,15 @@ func queryDocIDsByTitle(title string, excludeIDs []string) (ret []string) {
return return
} }
func queryDocTitles() (ret []string) { func queryDocTitles(searchIgnoreLines []string) (ret []string) {
ret = []string{} ret = []string{}
sqlStmt := "SELECT content FROM blocks WHERE type = 'd'" sqlStmt := "SELECT content FROM blocks WHERE type = 'd'"
buf := bytes.Buffer{}
for _, line := range searchIgnoreLines {
buf.WriteString(" AND ")
buf.WriteString(line)
}
sqlStmt += buf.String()
rows, err := query(sqlStmt) rows, err := query(sqlStmt)
if nil != err { if nil != err {
logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err) logging.LogErrorf("sql query [%s] failed: %s", sqlStmt, err)

29
kernel/sql/block_ref_query.go
View file

@ -44,18 +44,18 @@ func GetRefDuplicatedDefRootIDs() (ret []string) {
return return
} }
func QueryVirtualRefKeywords(name, alias, anchor, doc bool) (ret []string) { func QueryVirtualRefKeywords(name, alias, anchor, doc bool, searchIgnoreLines, refSearchIgnoreLines []string) (ret []string) {
if name { if name {
ret = append(ret, queryNames()...) ret = append(ret, queryNames(searchIgnoreLines)...)
} }
if alias { if alias {
ret = append(ret, queryAliases()...) ret = append(ret, queryAliases(searchIgnoreLines)...)
} }
if anchor { if anchor {
ret = append(ret, queryRefTexts()...) ret = append(ret, queryRefTexts(refSearchIgnoreLines)...)
} }
if doc { if doc {
ret = append(ret, queryDocTitles()...) ret = append(ret, queryDocTitles(searchIgnoreLines)...)
} }
ret = gulu.Str.RemoveDuplicatedElem(ret) ret = gulu.Str.RemoveDuplicatedElem(ret)
sort.SliceStable(ret, func(i, j int) bool { sort.SliceStable(ret, func(i, j int) bool {
@ -64,9 +64,16 @@ func QueryVirtualRefKeywords(name, alias, anchor, doc bool) (ret []string) {
return return
} }
func queryRefTexts() (ret []string) { func queryRefTexts(refSearchIgnoreLines []string) (ret []string) {
ret = []string{} ret = []string{}
sqlStmt := "SELECT DISTINCT content FROM refs LIMIT 10240" sqlStmt := "SELECT DISTINCT content FROM refs WHERE 1 = 1"
buf := bytes.Buffer{}
for _, line := range refSearchIgnoreLines {
buf.WriteString(" AND ")
buf.WriteString(line)
}
sqlStmt += buf.String()
sqlStmt += " LIMIT 10240"
rows, err := query(sqlStmt) rows, err := query(sqlStmt)
if nil != err { if nil != err {
logging.LogErrorf("sql query failed: %s", sqlStmt, err) logging.LogErrorf("sql query failed: %s", sqlStmt, err)
@ -361,12 +368,12 @@ func QueryRefsRecent(onlyDoc bool, ignoreLines []string) (ret []*Ref) {
stmt += " WHERE 1 = 1" stmt += " WHERE 1 = 1"
if 0 < len(ignoreLines) { if 0 < len(ignoreLines) {
// Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089 // Support ignore search results https://github.com/siyuan-note/siyuan/issues/10089
notLike := bytes.Buffer{} buf := bytes.Buffer{}
for _, line := range ignoreLines { for _, line := range ignoreLines {
notLike.WriteString(" AND ") buf.WriteString(" AND ")
notLike.WriteString(line) buf.WriteString(line)
} }
stmt += notLike.String() stmt += buf.String()
} }
stmt += " GROUP BY r.def_block_id ORDER BY r.id DESC LIMIT 32" stmt += " GROUP BY r.def_block_id ORDER BY r.id DESC LIMIT 32"
rows, err := query(stmt) rows, err := query(stmt)