github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 12:41:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Opening notebook repeatedly causes reference count to increase https://github.com/siyuan-note/siyuan/issues/11378

Browse Source
This commit is contained in:
Daniel 2024-05-13 21:30:48 +08:00
parent c50b3de4ce
commit fc1e9154b3
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
4 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/model/index.go
View File

@ -280,7 +280,7 @@ func IndexRefs() {
} }
util.IncBootProgress(bootProgressPart, "Indexing ref "+defTree.ID) util.IncBootProgress(bootProgressPart, "Indexing ref "+defTree.ID)
sql.InsertRefsTreeQueue(defTree) sql.UpdateRefsTreeQueue(defTree)
if 1 < i && 0 == i%64 { if 1 < i && 0 == i%64 {
util.PushStatusBar(fmt.Sprintf(Conf.Language(55), i)) util.PushStatusBar(fmt.Sprintf(Conf.Language(55), i))
} }

11
kernel/sql/block_ref.go
View File

@ -57,3 +57,14 @@ func deleteRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
} }
return return
} }
func insertRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
refs, fileAnnotationRefs := refsFromTree(tree)
if err = insertBlockRefs(tx, refs); nil != err {
return
}
if err = insertFileAnnotationRefs(tx, fileAnnotationRefs); nil != err {
return
}
return err
}

20
kernel/sql/queue.go
View File

@ -40,9 +40,9 @@ var (
type dbQueueOperation struct { type dbQueueOperation struct {
inQueueTime time.Time inQueueTime time.Time
action string // upsert/delete/delete_id/rename/rename_sub_tree/delete_box/delete_box_refs/insert_refs/index/delete_ids/update_block_content/delete_assets action string // upsert/delete/delete_id/rename/rename_sub_tree/delete_box/delete_box_refs/index/delete_ids/update_block_content/delete_assets
indexTree *parse.Tree // index indexTree *parse.Tree // index
upsertTree *parse.Tree // upsert/insert_refs/update_refs/delete_refs upsertTree *parse.Tree // upsert/update_refs/delete_refs
removeTreeBox, removeTreePath string // delete removeTreeBox, removeTreePath string // delete
removeTreeID string // delete_id removeTreeID string // delete_id
removeTreeIDs []string // delete_ids removeTreeIDs []string // delete_ids
@ -185,8 +185,6 @@ func execOp(op *dbQueueOperation, tx *sql.Tx, context map[string]interface{}) (e
err = deleteByBoxTx(tx, op.box) err = deleteByBoxTx(tx, op.box)
case "delete_box_refs": case "delete_box_refs":
err = deleteRefsByBoxTx(tx, op.box) err = deleteRefsByBoxTx(tx, op.box)
case "insert_refs":
err = insertRefs(tx, op.upsertTree)
case "update_refs": case "update_refs":
err = upsertRefs(tx, op.upsertTree) err = upsertRefs(tx, op.upsertTree)
case "delete_refs": case "delete_refs":
@ -273,20 +271,6 @@ func UpdateRefsTreeQueue(tree *parse.Tree) {
operationQueue = append(operationQueue, newOp) operationQueue = append(operationQueue, newOp)
} }
func InsertRefsTreeQueue(tree *parse.Tree) {
dbQueueLock.Lock()
defer dbQueueLock.Unlock()
newOp := &dbQueueOperation{upsertTree: tree, inQueueTime: time.Now(), action: "insert_refs"}
for i, op := range operationQueue {
if "insert_refs" == op.action && op.upsertTree.ID == tree.ID {
operationQueue[i] = newOp
return
}
}
operationQueue = append(operationQueue, newOp)
}
func DeleteBoxRefsQueue(boxID string) { func DeleteBoxRefsQueue(boxID string) {
dbQueueLock.Lock() dbQueueLock.Lock()
defer dbQueueLock.Unlock() defer dbQueueLock.Unlock()

11
kernel/sql/upsert.go
View File

@ -389,17 +389,6 @@ func insertFileAnnotationRefs0(tx *sql.Tx, bulk []*FileAnnotationRef) (err error
return return
} }
func insertRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
refs, fileAnnotationRefs := refsFromTree(tree)
if err = insertBlockRefs(tx, refs); nil != err {
return
}
if err = insertFileAnnotationRefs(tx, fileAnnotationRefs); nil != err {
return
}
return err
}
func indexTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (err error) { func indexTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (err error) {
blocks, spans, assets, attributes := fromTree(tree.Root, tree) blocks, spans, assets, attributes := fromTree(tree.Root, tree)
refs, fileAnnotationRefs := refsFromTree(tree) refs, fileAnnotationRefs := refsFromTree(tree)