Skip to content

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

:zap: Skip saving unchanged graph query configuration https://github.com/siyuan-note/siyuan/issues/20265

Daniel2192fb55c97c
diff --git a/kernel/api/graph.go b/kernel/api/graph.go
index af149aecfd..3d90fa5a9d 100644
--- a/kernel/api/graph.go
+++ b/kernel/api/graph.go
@@ -95,8 +95,7 @@ var getGraph = contractHandler(apicontract.GetGraph, func(c *gin.Context, reques
}
if model.IsAdminRoleContext(c) && !model.IsReadOnlyRoleContext(c) {
- model.Conf.Graph.Global = global
- model.Conf.Save()
+ model.Conf.SaveGraphQueryConf(global, nil)
}
boxID, nodes, links := model.BuildGraph(query)
@@ -134,8 +133,7 @@ var getLocalGraph = contractHandler(apicontract.GetLocalGraph, func(c *gin.Conte
}
if model.IsAdminRoleContext(c) && !model.IsReadOnlyRoleContext(c) {
- model.Conf.Graph.Local = local
- model.Conf.Save()
+ model.Conf.SaveGraphQueryConf(nil, local)
}
boxID, nodes, links := model.BuildTreeGraph(id, keyword)
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index c66805b664..babf8fd8b0 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -1213,6 +1213,28 @@ func (conf *AppConf) Save() {
conf.m.Lock()
defer conf.m.Unlock()
+ conf.saveLocked()
+}
+
+// SaveGraphQueryConf 仅在查询携带的图配置变化时更新并保存,比较、赋值和序列化共用配置锁。
+func (appConf *AppConf) SaveGraphQueryConf(global *conf.GlobalGraph, local *conf.LocalGraph) {
+ appConf.m.Lock()
+ defer appConf.m.Unlock()
+ changed := false
+ if global != nil && !reflect.DeepEqual(appConf.Graph.Global, global) {
+ appConf.Graph.Global = global
+ changed = true
+ }
+ if local != nil && !reflect.DeepEqual(appConf.Graph.Local, local) {
+ appConf.Graph.Local = local
+ changed = true
+ }
+ if changed && !util.ReadOnly {
+ appConf.saveLocked()
+ }
+}
+
+func (conf *AppConf) saveLocked() {
newData, err := conf.marshalForSave()
if err != nil {
logging.LogErrorf("marshal conf failed: %s", err)
diff --git a/kernel/model/conf_save_test.go b/kernel/model/conf_save_test.go
index c2030ebd70..0ebed40ef8 100644
--- a/kernel/model/conf_save_test.go
+++ b/kernel/model/conf_save_test.go
@@ -17,6 +17,7 @@
package model
import (
+ "bytes"
"os"
"path/filepath"
"testing"
@@ -60,3 +61,44 @@ func TestSaveUsesEncryptedSnapshot(t *testing.T) {
t.Fatalf("unexpected stored MCP OAuth data: %q", stored.MCPOAuth)
}
}
+
+func TestGraphQuerySavesOnlyChangedConfiguration(t *testing.T) {
+ oldConfDir, oldReadOnly := util.ConfDir, util.ReadOnly
+ util.ConfDir, util.ReadOnly = t.TempDir(), false
+ t.Cleanup(func() { util.ConfDir, util.ReadOnly = oldConfDir, oldReadOnly })
+ app := NewAppConf()
+ app.Graph = appconf.NewGraph()
+ global, local := app.Graph.Global, app.Graph.Local
+ path := filepath.Join(util.ConfDir, "conf.json")
+ marker := []byte("unchanged graph query must not serialize configuration")
+ if err := os.WriteFile(path, marker, 0600); err != nil {
+ t.Fatal(err)
+ }
+ app.SaveGraphQueryConf(appconf.NewGlobalGraph(), appconf.NewLocalGraph())
+ data, err := os.ReadFile(path)
+ if err != nil || !bytes.Equal(data, marker) || app.Graph.Global != global || app.Graph.Local != local {
+ t.Fatalf("unchanged query saved or replaced configuration: %s, %v", data, err)
+ }
+ for _, globalQuery := range []bool{true, false} {
+ if globalQuery {
+ next := appconf.NewGlobalGraph()
+ next.MinRefs = 7
+ app.SaveGraphQueryConf(next, nil)
+ } else {
+ next := appconf.NewLocalGraph()
+ next.DailyNote = true
+ app.SaveGraphQueryConf(nil, next)
+ }
+ data, err = os.ReadFile(path)
+ if err != nil {
+ t.Fatal(err)
+ }
+ stored := NewAppConf()
+ if err = gulu.JSON.UnmarshalJSON(data, stored); err != nil {
+ t.Fatal(err)
+ }
+ if stored.Graph.Global.MinRefs != 7 || stored.Graph.Local.DailyNote != !globalQuery {
+ t.Fatalf("graph change was not persisted: %+v", stored.Graph)
+ }
+ }
+}