Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 09:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 重建历史索引遮罩 https://github.com/siyuan-note/siyuan/issues/7386

Browse source
This commit is contained in:
Liang Ding 2023-02-17 22:29:12 +08:00
parent fa1ee8f4a1
commit d5999b26d8
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
kernel/sql/queue_history.go
View file

@ -39,8 +39,7 @@ var (
type historyDBQueueOperation struct {
inQueueTime time.Time
action string // index/deletePathPrefix
context map[string]interface{} // 消息推送上下文
action string // index/deletePathPrefix
histories []*History // index
pathPrefix string // deletePathPrefix
@ -71,9 +70,10 @@ func FlushHistoryQueue() {
return
}
op.context["current"] = i
op.context["total"] = total
if err = execHistoryOp(op, tx); nil != err {
context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}
context["current"] = i
context["total"] = total
if err = execHistoryOp(op, tx, context); nil != err {
tx.Rollback()
logging.LogErrorf("queue operation failed: %s", err)
continue
@ -99,12 +99,12 @@ func FlushHistoryQueue() {
}
}
func execHistoryOp(op *historyDBQueueOperation, tx *sql.Tx) (err error) {
func execHistoryOp(op *historyDBQueueOperation, tx *sql.Tx, context map[string]interface{}) (err error) {
switch op.action {
case "index":
err = insertHistories(tx, op.histories, op.context)
err = insertHistories(tx, op.histories, context)
case "deletePathPrefix":
err = deleteHistoriesByPathPrefix(tx, op.pathPrefix, op.context)
err = deleteHistoriesByPathPrefix(tx, op.pathPrefix, context)
default:
msg := fmt.Sprintf("unknown history operation [%s]", op.action)
logging.LogErrorf(msg)
@ -117,17 +117,15 @@ func DeleteHistoriesByPathPrefixQueue(pathPrefix string) {
historyDBQueueLock.Lock()
defer historyDBQueueLock.Unlock()
newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "deletePathPrefix", pathPrefix: pathPrefix,
context: map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}}
newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "deletePathPrefix", pathPrefix: pathPrefix}
historyOperationQueue = append(historyOperationQueue, newOp)
}
func IndexHistoriesQueue(histories []*History, context map[string]interface{}) {
func IndexHistoriesQueue(histories []*History) {
historyDBQueueLock.Lock()
defer historyDBQueueLock.Unlock()
newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "index", histories: histories,
context: context}
newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "index", histories: histories}
historyOperationQueue = append(historyOperationQueue, newOp)
}