${window.siyuan.languages.systemLog}
@@ -234,6 +254,12 @@ ${checkUpdateHTML}
about.element.querySelector("#tokenTip").innerHTML = window.siyuan.languages.about14.replace("${token}", window.siyuan.config.api.token);
});
});
+ about.element.querySelector("#vacuumDataIndex").addEventListener("click", () => {
+ fetchPost("/api/system/vacuumDataIndex", {}, (response) => {});
+ });
+ about.element.querySelector("#rebuildDataIndex").addEventListener("click", () => {
+ fetchPost("/api/system/rebuildDataIndex", {}, (response) => {});
+ });
about.element.querySelector("#exportLog").addEventListener("click", () => {
fetchPost("/api/system/exportLog", {}, (response) => {
openByMobile(response.data.zip);
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index 83005bc76..a0ddab282 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -101,8 +101,8 @@ export const initConfigSearch = (element: HTMLElement, app: App) => {
"systemLog", "importKey", "genKey", "genKeyByPW", "copyKey", "resetRepo", "systemLogTip", "export",
"downloadLatestVer", "safeQuit", "directConnection", "siyuanNote", "key", "password", "copied", "resetRepoTip",
"autoDownloadUpdatePkg", "autoDownloadUpdatePkgTip", "networkProxy", "keyPlaceholder", "initRepoKeyTip",
- "dataRepoPurge", "dataRepoPurgeTip", "dataRepoAutoPurgeIndexRetentionDays",
- "dataRepoAutoPurgeRetentionIndexesDaily"]),
+ "dataRepoPurge", "dataRepoPurgeTip", "dataRepoAutoPurgeIndexRetentionDays", "dataRepoAutoPurgeRetentionIndexesDaily",
+ "vacuumDataIndex", "vacuumDataIndexTip", "rebuildDataIndex", "rebuildDataIndexTip"]),
];
const inputElement = element.querySelector(".b3-form__icon input") as HTMLInputElement;
/// #if !BROWSER
diff --git a/app/src/dialog/processSystem.ts b/app/src/dialog/processSystem.ts
index 7ab3d11a8..df1ff6c24 100644
--- a/app/src/dialog/processSystem.ts
+++ b/app/src/dialog/processSystem.ts
@@ -386,7 +386,7 @@ export const transactionError = () => {
export const refreshFileTree = (cb?: () => void) => {
window.siyuan.storage[Constants.LOCAL_FILEPOSITION] = {};
setStorageVal(Constants.LOCAL_FILEPOSITION, window.siyuan.storage[Constants.LOCAL_FILEPOSITION]);
- fetchPost("/api/filetree/refreshFiletree", {}, () => {
+ fetchPost("/api/system/rebuildDataIndex", {}, () => {
if (cb) {
cb();
}
diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts
index 3aabfe1ca..0266cd795 100644
--- a/app/src/mobile/settings/about.ts
+++ b/app/src/mobile/settings/about.ts
@@ -94,6 +94,22 @@ export const initAbout = () => {
${window.siyuan.languages.dataRepoAutoPurgeRetentionIndexesDaily}
${window.siyuan.languages.systemLog}
@@ -283,6 +299,16 @@ export const initAbout = () => {
event.preventDefault();
event.stopPropagation();
break;
+ } else if (target.id === "vacuumDataIndex") {
+ fetchPost("/api/system/vacuumDataIndex", {}, (response) => {});
+ event.preventDefault();
+ event.stopPropagation();
+ break;
+ } else if (target.id === "rebuildDataIndex") {
+ fetchPost("/api/system/rebuildDataIndex", {}, (response) => {});
+ event.preventDefault();
+ event.stopPropagation();
+ break;
} else if (target.id === "exportLog") {
fetchPost("/api/system/exportLog", {}, (response) => {
openByMobile(response.data.zip);
diff --git a/kernel/api/av.go b/kernel/api/av.go
index a242f0b65..63050ecf3 100644
--- a/kernel/api/av.go
+++ b/kernel/api/av.go
@@ -351,7 +351,7 @@ func addAttributeViewBlocks(c *gin.Context) {
ignoreDefaultFill = arg["ignoreDefaultFill"].(bool)
}
- err := model.AddAttributeViewBlock(nil, srcs, avID, blockID, groupID, previousID, ignoreDefaultFill)
+ err := model.AddAttributeViewBlock(nil, srcs, avID, blockID, groupID, previousID, ignoreDefaultFill, map[string]interface{}{})
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
diff --git a/kernel/api/filetree.go b/kernel/api/filetree.go
index 447a813fe..933c2d62b 100644
--- a/kernel/api/filetree.go
+++ b/kernel/api/filetree.go
@@ -221,13 +221,6 @@ func removeIndexes(c *gin.Context) {
model.RemoveIndexes(paths)
}
-func refreshFiletree(c *gin.Context) {
- ret := gulu.Ret.NewResult()
- defer c.JSON(http.StatusOK, ret)
-
- model.FullReindex()
-}
-
func doc2Heading(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
@@ -548,15 +541,26 @@ func moveDocsByID(c *gin.Context) {
}
fromPaths = gulu.Str.RemoveDuplicatedElem(fromPaths)
+ var box *model.Box
toTree, err := model.LoadTreeByBlockID(toID)
if err != nil {
- ret.Code = -1
- ret.Msg = err.Error()
- ret.Data = map[string]interface{}{"closeTimeout": 7000}
- return
+ box = model.Conf.Box(toID)
+ if nil == box {
+ ret.Code = -1
+ ret.Msg = "can't found box or tree by id [" + toID + "]"
+ ret.Data = map[string]interface{}{"closeTimeout": 7000}
+ return
+ }
+ }
+
+ var toNotebook, toPath string
+ if nil != toTree {
+ toNotebook = toTree.Box
+ toPath = toTree.Path
+ } else if nil != box {
+ toNotebook = box.ID
+ toPath = "/"
}
- toNotebook := toTree.Box
- toPath := toTree.Path
callback := arg["callback"]
err = model.MoveDocs(fromPaths, toNotebook, toPath, callback)
if err != nil {
diff --git a/kernel/api/router.go b/kernel/api/router.go
index c7a7d37da..4c962cb19 100644
--- a/kernel/api/router.go
+++ b/kernel/api/router.go
@@ -67,6 +67,8 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/system/reloadUI", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, reloadUI) // TODO 请使用 /api/ui/reloadUI，该端点计划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15308#issuecomment-3077675356
ginServer.Handle("POST", "/api/system/addMicrosoftDefenderExclusion", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, addMicrosoftDefenderExclusion)
ginServer.Handle("POST", "/api/system/ignoreAddMicrosoftDefenderExclusion", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, ignoreAddMicrosoftDefenderExclusion)
+ ginServer.Handle("POST", "/api/system/vacuumDataIndex", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, vacuumDataIndex)
+ ginServer.Handle("POST", "/api/system/rebuildDataIndex", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, rebuildDataIndex)
ginServer.Handle("POST", "/api/storage/setLocalStorage", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, setLocalStorage)
ginServer.Handle("POST", "/api/storage/getLocalStorage", model.CheckAuth, getLocalStorage)
@@ -121,11 +123,11 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/filetree/doc2Heading", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, doc2Heading)
ginServer.Handle("POST", "/api/filetree/heading2Doc", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, heading2Doc)
ginServer.Handle("POST", "/api/filetree/li2Doc", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, li2Doc)
- ginServer.Handle("POST", "/api/filetree/refreshFiletree", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, refreshFiletree)
ginServer.Handle("POST", "/api/filetree/upsertIndexes", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, upsertIndexes)
ginServer.Handle("POST", "/api/filetree/removeIndexes", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, removeIndexes)
ginServer.Handle("POST", "/api/filetree/listDocTree", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, listDocTree)
ginServer.Handle("POST", "/api/filetree/moveLocalShorthands", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, moveLocalShorthands)
+ ginServer.Handle("POST", "/api/filetree/refreshFiletree ", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, rebuildDataIndex) // TODO 请使用 /api/system/rebuildDataIndex，该端点计划于 2026 年 6 月 30 日后删除 https://github.com/siyuan-note/siyuan/issues/15663#issuecomment-3219296189
ginServer.Handle("POST", "/api/format/autoSpace", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, autoSpace)
ginServer.Handle("POST", "/api/format/netImg2LocalAssets", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, netImg2LocalAssets)
diff --git a/kernel/api/system.go b/kernel/api/system.go
index 71cade88a..641bbef75 100644
--- a/kernel/api/system.go
+++ b/kernel/api/system.go
@@ -35,6 +35,20 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
+func vacuumDataIndex(c *gin.Context) {
+ ret := gulu.Ret.NewResult()
+ defer c.JSON(http.StatusOK, ret)
+
+ model.VacuumDataIndex()
+}
+
+func rebuildDataIndex(c *gin.Context) {
+ ret := gulu.Ret.NewResult()
+ defer c.JSON(http.StatusOK, ret)
+
+ model.FullReindex()
+}
+
func addMicrosoftDefenderExclusion(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 0bfec558d..1b597aa20 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -2958,14 +2958,18 @@ func setAttributeViewColumnCalc(operation *Operation) (err error) {
}
func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr) {
- err := AddAttributeViewBlock(tx, operation.Srcs, operation.AvID, operation.BlockID, operation.GroupID, operation.PreviousID, operation.IgnoreDefaultFill)
+ if nil == operation.Context {
+ operation.Context = map[string]interface{}{}
+ }
+
+ err := AddAttributeViewBlock(tx, operation.Srcs, operation.AvID, operation.BlockID, operation.GroupID, operation.PreviousID, operation.IgnoreDefaultFill, operation.Context)
if err != nil {
return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
}
return
}
-func AddAttributeViewBlock(tx *Transaction, srcs []map[string]interface{}, avID, dbBlockID, groupID, previousItemID string, ignoreDefaultFill bool) (err error) {
+func AddAttributeViewBlock(tx *Transaction, srcs []map[string]interface{}, avID, dbBlockID, groupID, previousItemID string, ignoreDefaultFill bool, context map[string]interface{}) (err error) {
slices.Reverse(srcs) // https://github.com/siyuan-note/siyuan/issues/11286
now := time.Now().UnixMilli()
@@ -3000,14 +3004,14 @@ func AddAttributeViewBlock(tx *Transaction, srcs []map[string]interface{}, avID,
if nil != src["content"] {
srcContent = src["content"].(string)
}
- if avErr := addAttributeViewBlock(now, avID, dbBlockID, groupID, previousItemID, srcItemID, boundBlockID, srcContent, isDetached, ignoreDefaultFill, tree, tx); nil != avErr {
+ if avErr := addAttributeViewBlock(now, avID, dbBlockID, groupID, previousItemID, srcItemID, boundBlockID, srcContent, isDetached, ignoreDefaultFill, tree, tx, context); nil != avErr {
return avErr
}
}
return
}
-func addAttributeViewBlock(now int64, avID, dbBlockID, groupID, previousItemID, addingItemID, addingBoundBlockID, addingBlockContent string, isDetached, ignoreDefaultFill bool, tree *parse.Tree, tx *Transaction) (err error) {
+func addAttributeViewBlock(now int64, avID, dbBlockID, groupID, previousItemID, addingItemID, addingBoundBlockID, addingBlockContent string, isDetached, ignoreDefaultFill bool, tree *parse.Tree, tx *Transaction, context map[string]interface{}) (err error) {
var node *ast.Node
if !isDetached {
node = treenode.GetNodeInTree(tree, addingBoundBlockID)
@@ -3051,6 +3055,9 @@ func addAttributeViewBlock(now int64, avID, dbBlockID, groupID, previousItemID,
blockValue.UpdatedAt = now
err = av.SaveAttributeView(attrView)
}
+
+ msg := fmt.Sprintf(Conf.language(269), getAttrViewName(attrView))
+ util.PushMsg(msg, 5000)
return
}
}
diff --git a/kernel/model/box.go b/kernel/model/box.go
index 2ad64abe9..966c6ab61 100644
--- a/kernel/model/box.go
+++ b/kernel/model/box.go
@@ -663,6 +663,49 @@ func normalizeTree(tree *parse.Tree) (yfmRootID, yfmTitle, yfmUpdated string) {
return
}
+func VacuumDataIndex() {
+ util.PushEndlessProgress(Conf.language(270))
+ defer util.PushClearProgress()
+
+ var oldsyDbSize, newSyDbSize, oldHistoryDbSize, newHistoryDbSize, oldAssetContentDbSize, newAssetContentDbSize int64
+ info, _ := os.Stat(util.DBPath)
+ if nil != info {
+ oldsyDbSize = info.Size()
+ }
+ info, _ = os.Stat(util.HistoryDBPath)
+ if nil != info {
+ oldHistoryDbSize = info.Size()
+ }
+ info, _ = os.Stat(util.AssetContentDBPath)
+ if nil != info {
+ oldAssetContentDbSize = info.Size()
+ }
+
+ sql.Vacuum()
+
+ info, _ = os.Stat(util.DBPath)
+ if nil != info {
+ newSyDbSize = info.Size()
+ }
+ info, _ = os.Stat(util.HistoryDBPath)
+ if nil != info {
+ newHistoryDbSize = info.Size()
+ }
+ info, _ = os.Stat(util.AssetContentDBPath)
+ if nil != info {
+ newAssetContentDbSize = info.Size()
+ }
+
+ logging.LogInfof("vacuum database [siyuan.db: %s -> %s, history.db: %s -> %s, asset_content.db: %s -> %s]",
+ humanize.BytesCustomCeil(uint64(oldsyDbSize), 2), humanize.BytesCustomCeil(uint64(newSyDbSize), 2),
+ humanize.BytesCustomCeil(uint64(oldHistoryDbSize), 2), humanize.BytesCustomCeil(uint64(newHistoryDbSize), 2),
+ humanize.BytesCustomCeil(uint64(oldAssetContentDbSize), 2), humanize.BytesCustomCeil(uint64(newAssetContentDbSize), 2))
+
+ releaseSize := (oldsyDbSize - newSyDbSize) + (oldHistoryDbSize - newHistoryDbSize) + (oldAssetContentDbSize - newAssetContentDbSize)
+ msg := fmt.Sprintf(Conf.language(271), humanize.BytesCustomCeil(uint64(releaseSize), 2))
+ util.PushMsg(msg, 7000)
+}
+
func FullReindex() {
task.AppendTask(task.DatabaseIndexFull, fullReindex)
task.AppendTask(task.DatabaseIndexRef, IndexRefs)
diff --git a/kernel/model/file.go b/kernel/model/file.go
index aa723d809..cf429baf8 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -991,7 +991,7 @@ func DuplicateDoc(tree *parse.Tree) {
AddAttributeViewBlock(nil, []map[string]interface{}{{
"id": n.ID,
"isDetached": false,
- }}, avID, "", "", "", false)
+ }}, avID, "", "", "", false, map[string]interface{}{})
ReloadAttrView(avID)
}
return ast.WalkContinue
diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index 898591a86..04bcf13ef 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -1099,7 +1099,7 @@ func (tx *Transaction) doLargeInsert(previousID string) (ret *TxErr) {
AddAttributeViewBlock(tx, []map[string]interface{}{{
"id": insertedNode.ID,
"isDetached": false,
- }}, avID, "", "", previousID, false)
+ }}, avID, "", "", previousID, false, map[string]interface{}{})
ReloadAttrView(avID)
}
@@ -1284,7 +1284,7 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
AddAttributeViewBlock(tx, []map[string]interface{}{{
"id": insertedNode.ID,
"isDetached": false,
- }}, avID, "", "", previousID, false)
+ }}, avID, "", "", previousID, false, map[string]interface{}{})
ReloadAttrView(avID)
}
diff --git a/kernel/sql/database.go b/kernel/sql/database.go
index 2c859d19d..e79dd8950 100644
--- a/kernel/sql/database.go
+++ b/kernel/sql/database.go
@@ -1533,3 +1533,22 @@ func SQLTemplateFuncs(templateFuncMap *template.FuncMap) {
return
}
}
+
+func Vacuum() {
+ if nil != db {
+ if _, err := db.Exec("VACUUM"); nil != err {
+ logging.LogErrorf("vacuum database failed: %s", err)
+ }
+ }
+ if nil != historyDB {
+ if _, err := historyDB.Exec("VACUUM"); nil != err {
+ logging.LogErrorf("vacuum history database failed: %s", err)
+ }
+ }
+ if nil != assetContentDB {
+ if _, err := assetContentDB.Exec("VACUUM"); nil != err {
+ logging.LogErrorf("vacuum asset content database failed: %s", err)
+ }
+ }
+ return
+}