Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Preserve relation recovery and deletion failure consistency https://github.com/siyuan-note/siyuan/issues/20175

Daniel226b5015dc2d
diff --git a/kernel/model/assets.go b/kernel/model/assets.go
index d0bc075ad4..72cf3b790c 100644
--- a/kernel/model/assets.go
+++ b/kernel/model/assets.go
@@ -2088,6 +2088,11 @@ func UnusedAssets(sorted bool) (ret []*UnusedItem, err error) {
removeReferencedAssetPaths(assetsPathMap, agentSessionDests)
templateDests := map[string]bool{}
templateDir := filepath.Join(util.DataDir, "templates")
+ if resolved, resolveErr := filepath.EvalSymlinks(templateDir); resolveErr == nil {
+ templateDir = resolved
+ } else if !os.IsNotExist(resolveErr) {
+ return nil, fmt.Errorf("resolve template directory failed: %w", resolveErr)
+ }
err = filepath.WalkDir(templateDir, func(filename string, entry fs.DirEntry, walkErr error) error {
if walkErr != nil {
if filename == templateDir && os.IsNotExist(walkErr) {
@@ -2095,7 +2100,7 @@ func UnusedAssets(sorted bool) (ret []*UnusedItem, err error) {
}
return walkErr
}
- if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".md") {
+ if entry.IsDir() || !strings.HasSuffix(strings.ToLower(entry.Name()), ".md") {
return nil
}
data, readErr := filelock.ReadFile(filename)
diff --git a/kernel/model/assets_cleanup_test.go b/kernel/model/assets_cleanup_test.go
index 78772237de..cf012b1148 100644
--- a/kernel/model/assets_cleanup_test.go
+++ b/kernel/model/assets_cleanup_test.go
@@ -176,6 +176,40 @@ func TestUnusedAssetsTemplateReferences(t *testing.T) {
}
}
+func TestUnusedAssetsTemplatePaths(t *testing.T) {
+ for _, mode := range []string{"uppercase extension", "symlink root"} {
+ t.Run(mode, func(t *testing.T) {
+ setupUnusedAssetWorkspace(t)
+ Conf.Search = conf.NewSearch()
+ templateDir := filepath.Join(util.DataDir, "templates")
+ name := "example.MD"
+ if mode == "symlink root" {
+ target := t.TempDir()
+ if err := os.Symlink(target, templateDir); err != nil {
+ t.Skipf("symlink unavailable: %v", err)
+ }
+ templateDir, name = target, "example.md"
+ }
+ if err := os.MkdirAll(templateDir, 0755); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.WriteFile(filepath.Join(templateDir, name), []byte("![image](assets/template.png)"), 0644); err != nil {
+ t.Fatal(err)
+ }
+ if matches := SearchTemplate(""); len(matches) != 1 {
+ t.Fatalf("template manager did not expose the fixture: %v", matches)
+ }
+ if err := os.WriteFile(filepath.Join(util.DataDir, "assets", "template.png"), []byte("image"), 0644); err != nil {
+ t.Fatal(err)
+ }
+ unused, err := UnusedAssets(false)
+ if err != nil || len(unused) != 0 {
+ t.Fatalf("supported template asset listed for deletion: %+v, %v", unused, err)
+ }
+ })
+ }
+}
+
func TestUnusedAssetsAbortUnreadableDocument(t *testing.T) {
for _, test := range []struct{ name, data string }{
{"new spec", `{"Type":"NodeDocument","Spec":"99"}`},
diff --git a/kernel/model/attribute_view_block_history.go b/kernel/model/attribute_view_block_history.go
index 81a129316e..3f03c2a9bb 100644
--- a/kernel/model/attribute_view_block_history.go
+++ b/kernel/model/attribute_view_block_history.go
@@ -158,6 +158,27 @@ func backupBoundAttributeViewHistory(tree *parse.Tree, historyDir string) error
if IsEncryptedBox(tree.Box) {
boxID = tree.Box
}
+ // 单向关联的值存放在引用方数据库,删除前与绑定数据库一起保留快照。
+ for _, id := range sortedAttributeViewFieldKeys(bound) {
+ if len(bound[id]) == 0 {
+ continue
+ }
+ source, _ := av.FindAttributeViewPathInBox(id, boxID)
+ if source == "" {
+ continue
+ }
+ view, err := readBoundAttributeViewHistory(source, boxID, id)
+ if err != nil {
+ return err
+ }
+ for _, relatedID := range deletedAttributeViewRelationIDs(view) {
+ if relatedID != "" {
+ if _, exists := bound[relatedID]; !exists {
+ bound[relatedID] = nil
+ }
+ }
+ }
+ }
for _, id := range sortedAttributeViewFieldKeys(bound) {
source, _ := av.FindAttributeViewPathInBox(id, boxID)
if source == "" {
@@ -226,7 +247,17 @@ func (tx *Transaction) restoreBoundAttributeViewHistory(tree *parse.Tree, histor
if primary.IsDetached || primary.Block == nil {
continue
}
- if _, exists := bound[id][primary.Block.ID]; !exists || current.GetBlockValueByBoundID(primary.Block.ID) != nil {
+ if _, exists := bound[id][primary.Block.ID]; !exists {
+ continue
+ }
+ if existing := current.GetBlockValueByBoundID(primary.Block.ID); existing != nil {
+ // 内嵌数据库整份恢复后条目已存在,仍需恢复删除期间被清理的外部关联。
+ key := boxID + "/" + id
+ original := tx.attributeViewRollback.views[key]
+ _, created := tx.attributeViewRollback.createdViews[key]
+ if created || original != nil && original.GetBlockValue(existing.BlockID) == nil {
+ restoredItems[id] = append(restoredItems[id], existing.BlockID)
+ }
continue
}
if existing := current.GetBlockValue(primary.BlockID); existing != nil {
@@ -284,7 +315,7 @@ func (tx *Transaction) restoreBoundAttributeViewHistory(tree *parse.Tree, histor
current.CardCoverPositions[itemID] = covers
}
}
- restoredItems[id] = itemIDs
+ restoredItems[id] = append(restoredItems[id], itemIDs...)
}
// 先合并所有主键,再恢复双向关联,允许同一文档内的条目互相关联。
for id, itemIDs := range restoredItems {
@@ -326,6 +357,56 @@ func (tx *Transaction) restoreBoundAttributeViewHistory(tree *parse.Tree, histor
}
}
}
+ // 只合并指向本次恢复条目的历史关联,保留引用方其他条目的后续编辑。
+ for id, itemIDs := range restoredItems {
+ for _, sourceID := range av.GetSrcAvIDs(id) {
+ historical, err := readBoundAttributeViewHistory(boundAttributeViewHistoryPath(historyDir, boxID, sourceID), boxID, sourceID)
+ if os.IsNotExist(err) {
+ continue
+ }
+ if err != nil {
+ return err
+ }
+ source, err := load(sourceID)
+ if err != nil {
+ return err
+ }
+ for _, oldField := range historical.KeyValues {
+ if oldField.Key.Type != av.KeyTypeRelation || oldField.Key.Relation == nil || oldField.Key.Relation.AvID != id {
+ continue
+ }
+ field, fieldErr := source.GetKeyValues(oldField.Key.ID)
+ if fieldErr != nil || field.Key.Type != av.KeyTypeRelation || !reflect.DeepEqual(field.Key.Relation, oldField.Key.Relation) {
+ continue
+ }
+ for _, oldValue := range oldField.Values {
+ if oldValue.Relation == nil || source.GetBlockValue(oldValue.BlockID) == nil {
+ continue
+ }
+ var missing []string
+ value := field.GetValue(oldValue.BlockID)
+ if value != nil && value.Relation == nil {
+ return errors.New("database relation value is invalid")
+ }
+ for _, targetID := range oldValue.Relation.BlockIDs {
+ if slices.Contains(itemIDs, targetID) && (value == nil || !slices.Contains(value.Relation.BlockIDs, targetID)) {
+ missing = append(missing, targetID)
+ }
+ }
+ if len(missing) == 0 {
+ continue
+ }
+ if value == nil {
+ value = oldValue.Clone()
+ value.Relation.BlockIDs = nil
+ field.Values = append(field.Values, value)
+ }
+ value.Relation.BlockIDs = restoreAttributeViewItemOrder(value.Relation.BlockIDs, oldValue.Relation.BlockIDs, missing)
+ value.Relation.Contents = nil
+ }
+ }
+ }
+ }
if len(restoredItems) == 0 && !restoredBindings {
return nil
}
diff --git a/kernel/model/attribute_view_block_undo.go b/kernel/model/attribute_view_block_undo.go
index 8f48a2b5ec..f8713a9ff8 100644
--- a/kernel/model/attribute_view_block_undo.go
+++ b/kernel/model/attribute_view_block_undo.go
@@ -114,35 +114,46 @@ func (tx *Transaction) prepareDeletedAttributeViewRelations(original, current *a
before, after map[string]*av.AttributeView, err error) {
before = map[string]*av.AttributeView{original.ID: original}
after = map[string]*av.AttributeView{current.ID: current}
- removed := map[string]bool{}
- for _, value := range original.GetBlockKeyValues().Values {
- if value != nil && current.GetBlockValue(value.BlockID) == nil {
- removed[value.BlockID] = true
- }
- }
+ err = tx.clearDeletedAttributeViewRelations(original, current, carrier, boxID, before, after)
+ return
+}
+
+func deletedAttributeViewRelationIDs(original *av.AttributeView) []string {
ids := append([]string{original.ID}, av.GetSrcAvIDs(original.ID)...)
for _, kv := range original.KeyValues {
if kv.Key.Relation != nil && kv.Key.Relation.IsTwoWay {
ids = append(ids, kv.Key.Relation.AvID)
}
}
- for _, id := range slices.Compact(slices.Sorted(slices.Values(ids))) {
+ return slices.Compact(slices.Sorted(slices.Values(ids)))
+}
+
+func (tx *Transaction) clearDeletedAttributeViewRelations(original, current *av.AttributeView, carrier, boxID string,
+ before, after map[string]*av.AttributeView) error {
+ removed := map[string]bool{}
+ for _, value := range original.GetBlockKeyValues().Values {
+ if value != nil && current.GetBlockValue(value.BlockID) == nil {
+ removed[value.BlockID] = true
+ }
+ }
+ for _, id := range deletedAttributeViewRelationIDs(original) {
if id == "" {
continue
}
view := after[id]
var source *av.AttributeView
if view == nil {
+ var err error
source, err = tx.readAttributeViewForMutation(id, carrier, boxID)
if errors.Is(err, av.ErrViewNotFound) {
continue
}
if err != nil {
- return nil, nil, err
+ return err
}
view, err = cloneAttributeViewForFieldMutation(source)
if err != nil {
- return nil, nil, err
+ return err
}
}
changed := false
@@ -166,7 +177,7 @@ func (tx *Transaction) prepareDeletedAttributeViewRelations(original, current *a
before[id], after[id] = source, view
}
}
- return before, after, nil
+ return nil
}
func (tx *Transaction) restoreDeletedAttributeViewBlocks(op *Operation) error {
diff --git a/kernel/model/attribute_view_recovery_fts5_test.go b/kernel/model/attribute_view_recovery_fts5_test.go
index a3966d34c5..82e83ada55 100644
--- a/kernel/model/attribute_view_recovery_fts5_test.go
+++ b/kernel/model/attribute_view_recovery_fts5_test.go
@@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"slices"
+ "strings"
"testing"
"github.com/88250/lute/ast"
@@ -156,10 +157,25 @@ func TestAttributeViewMissingDatabaseHistoryRecovery(t *testing.T) {
}
func TestAttributeViewNotebookHistoryRestoresBindings(t *testing.T) {
- for _, cleanup := range []bool{false, true} {
- t.Run(map[bool]string{false: "bound rows", true: "cleaned embedded database"}[cleanup], func(t *testing.T) {
+ for _, scenario := range []struct {
+ name string
+ cleanup, oneWay bool
+ }{
+ {"bound rows", false, false},
+ {"cleaned embedded database", true, false},
+ {"one-way relations", false, true},
+ {"cleaned embedded one-way relations", true, true},
+ } {
+ t.Run(scenario.name, func(t *testing.T) {
+ cleanup := scenario.cleanup
fixture, before, _ := setupAttributeViewDeletedBlockTest(t, "container")
- dest, _, targetID := addDeletedBlockTestRelation(t, before, false)
+ var dest *av.AttributeView
+ var targetID string
+ if scenario.oneWay {
+ dest, _, targetID = addDeletedBlockOneWayTestRelation(t, before)
+ } else {
+ dest, _, targetID = addDeletedBlockTestRelation(t, before, false)
+ }
primary := dest.GetBlockValue(targetID)
primary.IsDetached, primary.Block.ID = false, fixture.targetID
dest.Views[0].ItemIDs = []string{targetID}
@@ -256,3 +272,246 @@ func TestDeletedFlashcardBlockReplayRetainsDeckAttribute(t *testing.T) {
replayAttributeViewFieldsTest(t, entry.DoOperationsForReplay())
}
}
+
+func TestFlashcardCopyRedoPreservesNormalizedAttributes(t *testing.T) {
+ fixture, _, original := setupAttributeViewDeletedBlockTest(t, "block")
+ originalID := original.DoOperations[0].ID
+ tree, err := LoadTreeByBlockID(fixture.sourceID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ treenode.GetNodeInTree(tree, originalID).SetIALAttr(NodeAttrRiffDecks, "20230218211946-2kw8jgx")
+ if _, err = filesys.WriteTree(tree); err != nil {
+ t.Fatal(err)
+ }
+ copyID := ast.NewNodeID()
+ data := strings.ReplaceAll(GetBlockDOM(originalID), originalID, copyID)
+ tx := &Transaction{fromAPI: true,
+ DoOperations: []*Operation{{Action: "insert", ID: copyID, PreviousID: originalID, Data: data}},
+ UndoOperations: []*Operation{{Action: "delete", ID: copyID}},
+ }
+ if err = PerformTxSync(tx); err != nil {
+ t.Fatal(err)
+ }
+ check := func() {
+ t.Helper()
+ current, loadErr := LoadTreeByBlockID(fixture.sourceID)
+ if loadErr != nil {
+ t.Fatal(loadErr)
+ }
+ if got := treenode.GetNodeInTree(current, copyID).IALAttr(NodeAttrRiffDecks); got != "" {
+ t.Fatalf("copied block became a flashcard: %s", got)
+ }
+ if got := treenode.GetNodeInTree(current, originalID).IALAttr(NodeAttrRiffDecks); got != "20230218211946-2kw8jgx" {
+ t.Fatal("copy changed the original flashcard")
+ }
+ }
+ check()
+ entry := GlobalUndoLog.Peek(fixture.sourceID)
+ for cycle := 0; cycle < 2; cycle++ {
+ replayAttributeViewFieldsTest(t, entry.UndoOperationsForReplay())
+ replayAttributeViewFieldsTest(t, entry.DoOperationsForReplay())
+ check()
+ }
+}
+
+func addDeletedBlockOneWayTestRelation(t *testing.T, source *av.AttributeView) (*av.AttributeView, string, string) {
+ t.Helper()
+ dest, keyID, itemID := addDeletedBlockTestRelation(t, source, false)
+ source.KeyValues = slices.DeleteFunc(source.KeyValues, func(kv *av.KeyValues) bool { return kv.Key.Type == av.KeyTypeRelation })
+ key, _ := dest.GetKey(keyID)
+ key.Relation.IsTwoWay, key.Relation.BackKeyID = false, ""
+ for _, view := range []*av.AttributeView{source, dest} {
+ if err := av.SaveAttributeView(view); err != nil {
+ t.Fatal(err)
+ }
+ }
+ av.RemoveAvRel(source.ID, dest.ID)
+ return dest, keyID, itemID
+}
+
+func TestAttributeViewDocumentHistoryOneWayRelations(t *testing.T) {
+ fixture, source, _ := setupAttributeViewDeletedBlockTest(t, "container")
+ dest, keyID, itemID := addDeletedBlockOneWayTestRelation(t, source)
+ want := append([]string(nil), dest.GetValue(keyID, itemID).Relation.BlockIDs...)
+ oldWorkspace := util.WorkspaceDir
+ util.WorkspaceDir = filepath.Dir(util.HistoryDir)
+ t.Cleanup(func() { util.WorkspaceDir = oldWorkspace })
+ if _, err := removeDoc(fixture.box, fixture.sourcePath, util.NewLute()); err != nil {
+ t.Fatal(err)
+ }
+ sql.FlushQueue()
+ current := readAttributeViewItemsTest(t, dest.ID)
+ if got := current.GetValue(keyID, itemID).Relation.BlockIDs; len(got) != 0 {
+ t.Fatalf("deletion did not clear incoming IDs: %v", got)
+ }
+ keptID := source.GetBlockKeyValues().Values[2].BlockID
+ current.GetValue(keyID, itemID).Relation.BlockIDs = []string{keptID}
+ if err := av.SaveAttributeView(current); err != nil {
+ t.Fatal(err)
+ }
+ paths, err := filepath.Glob(filepath.Join(util.HistoryDir, "*-delete", fixture.box.ID, fixture.sourceID+".sy"))
+ if err != nil || len(paths) != 1 {
+ t.Fatalf("history paths: %v %v", paths, err)
+ }
+ relative, err := filepath.Rel(util.WorkspaceDir, paths[0])
+ if err != nil {
+ t.Fatal(err)
+ }
+ if err = RollbackDocHistory(relative); err != nil {
+ t.Fatal(err)
+ }
+ sql.FlushQueue()
+ assertAttributeViewItemsEqual(t, source, readAttributeViewItemsTest(t, source.ID))
+ want = append(want, keptID)
+ if got := readAttributeViewItemsTest(t, dest.ID).GetValue(keyID, itemID).Relation.BlockIDs; !slices.Equal(got, want) {
+ t.Fatalf("recovery lost one-way relations or later edits: want %v, got %v", want, got)
+ }
+}
+
+func TestAttributeViewExternalDeletionUnreadableRelationPreservesData(t *testing.T) {
+ for _, notebook := range []bool{false, true} {
+ t.Run(map[bool]string{false: "document", true: "notebook"}[notebook], func(t *testing.T) {
+ fixture, source, _ := setupAttributeViewDeletedBlockTest(t, "container")
+ dest, _, _ := addDeletedBlockTestRelation(t, source, false)
+ corrupted := []byte("invalid database JSON")
+ filename := av.GetAttributeViewDataPath(dest.ID)
+ if err := os.WriteFile(filename, corrupted, 0600); err != nil {
+ t.Fatal(err)
+ }
+ cache.ClearAVCache()
+ var err error
+ if notebook {
+ err = RemoveBox(fixture.box.ID)
+ } else {
+ _, err = removeDoc(fixture.box, fixture.sourcePath, util.NewLute())
+ }
+ if err == nil {
+ t.Fatal("unreadable relation did not abort deletion")
+ }
+ if _, err = os.Stat(filepath.Join(util.DataDir, fixture.box.ID, fixture.sourcePath)); err != nil {
+ t.Fatalf("failed deletion removed the document: %v", err)
+ }
+ assertAttributeViewItemsEqual(t, source, readAttributeViewItemsTest(t, source.ID))
+ if data, err := os.ReadFile(filename); err != nil || !bytes.Equal(data, corrupted) {
+ t.Fatal("failed deletion changed the unreadable database")
+ }
+ if notebook && fixture.box.GetConf().Closed {
+ t.Fatal("failed preflight closed the notebook")
+ }
+ })
+ }
+}
+
+func TestAttributeViewExternalDeletionSaveFailureRollsBackBatch(t *testing.T) {
+ fixture, source, _ := setupAttributeViewDeletedBlockTest(t, "container")
+ dest, _, _ := addDeletedBlockTestRelation(t, source, false)
+ tree, err := LoadTreeByBlockID(fixture.sourceID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ deleted := map[string]map[string]struct{}{}
+ collectDeletedAttributeViewBlocks(tree.Root, true, deleted)
+ tx := &Transaction{}
+ before, after, err := tx.prepareDeletedBoundAttributeViewBlocks(deleted, "")
+ if err != nil {
+ t.Fatal(err)
+ }
+ ids := sortedAttributeViewFieldKeys(after)
+ after[ids[len(ids)-1]].ID = "invalid"
+ err = tx.saveAttributeViewFieldChanges(&attributeViewFieldsSnapshot{}, before, after)
+ tx.finishAttributeViewMutation(err != nil)
+ if err == nil {
+ t.Fatal("invalid save did not fail")
+ }
+ assertAttributeViewFieldsTest(t, source, readAttributeViewItemsTest(t, source.ID))
+ assertAttributeViewFieldsTest(t, dest, readAttributeViewItemsTest(t, dest.ID))
+}
+
+func TestAttributeViewBoundHistoryOneWayEncrypted(t *testing.T) {
+ fixture, source, _ := setupAttributeViewDeletedBlockTest(t, "container")
+ dest, keyID, itemID := addDeletedBlockOneWayTestRelation(t, source)
+ boxID := ast.NewNodeID()
+ markRuntimeEncryptedBox(boxID)
+ setDEKForTest(boxID, bytes.Repeat([]byte{0x79}, 32))
+ t.Cleanup(func() {
+ for _, view := range []*av.AttributeView{source, dest} {
+ av.SetAVBoxID(view.ID, "")
+ }
+ forgetRuntimeEncryptedBox(boxID)
+ encryptedBoxLifecycles.Delete(boxID)
+ cachedDEKsLock.Lock()
+ delete(cachedDEKs, boxID)
+ cachedDEKsLock.Unlock()
+ })
+ for _, view := range []*av.AttributeView{source, dest} {
+ av.SetAVBoxID(view.ID, boxID)
+ if err := av.SaveAttributeView(view); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Remove(av.GetAttributeViewDataPath(view.ID)); err != nil {
+ t.Fatal(err)
+ }
+ }
+ av.UpsertAvBackRel(dest.ID, source.ID)
+ tree, err := LoadTreeByBlockID(fixture.sourceID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ tree.Box = boxID
+ historyDir := t.TempDir()
+ if err = backupBoundAttributeViewHistory(tree, historyDir); err != nil {
+ t.Fatal(err)
+ }
+ historyPath := boundAttributeViewHistoryPath(historyDir, boxID, dest.ID)
+ data, err := os.ReadFile(historyPath)
+ if err != nil || !util.IsCiphertext(data) {
+ t.Fatalf("incoming relation history is not encrypted: %v", err)
+ }
+ deleted := map[string]map[string]struct{}{}
+ collectDeletedAttributeViewBlocks(tree.Root, true, deleted)
+ tx := &Transaction{}
+ before, after, err := tx.prepareDeletedBoundAttributeViewBlocks(deleted, boxID)
+ if err == nil {
+ err = tx.saveAttributeViewFieldChanges(&attributeViewFieldsSnapshot{boxID: boxID}, before, after)
+ }
+ tx.finishAttributeViewMutation(err != nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ corrupted := append([]byte(nil), data...)
+ corrupted[len(corrupted)-1] ^= 1
+ if err = os.WriteFile(historyPath, corrupted, 0600); err != nil {
+ t.Fatal(err)
+ }
+ tx = &Transaction{}
+ err = tx.restoreBoundAttributeViewHistory(tree, historyDir)
+ tx.finishAttributeViewMutation(err != nil)
+ if err == nil {
+ t.Fatal("corrupted incoming relation history was accepted")
+ }
+ current, err := av.ParseAttributeViewForIndexInBox(dest.ID, boxID)
+ if err != nil || len(current.GetValue(keyID, itemID).Relation.BlockIDs) != 0 {
+ t.Fatalf("failed authentication changed incoming relations: %v", err)
+ }
+ if err = os.WriteFile(historyPath, data, 0600); err != nil {
+ t.Fatal(err)
+ }
+ tx = &Transaction{}
+ err = tx.restoreBoundAttributeViewHistory(tree, historyDir)
+ tx.finishAttributeViewMutation(err != nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ current, err = av.ParseAttributeViewForIndexInBox(dest.ID, boxID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ assertAttributeViewFieldsTest(t, dest, current)
+ for _, view := range []*av.AttributeView{source, dest} {
+ stored, readErr := os.ReadFile(boundAttributeViewHistoryPath(util.DataDir, boxID, view.ID))
+ if readErr != nil || !util.IsCiphertext(stored) {
+ t.Fatal("recovery wrote a plaintext database")
+ }
+ }
+}
diff --git a/kernel/model/file.go b/kernel/model/file.go
index 46c302b96d..4b7559d7ca 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -2140,6 +2140,7 @@ func removeDoc(box *Box, p string, luteEngine *lute.Lute) (ret *parse.Tree, err
allRemoveRootIDs = append(allRemoveRootIDs, removeIDs...)
allRemoveRootIDs = gulu.Str.RemoveDuplicatedElem(allRemoveRootIDs)
removeTrees := make([]*parse.Tree, 0, len(allRemoveRootIDs))
+ deletedBindings := map[string]map[string]struct{}{}
for _, rootID := range allRemoveRootIDs {
removeTree := ret
if rootID != ret.ID {
@@ -2153,13 +2154,30 @@ func removeDoc(box *Box, p string, luteEngine *lute.Lute) (ret *parse.Tree, err
return
}
removeTrees = append(removeTrees, removeTree)
+ collectDeletedAttributeViewBlocks(removeTree.Root, true, deletedBindings)
+ }
+ boundDeletion := &Transaction{}
+ defer func() { boundDeletion.finishAttributeViewMutation(err != nil) }()
+ avBoxID := ""
+ if IsEncryptedBox(box.ID) {
+ avBoxID = box.ID
+ }
+ before, after, prepareErr := boundDeletion.prepareDeletedBoundAttributeViewBlocks(deletedBindings, avBoxID)
+ if prepareErr != nil {
+ return ret, prepareErr
}
diagnostic.Stage("index document history")
indexHistoryDir(filepath.Base(historyDir), util.NewLute())
diagnostic.Stage("remove database bindings")
+ if err = boundDeletion.saveAttributeViewFieldChanges(&attributeViewFieldsSnapshot{boxID: avBoxID}, before, after); err != nil {
+ return
+ }
+ var nonEditorTx *Transaction
for _, removeTree := range removeTrees {
removedRootPaths[removeTree.ID] = removeTree.Path
- syncDelete2AvBlock(removeTree.Root, removeTree, true, nil)
+ for _, id := range nonEditorTx.syncDelete2Block(removeTree.Root, removeTree) {
+ ReloadAttrView(id)
+ }
}
diagnostic.Stage("remove document files")
@@ -2175,6 +2193,7 @@ func removeDoc(box *Box, p string, luteEngine *lute.Lute) (ret *parse.Tree, err
return
}
logging.LogInfof("removed doc [%s%s]", box.ID, p)
+ boundDeletion.finishAttributeViewMutation(false)
removedPins := map[string]bool{}
for rootID := range removedRootPaths {
removedPins[rootID] = true
diff --git a/kernel/model/mount.go b/kernel/model/mount.go
index 8a206d1d0c..efb9d62aa7 100644
--- a/kernel/model/mount.go
+++ b/kernel/model/mount.go
@@ -32,6 +32,7 @@ import (
"github.com/88250/lute/ast"
"github.com/siyuan-note/filelock"
"github.com/siyuan-note/logging"
+ "github.com/siyuan-note/siyuan/kernel/av"
"github.com/siyuan-note/siyuan/kernel/cache"
"github.com/siyuan-note/siyuan/kernel/sql"
"github.com/siyuan-note/siyuan/kernel/task"
@@ -299,6 +300,16 @@ func RemoveBox(boxID string) (err error) {
// 删目录前固定加密状态,确保后续历史、资源和索引清理始终使用同一个安全边界。
isEncrypted := IsEncryptedBox(boxID)
+ boundDeletion := &Transaction{}
+ defer func() { boundDeletion.finishAttributeViewMutation(err != nil) }()
+ var before, after map[string]*av.AttributeView
+ if !isEncrypted {
+ // 普通数据库跨笔记本共享,删除目录前校验全部关联,避免删除成功后留下失效绑定。
+ before, after, err = boundDeletion.prepareDeletedBoundAttributeViewBlocks(deletedAttrViewBlockIDs, "")
+ if err != nil {
+ return
+ }
+ }
if !isUserGuide {
if err = EnsureAssetPrefixLocal(localPath); err != nil {
return
@@ -371,13 +382,17 @@ func RemoveBox(boxID string) (err error) {
RevokeManagedEncryptedExportsForBox(boxID)
}
+ if !isEncrypted {
+ if err = boundDeletion.saveAttributeViewFieldChanges(&attributeViewFieldsSnapshot{}, before, after); err != nil {
+ return
+ }
+ }
if err = removeBoxDir(localPath); err != nil {
return
}
+ boundDeletion.finishAttributeViewMutation(false)
removeHPathRefreshBox(boxID)
maintainPinnedDocs(nil, boxID, "")
- // 目录删除成功后再清理,避免删除失败时提前移除数据库条目。
- flushDeletedAttributeViewBlocks(deletedAttrViewBlockIDs)
// 加密笔记本删除时清理其独立加密 db 文件(含 WAL/SHM),避免残留
if isEncrypted {
sql.RemoveEncryptedDBFile(boxID)
diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index 4be70b9153..b5e0b19cd9 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -1460,15 +1460,7 @@ func (tx *Transaction) doDelete0(operation *Operation, tree *parse.Tree) (delete
}
func syncDelete2AvBlock(node *ast.Node, nodeTree *parse.Tree, delChildrenWhenDelParent bool, tx *Transaction) {
- if nil == tx {
- // 非事务调用(例如 RemoveDoc)无法批量收集,收集后立即清理已删除块的属性视图绑定行
- // https://github.com/siyuan-note/siyuan/issues/18557
- deletedAttrViewBlockIDs := map[string]map[string]struct{}{}
- collectDeletedAttributeViewBlocks(node, delChildrenWhenDelParent, deletedAttrViewBlockIDs)
- flushDeletedAttributeViewBlocks(deletedAttrViewBlockIDs)
- } else {
- tx.collectDeletedAttributeViewBlocks(node, nodeTree, delChildrenWhenDelParent)
- }
+ tx.collectDeletedAttributeViewBlocks(node, nodeTree, delChildrenWhenDelParent)
for _, avID := range tx.syncDelete2Block(node, nodeTree) {
ReloadAttrView(avID)
@@ -1584,33 +1576,40 @@ func (tx *Transaction) flushDeletedAttributeViewBlocks() {
tx.deletedAttrViewBlockIDs = map[string]map[string]struct{}{}
}
-func flushDeletedAttributeViewBlocks(deletedAttrViewBlockIDs map[string]map[string]struct{}) {
- for avID, deletedBlockIDs := range deletedAttrViewBlockIDs {
- tx := &Transaction{}
- _, boxID := av.FindAttributeViewPath(avID)
- attrView, err := tx.readAttributeViewForMutation(avID, "", boxID)
- if err != nil {
- tx.finishAttributeViewMutation(true)
- continue
- }
- current, err := cloneAttributeViewForFieldMutation(attrView)
- if err != nil || !removeAttributeViewBoundBlocks(current, deletedBlockIDs) {
- tx.finishAttributeViewMutation(true)
- continue
+// 非编辑器删除先准备整批数据库变化,保存失败或文档删除失败时统一回滚。
+func (tx *Transaction) prepareDeletedBoundAttributeViewBlocks(deleted map[string]map[string]struct{}, boxID string) (
+ before, after map[string]*av.AttributeView, err error) {
+ before, after = map[string]*av.AttributeView{}, map[string]*av.AttributeView{}
+ for _, id := range sortedAttributeViewFieldKeys(deleted) {
+ original := before[id]
+ if original == nil {
+ original, err = tx.readAttributeViewForMutation(id, "", boxID)
+ if errors.Is(err, av.ErrViewNotFound) {
+ continue
+ }
+ if err != nil {
+ return nil, nil, err
+ }
}
- before, after, err := tx.prepareDeletedAttributeViewRelations(attrView, current, "", boxID)
- if err == nil {
- for _, view := range after {
- regenAttrViewGroups(view)
+ current := after[id]
+ if current == nil {
+ current, err = cloneAttributeViewForFieldMutation(original)
+ if err != nil {
+ return nil, nil, err
}
- err = tx.saveAttributeViewFieldChanges(&attributeViewFieldsSnapshot{boxID: boxID}, before, after)
}
- tx.finishAttributeViewMutation(err != nil)
- if err != nil {
- logging.LogErrorf("remove deleted database bindings [%s] failed: %s", avID, err)
+ if !removeAttributeViewBoundBlocks(current, deleted[id]) {
continue
}
+ before[id], after[id] = original, current
+ if err = tx.clearDeletedAttributeViewRelations(original, current, "", boxID, before, after); err != nil {
+ return nil, nil, err
+ }
}
+ for _, view := range after {
+ regenAttrViewGroups(view)
+ }
+ return before, after, nil
}
func removeAttributeViewBoundBlocks(attrView *av.AttributeView, deletedBlockIDs map[string]struct{}) (changed bool) {
@@ -1888,7 +1887,15 @@ func (tx *Transaction) doInsert0(operation *Operation, tree *parse.Tree) (ret *T
// 复制为副本时移除闪卡相关属性 https://github.com/siyuan-note/siyuan/issues/13987
if !tx.isReplay {
- insertedNode.RemoveIALAttr(NodeAttrRiffDecks)
+ if insertedNode.IALAttr(NodeAttrRiffDecks) != "" {
+ insertedNode.RemoveIALAttr(NodeAttrRiffDecks)
+ // 重做使用规范化后的插入数据,副本保持与首次插入一致的闪卡状态。
+ normalized := tx.luteEngine.BlockDOM2Tree(operation.Data.(string))
+ if copied := treenode.GetNodeInTree(normalized, insertedNode.ID); copied != nil {
+ copied.RemoveIALAttr(NodeAttrRiffDecks)
+ operation.Data = tx.luteEngine.Tree2BlockDOM(normalized, tx.luteEngine.RenderOptions, tx.luteEngine.ParseOptions)
+ }
+ }
}
if ast.NodeAttributeView == insertedNode.Type {