Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
De-duplicate batched writes by key in cached store
  • Loading branch information
julienrbrt committed Apr 28, 2026
commit 2d3dfd7336d8d327389179da0ebb670550265f73
11 changes: 8 additions & 3 deletions pkg/store/cached_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (cs *CachedStore) startWriteLoop() {
ops := []asyncWriteOp{op}

timer := time.NewTimer(batchWindow)
collect:
collect:
for {
select {
case op, ok := <-cs.writeCh:
Expand All @@ -135,17 +135,22 @@ func (cs *CachedStore) startWriteLoop() {
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

last := make(map[string]asyncWriteOp, len(ops))
for _, o := range ops {
last[o.key] = o
}

var puts []MetadataKV
var deletes []string
for _, o := range ops {
for _, o := range last {
if o.isDelete {
deletes = append(deletes, o.key)
} else {
puts = append(puts, MetadataKV{Key: o.key, Value: o.value})
}
}

if err := cs.Store.BatchMetadata(context.Background(), puts, deletes); err != nil {
if err := cs.BatchMetadata(context.Background(), puts, deletes); err != nil {
for _, o := range ops {
cs.logger.Error().Err(err).Str("key", o.key).
Bool("delete", o.isDelete).
Expand Down
40 changes: 38 additions & 2 deletions pkg/store/cached_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"
"time"

ds "github.com/ipfs/go-datastore"
"github.com/rs/zerolog"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -337,7 +338,7 @@ func TestCachedStore_Close_FlushesPendingWrites(t *testing.T) {
cs.startWriteLoop()

const n = 100
for i := 0; i < n; i++ {
for i := range n {
k := fmt.Sprintf("key-%d", i)
require.NoError(t, cs.SetMetadata(ctx, k, []byte(k)))
}
Expand All @@ -348,7 +349,7 @@ func TestCachedStore_Close_FlushesPendingWrites(t *testing.T) {
cs.stopMu.Unlock()
<-done

for i := 0; i < n; i++ {
for i := range n {
k := fmt.Sprintf("key-%d", i)
v, err := base.GetMetadata(ctx, k)
require.NoError(t, err)
Expand All @@ -372,3 +373,38 @@ func TestCachedStore_WriteAfterClose_FallsBack(t *testing.T) {
err = cs.SetMetadata(ctx, "after", []byte("sync"))
require.Error(t, err)
}

func TestCachedStore_CoalescesSameKeyOps(t *testing.T) {
ctx := context.Background()

kv, err := NewTestInMemoryKVStore()
require.NoError(t, err)

require.NoError(t, kv.Put(ctx, ds.NewKey(GetMetaKey("k")), []byte("original")))

base := New(kv)

writeCh := make(chan asyncWriteOp, asyncWriteBufferSize)
done := make(chan struct{})
cs := &CachedStore{
Store: base,
writeCh: writeCh,
done: done,
logger: zerolog.Nop(),
}
cs.startWriteLoop()

require.NoError(t, cs.SetMetadata(ctx, "k", []byte("v1")))
require.NoError(t, cs.DeleteMetadata(ctx, "k"))
require.NoError(t, cs.SetMetadata(ctx, "k", []byte("v2")))

cs.stopMu.Lock()
cs.stopped = true
close(writeCh)
cs.stopMu.Unlock()
<-done

v, err := base.GetMetadata(ctx, "k")
require.NoError(t, err)
require.Equal(t, []byte("v2"), v, "last write (Set) should win over delete")
}
Loading