From 19f44148d44a6953d969b7333688ea272c0e5094 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Thu, 9 Feb 2023 17:18:29 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 1 - app/appearance/langs/es_ES.json | 1 - app/appearance/langs/fr_FR.json | 1 - app/appearance/langs/zh_CHT.json | 1 - app/appearance/langs/zh_CN.json | 1 - kernel/cache/ial.go | 8 ++++---- kernel/model/box.go | 2 -- kernel/model/history.go | 3 ++- kernel/model/index.go | 3 --- kernel/sql/cache.go | 8 ++++---- kernel/sql/database.go | 4 ++-- kernel/sql/queue.go | 5 +++++ kernel/task/queue.go | 1 - 13 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 6a02710c2..37f06c754 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -882,7 +882,6 @@ "task.database.index.commit": "Execute database index commit", "task.database.index.ref": "Execute database index reference", "task.database.index.fix": "Execute database index fix", - "task.database.cache": "Execute database cache", "task.ocr.image": "Execute image OCR to extract text", "task.history.generateDoc": "Execute GenerateDoc History", "task.database.index.embedBlock": "Execute database index embed block", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index ea9e37143..1887adff0 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -882,7 +882,6 @@ "task.database.index.commit": "Ejecutar la confirmación del índice de la base de datos", "task.database.index.ref": "Ejecutar referencia de índice de base de datos", "task.database.index.fix": "Ejecutar corrección del índice de la base de datos", - "task.database.cache": "Ejecutar caché de base de datos", "task.ocr.image": "Ejecutar OCR de imagen para extraer texto", "task.history.generateDoc": "Ejecutar Historial GenerateDoc", "task.database.index.embedBlock": "Ejecutar bloque de incrustación de índice de base de datos", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index bd2857ba7..f24311ac0 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -882,7 +882,6 @@ "task.database.index.commit": "Effectuer la validation de l'index de la base de données", "task.database.index.ref": "Exécuter la référence d'index de la base de données", "task.database.index.fix": "Effectuer la correction de l'index de la base de données", - "task.database.cache": "Effectuer le cache de la base de données", "task.ocr.image": "Exécute l'OCR d'image pour extraire le texte", "task.history.generateDoc": "Exécuter l'historique de GenerateDoc", "task.database.index.embedBlock": "Exécuter le bloc d'intégration d'index de base de données", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 914e331fa..ffa6e20a7 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -882,7 +882,6 @@ "task.database.index.commit": "執行數據庫索引提交", "task.database.index.ref": "執行數據庫索引引用", "task.database.index.fix": "執行數據庫索引訂正", - "task.database.cache": "執行數據庫緩存", "task.ocr.image": "執行圖片 OCR 提取文本", "task.history.generateDoc": "執行生成文件歷史", "task.database.index.embedBlock": "執行數據庫索引嵌入塊", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index e1e516029..24e4b3abd 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -882,7 +882,6 @@ "task.database.index.commit": "执行数据库索引提交", "task.database.index.ref": "执行数据库索引引用", "task.database.index.fix": "执行数据库索引订正", - "task.database.cache": "执行数据库缓存", "task.ocr.image": "执行图片 OCR 提取文本", "task.history.generateDoc": "执行生成文件历史", "task.database.index.embedBlock": "执行数据库索引嵌入块", diff --git a/kernel/cache/ial.go b/kernel/cache/ial.go index 35a9aa67d..e902dd0b1 100644 --- a/kernel/cache/ial.go +++ b/kernel/cache/ial.go @@ -24,8 +24,8 @@ import ( ) var docIALCache, _ = ristretto.NewCache(&ristretto.Config{ - NumCounters: 200000, - MaxCost: 1000 * 1000 * 32, + NumCounters: 10240, + MaxCost: 1024, BufferItems: 64, }) @@ -55,8 +55,8 @@ func ClearDocsIAL() { } var blockIALCache, _ = ristretto.NewCache(&ristretto.Config{ - NumCounters: 800000, - MaxCost: 1000 * 1000 * 64, + NumCounters: 10240, + MaxCost: 1024, BufferItems: 64, }) diff --git a/kernel/model/box.go b/kernel/model/box.go index 20e7c7710..36216e69d 100644 --- a/kernel/model/box.go +++ b/kernel/model/box.go @@ -506,7 +506,6 @@ func ReloadUI() { func FullReindex() { task.AppendTask(task.DatabaseIndexFull, fullReindex) - task.AppendTask(task.DatabaseCache, sql.EnableCache) task.AppendTask(task.DatabaseIndexRef, IndexRefs) task.AppendTask(task.ReloadUI, util.ReloadUI) } @@ -521,7 +520,6 @@ func fullReindex() { } treenode.InitBlockTree(true) - sql.DisableCache() openedBoxes := Conf.GetOpenedBoxes() for _, openedBox := range openedBoxes { index(openedBox.ID) diff --git a/kernel/model/history.go b/kernel/model/history.go index 046cea6df..d560dc4e7 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -242,6 +242,7 @@ func RollbackDocHistory(boxID, historyPath string) (err error) { return } + util.ReloadUI() FullReindex() IncSync() return nil @@ -297,9 +298,9 @@ func RollbackNotebookHistory(historyPath string) (err error) { return } + util.ReloadUI() FullReindex() IncSync() - ReloadUI() return nil } diff --git a/kernel/model/index.go b/kernel/model/index.go index 2d321826b..36fcdb0f6 100644 --- a/kernel/model/index.go +++ b/kernel/model/index.go @@ -131,9 +131,6 @@ func index(boxID string) { } func IndexRefs() { - sql.EnableCache() - defer sql.ClearBlockCache() - start := time.Now() util.SetBootDetails("Resolving refs...") util.PushStatusBar(Conf.Language(54)) diff --git a/kernel/sql/cache.go b/kernel/sql/cache.go index c0cc49e8f..f5688a273 100644 --- a/kernel/sql/cache.go +++ b/kernel/sql/cache.go @@ -29,17 +29,17 @@ import ( ) var memCache, _ = ristretto.NewCache(&ristretto.Config{ - NumCounters: 800000, - MaxCost: 1000 * 1000 * 100, + NumCounters: 10240, + MaxCost: 1024, BufferItems: 64, }) var disabled = true -func EnableCache() { +func enableCache() { disabled = false } -func DisableCache() { +func disableCache() { disabled = true } diff --git a/kernel/sql/database.go b/kernel/sql/database.go index 5794f5461..8ab68b15a 100644 --- a/kernel/sql/database.go +++ b/kernel/sql/database.go @@ -68,8 +68,8 @@ func InitDatabase(forceRebuild bool) (err error) { defer initDatabaseLock.Unlock() ClearBlockCache() - DisableCache() - defer EnableCache() + disableCache() + defer enableCache() util.IncBootProgress(2, "Initializing database...") diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go index 7ac078ae2..1fa69de1d 100644 --- a/kernel/sql/queue.go +++ b/kernel/sql/queue.go @@ -105,6 +105,11 @@ func FlushQueue() { context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar} total := len(ops) + if 512 < total { + disableCache() + defer enableCache() + } + for i, op := range ops { if util.IsExiting { return diff --git a/kernel/task/queue.go b/kernel/task/queue.go index ac178affb..fcc18d274 100644 --- a/kernel/task/queue.go +++ b/kernel/task/queue.go @@ -86,7 +86,6 @@ const ( DatabaseIndexCommit = "task.database.index.commit" // 数据库索引提交 DatabaseIndexRef = "task.database.index.ref" // 数据库索引引用 DatabaseIndexFix = "task.database.index.fix" // 数据库索引订正 - DatabaseCache = "task.database.cache" // 数据库缓存 OCRImage = "task.ocr.image" // 图片 OCR 提取文本 HistoryGenerateDoc = "task.history.generateDoc" // 生成文件历史 DatabaseIndexEmbedBlock = "task.database.index.embedBlock" // 数据库索引嵌入块