0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 改进块树数据索引稳定性 https://github.com/siyuan-note/siyuan/issues/7240

Browse source
This commit is contained in:
Liang Ding 2023-02-02 22:35:01 +08:00
parent 7ced94a194
commit fafeecd3a9
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
kernel/treenode/blocktree.go
View file

@ -248,14 +248,11 @@ func RemoveBlockTree(id string) {
}
func IndexBlockTree(tree *parse.Tree) {
var changedNodes []*ast.Node
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
var parentID string
if nil != n.Parent {
parentID = n.Parent.ID
}
if "" == n.ID {
return ast.WalkContinue
}
@ -267,19 +264,45 @@ func IndexBlockTree(tree *parse.Tree) {
blockTrees.Store(hash, val)
}
slice := val.(*btSlice)
slice.m.Lock()
if bt := slice.data[n.ID]; nil != bt {
bt := slice.data[n.ID]
slice.m.Unlock()
if nil != bt {
if bt.Updated != n.IALAttr("updated") {
slice.data[n.ID] = &BlockTree{ID: n.ID, ParentID: parentID, RootID: tree.ID, BoxID: tree.Box, Path: tree.Path, HPath: tree.HPath, Updated: n.IALAttr("updated"), Type: TypeAbbr(n.Type.String())}
slice.changed = time.Now()
children := ChildBlockNodes(n) // 需要考虑子块，因为一些操作（比如移动块）后需要同时更新子块
changedNodes = append(changedNodes, children...)
}
} else {
slice.data[n.ID] = &BlockTree{ID: n.ID, ParentID: parentID, RootID: tree.ID, BoxID: tree.Box, Path: tree.Path, HPath: tree.HPath, Updated: n.IALAttr("updated"), Type: TypeAbbr(n.Type.String())}
slice.changed = time.Now()
children := ChildBlockNodes(n)
changedNodes = append(changedNodes, children...)
}
slice.m.Unlock()
return ast.WalkContinue
})
for _, n := range changedNodes {
updateBtSlice(n, tree)
}
}
func updateBtSlice(n *ast.Node, tree *parse.Tree) {
var parentID string
if nil != n.Parent {
parentID = n.Parent.ID
}
hash := btHash(n.ID)
val, ok := blockTrees.Load(hash)
if !ok {
val = &btSlice{data: map[string]*BlockTree{}, changed: time.Time{}, m: &sync.Mutex{}}
blockTrees.Store(hash, val)
}
slice := val.(*btSlice)
slice.m.Lock()
slice.data[n.ID] = &BlockTree{ID: n.ID, ParentID: parentID, RootID: tree.ID, BoxID: tree.Box, Path: tree.Path, HPath: tree.HPath, Updated: n.IALAttr("updated"), Type: TypeAbbr(n.Type.String())}
slice.changed = time.Now()
slice.m.Unlock()
}
func InitBlockTree(force bool) {

18
kernel/treenode/node.go
View file

@ -285,6 +285,24 @@ func ParentNodes(node *ast.Node) (parents []*ast.Node) {
return
}
func ChildBlockNodes(node *ast.Node) (children []*ast.Node) {
children = []*ast.Node{}
if !node.IsContainerBlock() || ast.NodeDocument == node.Type {
children = append(children, node)
return
}
ast.Walk(node, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
children = append(children, n)
return ast.WalkContinue
})
return
}
func ParentBlock(node *ast.Node) *ast.Node {
for p := node.Parent; nil != p; p = p.Parent {
if "" != p.ID && p.IsBlock() {