Simon/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-06-28 06:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 https://github.com/siyuan-note/siyuan/issues/17534 https://github.com/siyuan-note/siyuan/issues/17545

Browse Source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel
2026-04-19 17:21:55 +08:00
parent 77d30f5fa7
commit 1486804d67
4 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/sql/queue.go
View File

@@ -44,14 +44,13 @@ var (
type dbQueueOperation struct {
inQueueTime time.Time
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
action string // upsert/delete/delete_id/rename/move/delete_box/delete_box_refs/index/delete_ids/update_block_content/delete_assets
indexTree *parse.Tree // index/rename/move
upsertTree *parse.Tree // upsert/update_refs/delete_refs
removeTreeBox, removeTreePath string // delete
removeTreeID string // delete_id
removeTreeIDs []string // delete_ids
box string // delete_box/delete_box_refs/index
renameTree *parse.Tree // rename/rename_sub_tree
block *Block // update_block_content
id string // index_node
removeAssetHashes []string // delete_assets
@@ -133,7 +132,7 @@ func FlushQueue() {
}
}
if nil != renameSubTreeOp {
childCount := treenode.CountBlockTreesByPathPrefix(path.Dir(renameSubTreeOp.renameTree.Path))
childCount := treenode.CountBlockTreesByPathPrefix(path.Dir(renameSubTreeOp.indexTree.Path))
if 512 < childCount {
scale := math.Log(float64(childCount)/512.0+1.0) / math.Log(2.0)
secs := 1.0 * scale
@@ -143,7 +142,7 @@ func FlushQueue() {
if secs > 12.0 {
secs = 12.0
}
logging.LogInfof("rename sub tree [%s] with large child count [%d], sleep [%.2fs] to wait for more operations", renameSubTreeOp.renameTree.Path, childCount, secs)
logging.LogInfof("rename sub tree [%s] with large child count [%d], sleep [%.2fs] to wait for more operations", renameSubTreeOp.indexTree.Path, childCount, secs)
time.Sleep(time.Duration(secs * float64(time.Second)))
}
}
@@ -218,14 +217,14 @@ func execOp(op *dbQueueOperation, tx *sql.Tx, context map[string]any) (err error
case "delete_ids":
err = batchDeleteByRootIDs(tx, op.removeTreeIDs, context)
case "rename":
err = batchUpdateHPath(tx, op.renameTree, context)
err = batchUpdateHPath(tx, op.indexTree, context)
if err != nil {
break
}
err = updateRootContent(tx, path.Base(op.renameTree.HPath), op.renameTree.Root.IALAttr("updated"), treenode.IALStr(op.renameTree.Root), op.renameTree.ID)
case "rename_sub_tree":
err = batchUpdatePath(tx, op.renameTree, context)
err = updateRootContent(tx, path.Base(op.indexTree.HPath), op.indexTree.Root.IALAttr("updated"), treenode.IALStr(op.indexTree.Root), op.indexTree.ID)
case "move":
err = batchUpdatePath(tx, op.indexTree, context)
case "delete_box":
err = deleteByBoxTx(tx, op.box)
case "delete_box_refs":
@@ -377,12 +376,12 @@ func RenameTreeQueue(tree *parse.Tree) {
defer dbQueueLock.Unlock()
newOp := &dbQueueOperation{
renameTree: tree,
indexTree: tree,
inQueueTime: time.Now(),
action: "rename",
}
for i, op := range operationQueue {
if "rename" == op.action && op.renameTree.ID == tree.ID { // 相同树则覆盖
if "rename" == op.action && op.indexTree.ID == tree.ID { // 相同树则覆盖
operationQueue[i] = newOp
return
}
@@ -390,17 +389,17 @@ func RenameTreeQueue(tree *parse.Tree) {
appendOperation(newOp)
}
func RenameSubTreeQueue(tree *parse.Tree) {
func MoveTreeQueue(tree *parse.Tree) {
dbQueueLock.Lock()
defer dbQueueLock.Unlock()
newOp := &dbQueueOperation{
renameTree: tree,
indexTree: tree,
inQueueTime: time.Now(),
action: "rename_sub_tree",
action: "move",
}
for i, op := range operationQueue {
if "rename_sub_tree" == op.action && op.renameTree.ID == tree.ID { // 相同树则覆盖
if "move" == op.action && op.indexTree.ID == tree.ID { // 相同树则覆盖
operationQueue[i] = newOp
return
}