An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Retry failed dynamic reference text writes https://github.com/siyuan-note/siyuan/issues/20424
Daniel67cff4fd0b00
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex c549677efa..2ade992179 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "تم حفظ تعديلاتك، ولكن تعذر تحديث بعض نصوص المراجع. سيعيد SiYuan المحاولة تلقائيًا.","clearingUnusedAssets": "جارٍ تنظيف ملفات الموارد غير المشار إليها...","clearingUnusedAttributeViews": "جارٍ تنظيف قواعد البيانات غير المشار إليها...","extraLarge": "كبير جدًا",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex 74b9ad4cbe..2560042d03 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Ihre Änderungen wurden gespeichert, aber einige Referenztexte konnten nicht aktualisiert werden. SiYuan versucht es automatisch erneut.","clearingUnusedAssets": "Nicht referenzierte Anhänge werden bereinigt...","clearingUnusedAttributeViews": "Nicht referenzierte Datenbanken werden bereinigt...","extraLarge": "Sehr groß",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex 74d5342a5d..9b7b03c338 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Your edits have been saved, but some reference text could not be refreshed. SiYuan will retry automatically.","clearingUnusedAssets": "Cleaning up unreferenced assets...","clearingUnusedAttributeViews": "Cleaning up unreferenced databases...","extraLarge": "Extra large",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex bec8d83399..3c0d20a2e3 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Tus cambios se han guardado, pero no se ha podido actualizar parte del texto de las referencias. SiYuan lo intentará de nuevo automáticamente.","clearingUnusedAssets": "Limpiando recursos sin referencias...","clearingUnusedAttributeViews": "Limpiando bases de datos sin referencias...","extraLarge": "Extragrande",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex c31f15d24b..c6ef84e75a 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Vos modifications ont été enregistrées, mais certains textes de référence n’ont pas pu être actualisés. SiYuan réessaiera automatiquement.","clearingUnusedAssets": "Nettoyage des ressources non référencées...","clearingUnusedAttributeViews": "Nettoyage des bases de données non référencées...","extraLarge": "Très grand",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex bb5d9a1e8b..f621b3756c 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "העריכות נשמרו, אך לא ניתן היה לרענן חלק מטקסט ההפניות. SiYuan ינסה שוב אוטומטית.","clearingUnusedAssets": "מנקה קובצי משאבים ללא הפניות...","clearingUnusedAttributeViews": "מנקה מסדי נתונים ללא הפניות...","extraLarge": "גדול במיוחד",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex ea1ebf8ccd..ddcda61e94 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "आपके संपादन सहेज लिए गए हैं, लेकिन कुछ संदर्भ पाठ अपडेट नहीं हो सके। SiYuan अपने आप फिर से प्रयास करेगा।","clearingUnusedAssets": "बिना संदर्भ वाली संसाधन फ़ाइलें साफ़ की जा रही हैं...","clearingUnusedAttributeViews": "बिना संदर्भ वाले डेटाबेस साफ़ किए जा रहे हैं...","extraLarge": "अतिरिक्त बड़ा",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex 2374e7153a..4a3f8ede6d 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Perubahan Anda telah disimpan, tetapi sebagian teks referensi gagal diperbarui. SiYuan akan mencoba lagi secara otomatis.","clearingUnusedAssets": "Membersihkan berkas aset yang tidak dirujuk...","clearingUnusedAttributeViews": "Membersihkan basis data yang tidak dirujuk...","extraLarge": "Sangat besar",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex e418d8c417..a0dabea0be 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Le modifiche sono state salvate, ma alcuni testi dei riferimenti non sono stati aggiornati. SiYuan riproverà automaticamente.","clearingUnusedAssets": "Pulizia delle risorse senza riferimenti...","clearingUnusedAttributeViews": "Pulizia dei database senza riferimenti...","extraLarge": "Molto grande",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 70343c5b62..a81c8b716c 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "編集内容は保存されましたが、一部の参照テキストを更新できませんでした。自動的に再試行します。","clearingUnusedAssets": "未参照のアセットを削除しています...","clearingUnusedAttributeViews": "未参照のデータベースを削除しています...","extraLarge": "特大",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex ee46e696ad..f0b8e8f409 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "편집 내용은 저장되었지만 일부 참조 텍스트를 갱신하지 못했습니다. 자동으로 다시 시도합니다.","clearingUnusedAssets": "참조되지 않은 자산 파일을 정리하는 중...","clearingUnusedAttributeViews": "참조되지 않은 데이터베이스를 정리하는 중...","extraLarge": "매우 크게",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 7b3b482777..add3849ab9 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Uw wijzigingen zijn opgeslagen, maar sommige verwijzingsteksten konden niet worden bijgewerkt. SiYuan probeert het automatisch opnieuw.","clearingUnusedAssets": "Niet-verwezen bijlagen opruimen...","clearingUnusedAttributeViews": "Niet-verwezen databases opruimen...","extraLarge": "Extra groot",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex cd1de2f6fd..279c0e5dd3 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Zmiany zostały zapisane, ale nie udało się odświeżyć części tekstów odwołań. SiYuan automatycznie spróbuje ponownie.","clearingUnusedAssets": "Czyszczenie nieużywanych zasobów...","clearingUnusedAttributeViews": "Czyszczenie nieużywanych baz danych...","extraLarge": "Bardzo duży",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex e986ecb362..6afe5bfaf6 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Suas alterações foram salvas, mas alguns textos de referência não puderam ser atualizados. O SiYuan tentará novamente automaticamente.","clearingUnusedAssets": "Limpando recursos sem referências...","clearingUnusedAttributeViews": "Limpando bancos de dados sem referências...","extraLarge": "Muito grande",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex 488a5ad395..a19f613a02 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Изменения сохранены, но часть текста ссылок не удалось обновить. SiYuan автоматически повторит попытку.","clearingUnusedAssets": "Очистка ресурсов без ссылок...","clearingUnusedAttributeViews": "Очистка баз данных без ссылок...","extraLarge": "Очень большой",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex 86c816c43d..df1ea4ac3a 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Vaše zmeny boli uložené, ale niektoré texty odkazov sa nepodarilo aktualizovať. SiYuan to automaticky skúsi znova.","clearingUnusedAssets": "Čistenie súborov príloh bez odkazov...","clearingUnusedAttributeViews": "Čistenie databáz bez odkazov...","extraLarge": "Veľmi veľký",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 24f25a07cc..2bd40c4739 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Измене су сачуване, али део текста референци није ажуриран. SiYuan ће аутоматски покушати поново.","clearingUnusedAssets": "Чишћење датотека ресурса без референци...","clearingUnusedAttributeViews": "Чишћење база података без референци...","extraLarge": "Веома велико",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 87a99b1da6..26c70fadb5 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "บันทึกการแก้ไขแล้ว แต่ไม่สามารถอัปเดตข้อความอ้างอิงบางส่วนได้ SiYuan จะลองใหม่โดยอัตโนมัติ","clearingUnusedAssets": "กำลังล้างไฟล์ทรัพยากรที่ไม่มีการอ้างอิง...","clearingUnusedAttributeViews": "กำลังล้างฐานข้อมูลที่ไม่มีการอ้างอิง...","extraLarge": "ใหญ่พิเศษ",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex e2b4fe4c36..cbc5318bc6 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Düzenlemeleriniz kaydedildi ancak bazı başvuru metinleri yenilenemedi. SiYuan otomatik olarak yeniden deneyecek.","clearingUnusedAssets": "Başvurulmayan kaynak dosyaları temizleniyor...","clearingUnusedAttributeViews": "Başvurulmayan veritabanları temizleniyor...","extraLarge": "Çok büyük",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 551e5d186c..52a4ab5ea9 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "Зміни збережено, але частину тексту посилань не вдалося оновити. SiYuan автоматично повторить спробу.","clearingUnusedAssets": "Очищення ресурсів без посилань...","clearingUnusedAttributeViews": "Очищення баз даних без посилань...","extraLarge": "Дуже великий",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 0d847847a8..3c6e4762e7 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "编辑已保存,但部分引用文本刷新失败,思源将自动重试。","clearingUnusedAssets": "正在清理未引用的资源文件...","clearingUnusedAttributeViews": "正在清理未引用的数据库...","extraLarge": "超大",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex 81463212b5..2f7c9e62d3 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,4 +1,5 @@{+ "dynamicRefTextRefreshRetry": "編輯已儲存,但部分引用文字更新失敗,思源將自動重試。","clearingUnusedAssets": "正在清理未引用的資源檔案...","clearingUnusedAttributeViews": "正在清理未引用的資料庫...","extraLarge": "超大",diff --git a/kernel/model/index_fix.go b/kernel/model/index_fix.goindex 9675f1aac9..97ef16f453 100644--- a/kernel/model/index_fix.go+++ b/kernel/model/index_fix.go@@ -531,7 +531,12 @@ func reindexTree0(tree *parse.Tree, i, size int) {if "" == updated {updated = util.TimeFromID(tree.Root.ID)tree.Root.SetIALAttr("updated", updated)- indexWriteTreeUpsertQueue(tree)+ if err := writeTreeUpsertQueue(tree); err != nil {+ logging.LogErrorf("repair document timestamp [%s] failed: %s", tree.ID, err)+ util.PushErrMsg(Conf.Language(258), 7000)+ return+ }+ treenode.UpsertBlockTree(tree)} else {treenode.UpsertBlockTree(tree)sql.IndexTreeQueue(tree)diff --git a/kernel/model/push_reload.go b/kernel/model/push_reload.goindex f6ce84258f..0a8113286f 100644--- a/kernel/model/push_reload.go+++ b/kernel/model/push_reload.go@@ -17,6 +17,7 @@package modelimport (+ "errors""os""path""path/filepath"@@ -378,12 +379,19 @@ func refreshDynamicRefText(updatedDefNode *ast.Node, updatedTree *parse.Tree) {// refreshDynamicRefTexts 用于批量刷新块引用的动态锚文本。// 该实现依赖了数据库缓存,导致外部调用时可能需要阻塞等待数据库写入后才能获取到 refsfunc refreshDynamicRefTexts(updatedDefNodes map[string]*ast.Node, updatedTrees map[string]*parse.Tree) (changedRootIDs []string) {+ changedRootIDs, _ = refreshDynamicRefTextsWithWriter(updatedDefNodes, updatedTrees, writeTreeUpsertQueue)+ return+}++func refreshDynamicRefTextsWithWriter(updatedDefNodes map[string]*ast.Node, updatedTrees map[string]*parse.Tree,+ writeTree func(*parse.Tree) error) (changedRootIDs []string, failed bool) {for t := range updatedTrees {changedRootIDs = append(changedRootIDs, t)}for range 7 {- updatedRefNodes, updatedRefTrees := refreshDynamicRefTexts0(updatedDefNodes, updatedTrees)+ updatedRefNodes, updatedRefTrees, writeFailed := refreshDynamicRefTexts0(updatedDefNodes, updatedTrees, writeTree)+ failed = failed || writeFailedif 1 > len(updatedRefNodes) {break}@@ -398,7 +406,8 @@ func refreshDynamicRefTexts(updatedDefNodes map[string]*ast.Node, updatedTrees mreturn}-func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTrees map[string]*parse.Tree) (updatedRefNodes map[string]*ast.Node, updatedRefTrees map[string]*parse.Tree) {+func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTrees map[string]*parse.Tree,+ writeTree func(*parse.Tree) error) (updatedRefNodes map[string]*ast.Node, updatedRefTrees map[string]*parse.Tree, failed bool) {updatedRefNodes = map[string]*ast.Node{}updatedRefTrees = map[string]*parse.Tree{}@@ -429,19 +438,30 @@ func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTrees}refreshAttributeViewDynamicRefTexts(updatedDefNodes, attributeViewRefs)- changedRefTree := map[string]*parse.Tree{}-for refTreeID, refNodeIDs := range treeRefNodeIDs {refTree, ok := updatedTrees[refTreeID]if !ok {var err errorrefTree, err = LoadTreeByBlockID(refTreeID)if err != nil {+ if !errors.Is(err, ErrTreeNotFound) {+ failed = true+ queueDynamicRefTextRetries(updatedDefNodes, updatedTrees, err)+ }continue}}- var refTreeChanged bool+ // 引用文本先在副本中更新,写入失败时保留已提交的树和索引。+ cloned := *refTree+ cloned.Root = cloneRenderNode(refTree.Root)+ refTree = &cloned+ changedRefNodes := map[string]*ast.Node{}+ type refTextUpdate struct {+ blockID string+ defNode *changedDefNode+ }+ var updates []refTextUpdateast.Walk(refTree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {if !entering {return ast.WalkContinue@@ -449,17 +469,15 @@ func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTreesif n.IsBlock() && refNodeIDs.Contains(n.ID) {changed, changedDefNodes := updateRefText(n, updatedDefNodes)- if !refTreeChanged && changed {- refTreeChanged = true- updatedRefNodes[n.ID] = n- updatedRefTrees[refTreeID] = refTree+ if changed {+ changedRefNodes[n.ID] = n}- // 推送动态锚文本节点刷新+ // 保存成功后再推送动态锚文本节点刷新。for _, defNode := range changedDefNodes {switch defNode.refType {case "ref-d":- appendSetRefDynamicTextTask(refTreeID, n.ID, defNode.id, defNode.refText, refTree.Box)+ updates = append(updates, refTextUpdate{n.ID, defNode})}}return ast.WalkContinue@@ -467,19 +485,31 @@ func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTreesreturn ast.WalkContinue})- if refTreeChanged {- changedRefTree[refTreeID] = refTree- sql.UpdateRefsTreeQueue(refTree)+ if len(changedRefNodes) == 0 {+ continue+ }+ if err := writeTree(refTree); err != nil {+ failed = true+ queueDynamicRefTextRetries(updatedDefNodes, updatedTrees, err)+ continue+ }+ treenode.UpsertBlockTree(refTree)+ sql.UpdateRefsTreeQueue(refTree)+ updatedRefTrees[refTreeID] = refTree+ if ok {+ updatedTrees[refTreeID] = refTree+ }+ for id, node := range changedRefNodes {+ updatedRefNodes[id] = node+ }+ for _, update := range updates {+ appendSetRefDynamicTextTask(refTreeID, update.blockID, update.defNode.id, update.defNode.refText, refTree.Box)}}// 2. 更新属性视图主键内容updateAttributeViewBlockText(updatedDefNodes)- // 3. 保存变更- for _, tree := range changedRefTree {- indexWriteTreeUpsertQueue(tree)- }return}diff --git a/kernel/model/ref_text_retry.go b/kernel/model/ref_text_retry.gonew file mode 100644index 0000000000..9219ef0fd7--- /dev/null+++ b/kernel/model/ref_text_retry.go@@ -0,0 +1,117 @@+// SiYuan - From thought to insight, with agents+// Copyright (c) 2020-present, b3log.org+//+// This program is free software: you can redistribute it and/or modify+// it under the terms of the GNU Affero General Public License as published by+// the Free Software Foundation, either version 3 of the License, or+// (at your option) any later version.+//+// This program is distributed in the hope that it will be useful,+// but WITHOUT ANY WARRANTY; without even the implied warranty of+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+// GNU Affero General Public License for more details.+//+// You should have received a copy of the GNU Affero General Public License+// along with this program. If not, see <https://www.gnu.org/licenses/>.++package model++import (+ "errors"+ "sync"+ "time"++ "github.com/88250/lute/ast"+ "github.com/88250/lute/parse"+ "github.com/siyuan-note/logging"+ "github.com/siyuan-note/siyuan/kernel/sql"+ "github.com/siyuan-note/siyuan/kernel/treenode"+ "github.com/siyuan-note/siyuan/kernel/util"+)++type dynamicRefTextRetryKey struct {+ boxID string+ blockID string+}++var dynamicRefTextRetries = struct {+ sync.Mutex+ pending map[dynamicRefTextRetryKey]time.Time+}{pending: map[dynamicRefTextRetryKey]time.Time{}}++// 重试只记录定义块标识,不保留过期树或加密笔记本的明文内容。+func queueDynamicRefTextRetries(defs map[string]*ast.Node, trees map[string]*parse.Tree, err error) {+ logging.LogErrorf("refresh dynamic reference text failed, retry pending: %s", err)+ dynamicRefTextRetries.Lock()+ notify := len(dynamicRefTextRetries.pending) == 0+ for id, node := range defs {+ key := dynamicRefTextRetryKey{updatedNodeBoxID(node, trees), id}+ if _, exists := dynamicRefTextRetries.pending[key]; !exists {+ dynamicRefTextRetries.pending[key] = time.Now().Add(3 * time.Second)+ }+ }+ dynamicRefTextRetries.Unlock()+ if notify {+ util.PushErrMsg(util.I18nTerm(Conf.Lang, "dynamicRefTextRefreshRetry"), 7000)+ }+}++func flushDynamicRefTextRetries() {+ if util.IsExiting.Load() || util.ReadOnly {+ return+ }+ dynamicRefTextRetries.Lock()+ var keys []dynamicRefTextRetryKey+ for key, next := range dynamicRefTextRetries.pending {+ if !time.Now().Before(next) {+ keys = append(keys, key)+ dynamicRefTextRetries.pending[key] = time.Now().Add(30 * time.Second)+ if len(keys) == 32 {+ break+ }+ }+ }+ dynamicRefTextRetries.Unlock()+ if len(keys) == 0 {+ return+ }+ // 与编辑事务串行,重读最新定义和引用文档,防止重试覆盖后续编辑。+ flushLock.Lock()+ isFlushing.Store(true)+ defer func() {+ isFlushing.Store(false)+ flushLock.Unlock()+ }()+ sql.FlushQueue()+ for _, key := range keys {+ if util.IsExiting.Load() {+ return+ }+ if retryDynamicRefText(key) {+ dynamicRefTextRetries.Lock()+ delete(dynamicRefTextRetries.pending, key)+ dynamicRefTextRetries.Unlock()+ }+ }+}++func retryDynamicRefText(key dynamicRefTextRetryKey) bool {+ if err := AcquireEncryptedBoxOperation(key.boxID); err != nil {+ return false+ }+ defer ReleaseEncryptedBoxOperation(key.boxID)+ tree, err := loadTreeByBlockIDInBox(key.blockID, key.boxID)+ if err != nil {+ return errors.Is(err, ErrTreeNotFound)+ }+ node := treenode.GetNodeInTree(tree, key.blockID)+ if node == nil {+ return true+ }+ _, failed := refreshDynamicRefTextsWithWriter(map[string]*ast.Node{node.ID: node},+ map[string]*parse.Tree{tree.ID: tree}, writeTreeUpsertQueue)+ if !failed {+ IncSync()+ }+ return !failed+}diff --git a/kernel/model/ref_text_retry_fts5_test.go b/kernel/model/ref_text_retry_fts5_test.gonew file mode 100644index 0000000000..68f6df5758--- /dev/null+++ b/kernel/model/ref_text_retry_fts5_test.go@@ -0,0 +1,230 @@+//go:build fts5++package model++import (+ "bytes"+ "context"+ "errors"+ "os"+ "os/exec"+ "path/filepath"+ "reflect"+ "strings"+ "testing"+ "time"++ "github.com/88250/lute/ast"+ "github.com/88250/lute/parse"+ "github.com/siyuan-note/siyuan/kernel/conf"+ "github.com/siyuan-note/siyuan/kernel/filesys"+ "github.com/siyuan-note/siyuan/kernel/sql"+ "github.com/siyuan-note/siyuan/kernel/treenode"+ "github.com/siyuan-note/siyuan/kernel/util"+)++func TestDynamicRefTextWriteFailureRetry(t *testing.T) {+ const helper = "SIYUAN_TEST_REF_TEXT_RETRY"+ if os.Getenv(helper) != "1" {+ ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second)+ defer cancel()+ command := exec.CommandContext(ctx, os.Args[0], "-test.run=^TestDynamicRefTextWriteFailureRetry$", "-test.v")+ command.Env = append(os.Environ(), helper+"=1")+ if output, err := command.CombinedOutput(); err != nil {+ t.Fatalf("reference refresh subprocess: %v\n%s", err, output)+ }+ return+ }+ prepareHPathRefreshTest(t)+ box := &Box{ID: ast.NewNodeID()}+ boxConf := conf.NewBoxConf()+ boxConf.Closed = false+ if err := box.SaveConf(boxConf); err != nil {+ t.Fatal(err)+ }+ testDynamicRefTextWriteFailureRetry(t, box.ID)+}++func testDynamicRefTextWriteFailureRetry(t *testing.T, boxID string) {+ box := &Box{ID: boxID}+ definition := newHPathTestDoc(t, box.ID, "/", "Definition", 1)+ def := definition.Root.FirstChild+ def.SetIALAttr("name", "original")+ save := func(tree *parse.Tree) {+ t.Helper()+ if err := writeTreeUpsertQueue(tree); err != nil {+ t.Fatal(err)+ }+ treenode.UpsertBlockTree(tree)+ }+ addReference := func(tree *parse.Tree, defID, subtype, text string) *ast.Node {+ block := treenode.NewParagraph("")+ block.AppendChild(&ast.Node{Type: ast.NodeTextMark, TextMarkType: "block-ref",+ TextMarkBlockRefID: defID, TextMarkBlockRefSubtype: subtype, TextMarkTextContent: text})+ tree.Root.AppendChild(block)+ return block+ }+ reference := newHPathTestDoc(t, box.ID, "/", "Reference", 1)+ addReference(reference, def.ID, "d", "original")+ secondRef := addReference(reference, def.ID, "d", "original")+ addReference(reference, def.ID, "s", "manual anchor")+ other := newHPathTestDoc(t, box.ID, "/", "Other", 1)+ addReference(other, def.ID, "d", "original")+ chained := newHPathTestDoc(t, box.ID, "/", "Chained", 1)+ addReference(chained, secondRef.ID, "d", "original")+ for _, tree := range []*parse.Tree{definition, reference, other, chained} {+ save(tree)+ }+ sql.FlushQueue()+ read := func(tree *parse.Tree) []byte {+ t.Helper()+ data, err := os.ReadFile(filepath.Join(util.DataDir, tree.Box, tree.Path))+ if err != nil {+ t.Fatal(err)+ }+ return data+ }+ anchors := func(tree *parse.Tree) []string {+ var values []string+ ast.Walk(tree.Root, func(node *ast.Node, entering bool) ast.WalkStatus {+ if entering && treenode.IsBlockRef(node) {+ _, text, _ := treenode.GetBlockRef(node)+ values = append(values, text)+ }+ return ast.WalkContinue+ })+ return values+ }+ before := read(reference)+ def.SetIALAttr("name", "saved edit")+ save(definition)+ sql.FlushQueue()+ sourceBefore := read(definition)+ writeCalls := 0+ _, failed := refreshDynamicRefTextsWithWriter(map[string]*ast.Node{def.ID: def},+ map[string]*parse.Tree{definition.ID: definition, reference.ID: reference}, func(tree *parse.Tree) error {+ writeCalls+++ if tree.ID == reference.ID {+ return errors.New("injected disk write failure")+ }+ return writeTreeUpsertQueue(tree)+ })+ if !failed || writeCalls != 2 {+ t.Fatalf("failed refresh must still save unrelated reference trees: failed=%v writes=%d", failed, writeCalls)+ }+ if !bytes.Equal(sourceBefore, read(definition)) || !bytes.Equal(before, read(reference)) {+ t.Fatal("derived write failure changed the saved edit or original reference document")+ }+ if got := anchors(reference); !reflect.DeepEqual(got, []string{"original", "original", "manual anchor"}) {+ t.Fatalf("failed refresh mutated the submitted tree: %v", got)+ }+ sql.FlushQueue()+ for _, ref := range sql.GetRefsCacheByDefIDInBox(def.ID, box.ID) {+ if ref.RootID == reference.ID && ref.Content != "original" && ref.Content != "manual anchor" {+ t.Fatalf("failed refresh published an unpersisted SQL reference: %+v", ref)+ }+ }+ for key := range setRefDynamicTextLatestTasks {+ if strings.HasPrefix(key, reference.ID+"\x00") {+ t.Fatal("failed refresh published an unpersisted UI update")+ }+ }+ key := dynamicRefTextRetryKey{box.ID, def.ID}+ if len(dynamicRefTextRetries.pending) != 1 {+ t.Fatalf("write failure was not queued once: %v", dynamicRefTextRetries.pending)+ }+ // 后续编辑保存在磁盘,重试必须重新读取定义与引用文档。+ def.SetIALAttr("name", "latest edit")+ save(definition)+ laterEdit := treenode.NewParagraph("")+ laterEdit.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte("independent later edit")})+ reference.Root.AppendChild(laterEdit)+ save(reference)+ sql.FlushQueue()+ if IsEncryptedBox(box.ID) {+ boxEncryption, err := GetBoxEncryption(box.ID)+ if err != nil {+ t.Fatal(err)+ }+ LockBox(box.ID)+ dynamicRefTextRetries.pending[key] = time.Time{}+ flushDynamicRefTextRetries()+ if _, pending := dynamicRefTextRetries.pending[key]; !pending {+ t.Fatal("locking encrypted notebook discarded the pending reference refresh")+ }+ if sql.GetEncryptedDB(box.ID) != nil {+ t.Fatal("retry reopened a locked encrypted notebook")+ }+ if err = UnlockBox(box.ID, "ref-retry-test-password", boxEncryption); err != nil {+ t.Fatal(err)+ }+ if _, err = Mount(box.ID); err != nil {+ t.Fatal(err)+ }+ for _, tree := range []*parse.Tree{definition, reference, other, chained} {+ loaded, loadErr := filesys.LoadTree(box.ID, tree.Path, util.NewLute())+ if loadErr != nil {+ t.Fatal(loadErr)+ }+ treenode.UpsertBlockTree(loaded)+ sql.IndexTreeQueue(loaded)+ }+ sql.FlushQueue()+ }+ dynamicRefTextRetries.pending[key] = time.Time{}+ flushDynamicRefTextRetries()+ sql.FlushQueue()+ if len(dynamicRefTextRetries.pending) != 0 {+ t.Fatalf("successful retry remains queued: %v", dynamicRefTextRetries.pending)+ }+ for _, tree := range []*parse.Tree{reference, other, chained} {+ loaded, err := filesys.LoadTree(tree.Box, tree.Path, util.NewLute())+ if err != nil {+ t.Fatal(err)+ }+ want := []string{"latest edit"}+ if tree == reference {+ want = []string{"latest edit", "latest edit", "manual anchor"}+ preserved := false+ ast.Walk(loaded.Root, func(node *ast.Node, entering bool) ast.WalkStatus {+ if entering && strings.Contains(string(node.Tokens), "independent later edit") {+ preserved = true+ }+ return ast.WalkContinue+ })+ if !preserved {+ t.Fatal("retry overwrote later reference document content")+ }+ }+ if IsEncryptedBox(box.ID) && (!util.IsCiphertext(read(tree)) || sql.GetBlock(tree.ID) != nil) {+ t.Fatal("retry exposed encrypted data in a plaintext file or the global index")+ }+ if got := anchors(loaded); !reflect.DeepEqual(got, want) {+ t.Fatalf("retry or chained propagation used stale text in %s: got=%v want=%v", tree.ID, got, want)+ }+ }++ // 锁定的加密笔记本保留重试标识,禁止读取内容;已删除的普通区块可以取消重试。+ lockedBox := ast.NewNodeID()+ markRuntimeEncryptedBox(lockedBox)+ defer forgetRuntimeEncryptedBox(lockedBox)+ lockedKey := dynamicRefTextRetryKey{lockedBox, ast.NewNodeID()}+ dynamicRefTextRetries.pending[lockedKey] = time.Time{}+ flushDynamicRefTextRetries()+ if _, pending := dynamicRefTextRetries.pending[lockedKey]; !pending {+ t.Fatal("locked encrypted notebook retry was discarded")+ }+ delete(dynamicRefTextRetries.pending, lockedKey)+ if !IsEncryptedBox(box.ID) && !retryDynamicRefText(dynamicRefTextRetryKey{box.ID, ast.NewNodeID()}) {+ t.Fatal("deleted definition should not be retried forever")+ }++ // 订正时间戳写入失败时,块树仍指向原始文件。+ originalPath := definition.Path+ definition.Path = "/../invalid.sy"+ definition.Root.SetIALAttr("updated", "")+ reindexTree0(definition, 0, 1)+ if got := treenode.GetBlockTreeInBox(definition.ID, box.ID); got == nil || got.Path != originalPath {+ t.Fatalf("failed timestamp repair changed the block tree: %+v", got)+ }+}diff --git a/kernel/model/ref_text_retry_sqlcipher_test.go b/kernel/model/ref_text_retry_sqlcipher_test.gonew file mode 100644index 0000000000..9b6a66a39a--- /dev/null+++ b/kernel/model/ref_text_retry_sqlcipher_test.go@@ -0,0 +1,38 @@+//go:build fts5 && (sqlcipher || libsqlcipher)++package model++import (+ "context"+ "os"+ "os/exec"+ "testing"+ "time"+)++func TestEncryptedDynamicRefTextWriteFailureRetry(t *testing.T) {+ const helper = "SIYUAN_TEST_ENCRYPTED_REF_TEXT_RETRY"+ if os.Getenv(helper) != "1" {+ ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second)+ defer cancel()+ command := exec.CommandContext(ctx, os.Args[0], "-test.run=^TestEncryptedDynamicRefTextWriteFailureRetry$", "-test.v")+ command.Env = append(os.Environ(), helper+"=1")+ if output, err := command.CombinedOutput(); err != nil {+ t.Fatalf("encrypted reference refresh subprocess: %v\n%s", err, output)+ }+ return+ }+ prepareHPathRefreshTest(t)+ password := "ref-retry-test-password"+ if err := EnableEncryptedNotebook(password); err != nil {+ t.Fatal(err)+ }+ boxID, err := CreateEncryptedBox("Encrypted", password)+ if err != nil {+ t.Fatal(err)+ }+ if _, err = Mount(boxID); err != nil {+ t.Fatal(err)+ }+ testDynamicRefTextWriteFailureRetry(t, boxID)+}diff --git a/kernel/model/transaction.go b/kernel/model/transaction.goindex 8ead6d3176..20736a273f 100644--- a/kernel/model/transaction.go+++ b/kernel/model/transaction.go@@ -3312,6 +3312,7 @@ func updateRefTextRenameDoc(renamedTree *parse.Tree) {func FlushUpdateRefTextRenameDocJob() {sql.WaitFlushTx()flushUpdateRefTextRenameDoc()+ flushDynamicRefTextRetries()}func flushUpdateRefTextRenameDoc() {