Skip to content

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

:perf: Remove the fixed delay before flushing editing transactions https://github.com/siyuan-note/siyuan/issues/20370

Danield8930d3494f2
diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go
index dcaf238ded..8416cb4e4a 100644
--- a/kernel/model/transaction.go
+++ b/kernel/model/transaction.go
@@ -60,7 +60,6 @@ func IsMoveOutlineHeading(transactions *[]*Transaction) bool {
func FlushTxQueue() {
diagnostic := util.WatchOperation("flush editing transactions", "wait for transaction queue")
defer diagnostic.Finish()
- time.Sleep(time.Duration(50) * time.Millisecond)
for 0 < txQueueSize() || isFlushing.Load() {
time.Sleep(10 * time.Millisecond)
}
diff --git a/kernel/model/transaction_completion_test.go b/kernel/model/transaction_completion_test.go
index af6a769974..69c4f8b559 100644
--- a/kernel/model/transaction_completion_test.go
+++ b/kernel/model/transaction_completion_test.go
@@ -70,6 +70,48 @@ func TestQueuedTransactionWaitForCommit(t *testing.T) {
requireTransactionFinished(t, waitForTransactionInTest(first))
}
+func TestFlushTxQueueWaitsForDequeuedTransaction(t *testing.T) {
+ FlushTxQueue()
+ flushLock.Lock()
+ isFlushing.Store(true)
+ defer func() {
+ isFlushing.Store(false)
+ flushLock.Unlock()
+ }()
+ tx := &Transaction{}
+ transactions := []*Transaction{tx}
+ PerformTransactions(&transactions)
+ queued := takeQueuedTransactions()
+ if len(queued) != 1 || queued[0] != tx {
+ t.Fatal("transaction was not queued")
+ }
+ done := make(chan struct{})
+ go func() { FlushTxQueue(); close(done) }()
+ requireTransactionWaiting(t, done)
+ flushTx(tx)
+ requireTransactionWaiting(t, done)
+ isFlushing.Store(false)
+ requireTransactionFinished(t, done)
+ if completion := tx.completion.Load(); completion == nil {
+ t.Fatal("transaction completion was not registered")
+ } else {
+ select {
+ case <-completion.done:
+ default:
+ t.Fatal("queue flush returned before commit completion")
+ }
+ }
+}
+
+func BenchmarkFlushTxQueueEmpty(b *testing.B) {
+ FlushTxQueue()
+ flushLock.Lock()
+ b.Cleanup(flushLock.Unlock)
+ for b.Loop() {
+ FlushTxQueue()
+ }
+}
+
func TestWaitForSubmittedTransactionBatch(t *testing.T) {
FlushTxQueue()
flushLock.Lock()