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: Remove stale relations when deleting database-bound blocks https://github.com/siyuan-note/siyuan/issues/20174
Danielb71bd9962082
diff --git a/kernel/model/attribute_view_block_undo.go b/kernel/model/attribute_view_block_undo.goindex bfbcfd684f..8f48a2b5ec 100644--- a/kernel/model/attribute_view_block_undo.go+++ b/kernel/model/attribute_view_block_undo.go@@ -3,6 +3,7 @@ package modelimport ("errors""fmt"+ "reflect""slices""strings"@@ -56,34 +57,43 @@ func (tx *Transaction) flushAttributeViewBlockDeletions() error {if !removeAttributeViewBoundItems(current, tx.deletedAttrViewBlockIDs[key], true) {continue}+ before, after, err := tx.prepareDeletedAttributeViewRelations(original, current, carrier, boxID)+ if err != nil {+ return err+ }state := &attributeViewFieldsSnapshot{avID: avID, keyID: avID, blockID: carrier, boxID: boxID,- changes: map[string]*attributeViewFieldChange{}, fieldTypes: map[string]map[string]av.KeyType{avID: {}}}- for _, kv := range original.KeyValues {- if remaining, _ := current.GetKeyValues(kv.Key.ID); len(remaining.Values) != len(kv.Values) {- state.fieldTypes[avID][kv.Key.ID] = kv.Key.Type+ changes: map[string]*attributeViewFieldChange{}, fieldTypes: map[string]map[string]av.KeyType{}}+ for id, view := range before {+ state.fieldTypes[id] = map[string]av.KeyType{}+ for _, kv := range view.KeyValues {+ remaining, _ := after[id].GetKeyValues(kv.Key.ID)+ if !reflect.DeepEqual(kv.Values, remaining.Values) {+ state.fieldTypes[id][kv.Key.ID] = kv.Key.Type+ }}+ regenAttrViewGroups(after[id])}- regenAttrViewGroups(current)- if err = tx.saveAttributeViewFieldChanges(state, map[string]*av.AttributeView{avID: original},- map[string]*av.AttributeView{avID: current}); err != nil {+ if err = tx.saveAttributeViewFieldChanges(state, before, after); err != nil {return err}if !tx.fromAPI || tx.isReplay || len(tx.UndoOperations) == 0 {continue}- current, err = tx.readAttributeViewForMutation(avID, carrier, boxID)- if err != nil {- return err- }- oldJSON, err := attributeViewFieldJSON(original)- if err != nil {- return err- }- newJSON, err := attributeViewFieldJSON(current)- if err != nil {- return err+ for id, view := range before {+ persisted, readErr := tx.readAttributeViewForMutation(id, carrier, boxID)+ if readErr != nil {+ return readErr+ }+ oldJSON, jsonErr := attributeViewFieldJSON(view)+ if jsonErr != nil {+ return jsonErr+ }+ newJSON, jsonErr := attributeViewFieldJSON(persisted)+ if jsonErr != nil {+ return jsonErr+ }+ state.changes[id] = diffAttributeViewFields(oldJSON, newJSON, true, true)}- state.changes[avID] = diffAttributeViewFields(oldJSON, newJSON, true, true)inverse := &Operation{Action: "insertAttrViewBlock", AvID: avID, ID: avID, BlockID: carrier,attributeViewFields: state, attributeViewFieldUndo: true}for _, value := range original.GetBlockKeyValues().Values {@@ -99,6 +109,66 @@ func (tx *Transaction) flushAttributeViewBlockDeletions() error {return nil}+// 删除绑定条目时清理所有指向这些条目的关联,两个方向一起保存和撤销。+func (tx *Transaction) prepareDeletedAttributeViewRelations(original, current *av.AttributeView, carrier, boxID string) (+ 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+ }+ }+ 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))) {+ if id == "" {+ continue+ }+ view := after[id]+ var source *av.AttributeView+ if view == nil {+ source, err = tx.readAttributeViewForMutation(id, carrier, boxID)+ if errors.Is(err, av.ErrViewNotFound) {+ continue+ }+ if err != nil {+ return nil, nil, err+ }+ view, err = cloneAttributeViewForFieldMutation(source)+ if err != nil {+ return nil, nil, err+ }+ }+ changed := false+ for _, kv := range view.KeyValues {+ if kv.Key.Type != av.KeyTypeRelation || kv.Key.Relation == nil || kv.Key.Relation.AvID != original.ID {+ continue+ }+ for _, value := range kv.Values {+ if value == nil || value.Relation == nil {+ continue+ }+ count := len(value.Relation.BlockIDs)+ value.Relation.BlockIDs = slices.DeleteFunc(value.Relation.BlockIDs, func(id string) bool { return removed[id] })+ if len(value.Relation.BlockIDs) != count {+ value.Relation.Contents = nil+ changed = true+ }+ }+ }+ if changed && source != nil {+ before[id], after[id] = source, view+ }+ }+ return before, after, nil+}+func (tx *Transaction) restoreDeletedAttributeViewBlocks(op *Operation) error {state := op.attributeViewFieldsif err := tx.rememberAttributeViewMutationTree(state.blockID); err != nil {diff --git a/kernel/model/attribute_view_block_undo_fts5_test.go b/kernel/model/attribute_view_block_undo_fts5_test.goindex 1477d57e4e..c9aa47fde6 100644--- a/kernel/model/attribute_view_block_undo_fts5_test.go+++ b/kernel/model/attribute_view_block_undo_fts5_test.go@@ -193,11 +193,21 @@ func TestAttributeViewDeletedBlockUndoRelations(t *testing.T) {t.Run(map[bool]string{false: "other database", true: "same database"}[self], func(t *testing.T) {fixture, source, tx := setupAttributeViewDeletedBlockTest(t, "container")dest, backID, targetID := addDeletedBlockTestRelation(t, source, self)+ keptID := source.GetBlockKeyValues().Values[2].BlockID+ back := dest.GetValue(backID, targetID)+ back.Relation.BlockIDs = append([]string{keptID}, back.Relation.BlockIDs...)+ if err := av.SaveAttributeView(dest); err != nil {+ t.Fatal(err)+ }if err := PerformTxSync(tx); err != nil {t.Fatal(err)}entry := GlobalUndoLog.Peek(fixture.sourceID)for cycle := 0; cycle < 2; cycle++ {+ back := readAttributeViewItemsTest(t, dest.ID).GetValue(backID, targetID)+ if !slices.Equal(back.Relation.BlockIDs, []string{keptID}) {+ t.Fatalf("deletion retained stale back relations: %v", back.Relation.BlockIDs)+ }for _, id := range []string{source.ID, dest.ID} {rendered := readAttributeViewItemsTest(t, id)for _, view := range rendered.Views {@@ -209,7 +219,7 @@ func TestAttributeViewDeletedBlockUndoRelations(t *testing.T) {}replayAttributeViewFieldsTest(t, entry.UndoOperationsForReplay())assertAttributeViewFieldsTest(t, source, readAttributeViewItemsTest(t, source.ID))- back := readAttributeViewItemsTest(t, dest.ID).GetValue(backID, targetID)+ back = readAttributeViewItemsTest(t, dest.ID).GetValue(backID, targetID)if !slices.Equal(back.Relation.BlockIDs, dest.GetValue(backID, targetID).Relation.BlockIDs) {t.Fatal("block undo did not restore the back relation")}@@ -255,6 +265,47 @@ func addDeletedBlockTestRelation(t *testing.T, source *av.AttributeView, self boreturn dest, backID, targetID}+func TestAttributeViewDeletedBlockRelationsWriteFailure(t *testing.T) {+ fixture, source, tx := setupAttributeViewDeletedBlockTest(t, "container")+ dest, _, _ := addDeletedBlockTestRelation(t, source, false)+ tx.writeTransactionTree = func(*parse.Tree) error { return errors.New("injected document write failure") }+ if err := PerformTxSync(tx); err == nil {+ t.Fatal("failed deletion succeeded")+ }+ assertAttributeViewFieldsTest(t, source, readAttributeViewItemsTest(t, source.ID))+ assertAttributeViewFieldsTest(t, dest, readAttributeViewItemsTest(t, dest.ID))+ tree, err := LoadTreeByBlockID(fixture.sourceID)+ if err != nil || treenode.GetNodeInTree(tree, tx.DoOperations[0].ID) == nil {+ t.Fatalf("failed deletion did not restore the document: %v", err)+ }+}++func TestAttributeViewDeletedBlockOneWayRelations(t *testing.T) {+ fixture, source, tx := setupAttributeViewDeletedBlockTest(t, "block")+ dest, backID, targetID := addDeletedBlockTestRelation(t, source, false)+ for _, view := range []*av.AttributeView{source, dest} {+ for _, kv := range view.KeyValues {+ if kv.Key.Relation != nil {+ kv.Key.Relation.IsTwoWay = false+ }+ }+ if err := av.SaveAttributeView(view); err != nil {+ t.Fatal(err)+ }+ }+ if err := PerformTxSync(tx); err != nil {+ t.Fatal(err)+ }+ got := readAttributeViewItemsTest(t, dest.ID).GetValue(backID, targetID).Relation.BlockIDs+ expected := dest.GetValue(backID, targetID).Relation.BlockIDs[1:]+ if !slices.Equal(got, expected) {+ t.Fatalf("one-way relation retained a deleted entry: %v", got)+ }+ replayAttributeViewFieldsTest(t, GlobalUndoLog.Peek(fixture.sourceID).UndoOperationsForReplay())+ assertAttributeViewFieldsTest(t, source, readAttributeViewItemsTest(t, source.ID))+ assertAttributeViewFieldsTest(t, dest, readAttributeViewItemsTest(t, dest.ID))+}+func setupAttributeViewDeletedBlockTest(t *testing.T, mode string) (*fileOperationTestFixture, *av.AttributeView, *Transaction) {t.Helper()fixture, source, _, _ := setupAttributeViewItemsTest(t, false)