Skip to content

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

:zap: Wait for explicitly submitted transaction batches https://github.com/siyuan-note/siyuan/issues/20262

Danielbd5fc2e39bce
diff --git a/kernel/api/block_op.go b/kernel/api/block_op.go
index ed8d6678a5..5ddefffd55 100644
--- a/kernel/api/block_op.go
+++ b/kernel/api/block_op.go
@@ -102,7 +102,7 @@ var updateTaskListItemMarker = contractHandler(apicontract.UpdateTaskListItemMar
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -145,7 +145,7 @@ var batchUpdateTaskListItemMarker = contractHandler(apicontract.BatchUpdateTaskL
transactions := []*model.Transaction{tx}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -187,7 +187,7 @@ var moveOutlineHeading = contractHandler(apicontract.MoveOutlineHeading, func(c
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -232,7 +232,7 @@ var appendDailyNoteBlock = contractHandler(apicontract.AppendDailyNoteBlock, fun
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -277,7 +277,7 @@ var prependDailyNoteBlock = contractHandler(apicontract.PrependDailyNoteBlock, f
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -332,7 +332,7 @@ var unfoldBlock = contractHandler(apicontract.UnfoldBlock, func(c *gin.Context,
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return apicontract.Success(apicontract.Null{})
@@ -387,7 +387,7 @@ var foldBlock = contractHandler(apicontract.FoldBlock, func(c *gin.Context, requ
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return apicontract.Success(apicontract.Null{})
@@ -566,7 +566,7 @@ var batchAppendBlock = contractHandler(apicontract.BatchAppendBlock, func(c *gin
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -609,7 +609,7 @@ var prependBlock = contractHandler(apicontract.PrependBlock, func(c *gin.Context
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -656,7 +656,7 @@ var batchPrependBlock = contractHandler(apicontract.BatchPrependBlock, func(c *g
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
@@ -774,7 +774,7 @@ var batchInsertBlock = contractHandler(apicontract.BatchInsertBlock, func(c *gin
}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
broadcastTransactions(transactions)
return blockTransactionsResponse(transactions)
diff --git a/kernel/api/riff.go b/kernel/api/riff.go
index 99b0eadef6..e974f7cb68 100644
--- a/kernel/api/riff.go
+++ b/kernel/api/riff.go
@@ -131,7 +131,7 @@ var removeRiffCards = contractHandler(apicontract.RemoveRiffCards, func(c *gin.C
}
transactions := []*model.Transaction{{DoOperations: []*model.Operation{{Action: "removeFlashcards", DeckID: request.DeckID, BlockIDs: blockIDs}}}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
if request.DeckID != "" {
return apicontract.Success(deckData(model.Decks[request.DeckID]))
}
@@ -145,7 +145,7 @@ var addRiffCards = contractHandler(apicontract.AddRiffCards, func(c *gin.Context
}
transactions := []*model.Transaction{{DoOperations: []*model.Operation{{Action: "addFlashcards", DeckID: request.DeckID, BlockIDs: blockIDs}}}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
return apicontract.Success(deckData(model.Decks[request.DeckID]))
})
diff --git a/kernel/cli/cmd/block.go b/kernel/cli/cmd/block.go
index 3f70b867db..ddf24285f2 100644
--- a/kernel/cli/cmd/block.go
+++ b/kernel/cli/cmd/block.go
@@ -395,7 +395,7 @@ var blockDeleteCmd = &cobra.Command{
}},
}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
if bt != nil {
model.AppendPushReloadProtyleEntry(bt.RootID)
diff --git a/kernel/cli/cmd/dailynote.go b/kernel/cli/cmd/dailynote.go
index 70cba05e28..80efdbe108 100644
--- a/kernel/cli/cmd/dailynote.go
+++ b/kernel/cli/cmd/dailynote.go
@@ -92,7 +92,7 @@ var dailynoteAppendCmd = &cobra.Command{
}},
}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
model.AppendPushReloadProtyleEntry(parentID)
fmt.Println(parentID)
return nil
@@ -133,7 +133,7 @@ var dailynotePrependCmd = &cobra.Command{
}},
}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
model.AppendPushReloadProtyleEntry(parentID)
fmt.Println(parentID)
return nil
diff --git a/kernel/mcp/tools/asset.go b/kernel/mcp/tools/asset.go
index 136c966e23..e12bc0158a 100644
--- a/kernel/mcp/tools/asset.go
+++ b/kernel/mcp/tools/asset.go
@@ -151,7 +151,7 @@ func assetCreateHTML(args map[string]any) (CallToolResult, error) {
}},
}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
util.PushReloadProtyle(docBlockTree.RootID)
return CallToolResult{
diff --git a/kernel/mcp/tools/dailynote.go b/kernel/mcp/tools/dailynote.go
index a40e58406b..9ca65f4d62 100644
--- a/kernel/mcp/tools/dailynote.go
+++ b/kernel/mcp/tools/dailynote.go
@@ -115,7 +115,7 @@ func dailynoteAppend(args map[string]any) (CallToolResult, error) {
}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
util.PushReloadProtyle(parentID)
return CallToolResult{Content: []ContentItem{{Type: "text", Text: fmt.Sprintf("block appended to daily note: %s", parentID)}}}, nil
}
@@ -153,7 +153,7 @@ func dailynotePrepend(args map[string]any) (CallToolResult, error) {
}}
model.PerformTransactions(&transactions)
- model.FlushTxQueue()
+ model.WaitForTransactions(transactions)
util.PushReloadProtyle(parentID)
return CallToolResult{Content: []ContentItem{{Type: "text", Text: fmt.Sprintf("block prepended to daily note: %s", parentID)}}}, nil
}
diff --git a/kernel/model/file.go b/kernel/model/file.go
index 4761b8187d..e76487f55f 100644
--- a/kernel/model/file.go
+++ b/kernel/model/file.go
@@ -2495,7 +2495,7 @@ func performCreateDocTransaction(tree *parse.Tree, syncWrite bool) (err error) {
return
}
PerformTransactions(&[]*Transaction{transaction})
- FlushTxQueue()
+ transaction.WaitForCommit()
return
}
diff --git a/kernel/model/flashcard.go b/kernel/model/flashcard.go
index 6873d6d40d..ed2fe912a7 100644
--- a/kernel/model/flashcard.go
+++ b/kernel/model/flashcard.go
@@ -354,7 +354,7 @@ func resetFlashcards(deckID string, blockIDs []string) {
}
PerformTransactions(&transactions)
- FlushTxQueue()
+ WaitForTransactions(transactions)
}
func GetFlashcardNotebooks() (ret []*Box) {
diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index 089eae3ccd..ca58bf79e1 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -66,6 +66,15 @@ func FlushTxQueue() {
}
}
+// WaitForTransactions 等待已提交批次的写入、撤销记录和清理完成,不等待后续事务到达。
+func WaitForTransactions(transactions []*Transaction) {
+ diagnostic := util.WatchOperation("flush editing transactions", "wait for submitted transactions")
+ defer diagnostic.Finish()
+ for _, tx := range transactions {
+ tx.WaitForCommit()
+ }
+}
+
// PerformTxSync 同步执行单笔事务并返回错误,供需要获知落盘结果的调用方使用。
// 与异步入队的 PerformTransactions 不同,这里直接持有 flushLock 串行执行 performTx,
// 失败时返回原始错误(不转成推送消息),调用方可以保留待处理数据或回滚状态。
diff --git a/kernel/model/transaction_completion_test.go b/kernel/model/transaction_completion_test.go
index c52ce53748..af6a769974 100644
--- a/kernel/model/transaction_completion_test.go
+++ b/kernel/model/transaction_completion_test.go
@@ -70,6 +70,45 @@ func TestQueuedTransactionWaitForCommit(t *testing.T) {
requireTransactionFinished(t, waitForTransactionInTest(first))
}
+func TestWaitForSubmittedTransactionBatch(t *testing.T) {
+ FlushTxQueue()
+ flushLock.Lock()
+ defer func() {
+ for _, tx := range takeQueuedTransactions() {
+ flushTx(tx)
+ }
+ flushLock.Unlock()
+ }()
+ first, second := &Transaction{Timestamp: 1}, &Transaction{Timestamp: 2}
+ transactions := []*Transaction{second, first}
+ PerformTransactions(&transactions)
+ done := make(chan struct{})
+ go func() { WaitForTransactions(transactions); close(done) }()
+ requireTransactionWaiting(t, done)
+ queued := takeQueuedTransactions()
+ defer func() {
+ for _, tx := range queued {
+ flushTx(tx)
+ }
+ }()
+ flushTx(queued[0])
+ queued = queued[1:]
+ requireTransactionWaiting(t, done)
+ flushTx(queued[0])
+ queued = nil
+ requireTransactionFinished(t, done)
+
+ // 后续事务尚未执行时,已完成批次和空批次仍能返回。
+ later := []*Transaction{{Timestamp: 3}}
+ PerformTransactions(&later)
+ completed, empty := make(chan struct{}), make(chan struct{})
+ go func() { WaitForTransactions(transactions); close(completed) }()
+ go func() { WaitForTransactions(nil); close(empty) }()
+ requireTransactionFinished(t, completed)
+ requireTransactionFinished(t, empty)
+ requireTransactionWaiting(t, waitForTransactionInTest(later[0]))
+}
+
func TestTransactionCompletionOnAllExecutionExits(t *testing.T) {
fixture := setupStructureTransactionTest(t)
for _, mode := range []string{"sync", "queue", "sync-notify"} {