From 8e6628cfa240dea55aac5975bb812f1a4d4c3297 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 25 Jan 2023 11:12:15 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E5=86=85=E6=A0=B8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E5=BA=A6=E6=9C=BA=E5=88=B6=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E7=A8=B3=E5=AE=9A=E6=80=A7=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/7113?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 3 ++- app/appearance/langs/es_ES.json | 7 ++++--- app/appearance/langs/fr_FR.json | 3 ++- app/appearance/langs/zh_CHT.json | 3 ++- app/appearance/langs/zh_CN.json | 3 ++- kernel/sql/queue.go | 2 +- kernel/task/queue.go | 3 ++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 62354dc79..cb5e33a48 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -867,7 +867,8 @@ "_taskAction": { "task.repo.checkout": "Execute checkout from snapshot", "task.database.index.full": "Execute rebuild index", - "task.database.index": "Execute database index queue", + "task.database.index": "Execute database index", + "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.ocr.image": "Execute image OCR to extract text", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index c780a5d2e..ca94c3a2f 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -865,11 +865,12 @@ "max": "mucho tiempo %s" }, "_taskAction": { - "task.repo.checkout": "Realizar el pago desde la instantánea", + "task.repo.checkout": "Ejecutar el pago desde la instantánea", "task.database.index.full": "Ejecutar índice de reconstrucción", - "task.database.index": "Ejecutar cola de índice de base de datos", + "task.database.index": "Ejecutar el índice de la base de datos", + "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": "Realizar corrección del índice de la base de datos", + "task.database.index.fix": "Ejecutar corrección del índice de la 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 be351ebc1..1bcf4e4ec 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -867,7 +867,8 @@ "_taskAction": { "task.repo.checkout": "Effectuer le paiement à partir d'un instantané", "task.database.index.full": "Exécuter l'index de reconstruction", - "task.database.index": "Exécuter la file d'attente d'index de la base de données", + "task.database.index": "Effectuer l'indexation de la base de données", + "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.ocr.image": "Exécute l'OCR d'image pour extraire le texte", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index dcb717b1b..794698103 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -867,7 +867,8 @@ "_taskAction": { "task.repo.checkout": "執行從快照中檢出", "task.database.index.full": "執行重建索引", - "task.database.index": "執行數據庫索引隊列", + "task.database.index": "執行數據庫索引", + "task.database.index.commit": "執行數據庫索引提交", "task.database.index.ref": "執行數據庫索引引用", "task.database.index.fix": "執行數據庫索引訂正", "task.ocr.image": "執行圖片 OCR 提取文本", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 232e2dd34..e937780ff 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -867,7 +867,8 @@ "_taskAction": { "task.repo.checkout": "执行从快照中检出", "task.database.index.full": "执行重建索引", - "task.database.index": "执行数据库索引队列", + "task.database.index": "执行数据库索引", + "task.database.index.commit": "执行数据库索引提交", "task.database.index.ref": "执行数据库索引引用", "task.database.index.fix": "执行数据库索引订正", "task.ocr.image": "执行图片 OCR 提取文本", diff --git a/kernel/sql/queue.go b/kernel/sql/queue.go index 8cf2ae89c..0d35c54b9 100644 --- a/kernel/sql/queue.go +++ b/kernel/sql/queue.go @@ -50,7 +50,7 @@ type dbQueueOperation struct { func AutoFlushTx() { for { time.Sleep(util.SQLFlushInterval) - task.PrependTask(task.DatabaseIndex, FlushQueue) + task.PrependTask(task.DatabaseIndexCommit, FlushQueue) } } diff --git a/kernel/task/queue.go b/kernel/task/queue.go index f9c646658..71991fc8f 100644 --- a/kernel/task/queue.go +++ b/kernel/task/queue.go @@ -100,7 +100,8 @@ func newTask(action string, handler interface{}, args ...interface{}) *Task { const ( RepoCheckout = "task.repo.checkout" // 从快照中检出 DatabaseIndexFull = "task.database.index.full" // 重建索引 - DatabaseIndex = "task.database.index" // 数据库索引队列 + DatabaseIndex = "task.database.index" // 数据库索引 + DatabaseIndexCommit = "task.database.index.commit" // 数据库索引提交 DatabaseIndexRef = "task.database.index.ref" // 数据库索引引用 DatabaseIndexFix = "task.database.index.fix" // 数据库索引订正 OCRImage = "task.ocr.image" // 图片 OCR 提取文本