Skip to content

Do not reuse datastore Batch #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
Merged

Do not reuse datastore Batch #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 1 addition & 17 deletions dsqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,25 +411,18 @@ func (q *DSQueue) clearDatastore(ctx context.Context) (int, error) {
return 0, fmt.Errorf("cannot create datastore batch: %w", err)
}

var rmCount, writeCount int
var rmCount int
for result := range results.Next() {
if ctx.Err() != nil {
return 0, ctx.Err()
}
if writeCount >= DefaultBufferSize {
writeCount = 0
if err = batch.Commit(ctx); err != nil {
return 0, fmt.Errorf("cannot commit datastore updates: %w", err)
}
}
if result.Error != nil {
return 0, fmt.Errorf("cannot read query result from datastore: %w", result.Error)
}
if err = batch.Delete(ctx, datastore.NewKey(result.Key)); err != nil {
return 0, fmt.Errorf("cannot delete key from datastore: %w", err)
}
rmCount++
writeCount++
}

if err = batch.Commit(ctx); err != nil {
Expand Down Expand Up @@ -509,7 +502,6 @@ func (q *DSQueue) readDatastore(ctx context.Context, n int, items [][]byte) ([][
if err != nil {
return nil, fmt.Errorf("cannot create datastore batch: %w", err)
}
var delCount int

for result := range results.Next() {
if ctx.Err() != nil {
Expand All @@ -522,14 +514,6 @@ func (q *DSQueue) readDatastore(ctx context.Context, n int, items [][]byte) ([][
if err = batch.Delete(ctx, datastore.NewKey(result.Key)); err != nil {
return nil, fmt.Errorf("error deleting queue item: %w", err)
}
delCount++

if delCount >= DefaultBufferSize {
delCount = 0
if err = batch.Commit(ctx); err != nil {
return nil, fmt.Errorf("cannot commit datastore updates: %w", err)
}
}

parts := strings.SplitN(strings.TrimPrefix(result.Key, "/"), "/", 2)
if len(parts) != 2 {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/gammazero/deque v1.1.0
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/ipfs/go-cid v0.5.0
github.com/ipfs/go-datastore v0.8.4
github.com/ipfs/go-log/v2 v2.8.1
github.com/ipfs/go-datastore v0.9.0
github.com/ipfs/go-log/v2 v2.8.2
github.com/ipfs/go-test v0.2.3
)

Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ github.com/ipfs/go-block-format v0.2.2 h1:uecCTgRwDIXyZPgYspaLXoMiMmxQpSx2aq34eN
github.com/ipfs/go-block-format v0.2.2/go.mod h1:vmuefuWU6b+9kIU0vZJgpiJt1yicQz9baHXE8qR+KB8=
github.com/ipfs/go-cid v0.5.0 h1:goEKKhaGm0ul11IHA7I6p1GmKz8kEYniqFopaB5Otwg=
github.com/ipfs/go-cid v0.5.0/go.mod h1:0L7vmeNXpQpUS9vt+yEARkJ8rOg43DF3iPgn4GIN0mk=
github.com/ipfs/go-datastore v0.8.4 h1:vXEsd76T3KIOSKXizjhmS3ICGMl+oOSjpLSxE3v8/Wc=
github.com/ipfs/go-datastore v0.8.4/go.mod h1:uT77w/XEGrvJWwHgdrMr8bqCN6ZTW9gzmi+3uK+ouHg=
github.com/ipfs/go-datastore v0.9.0 h1:WocriPOayqalEsueHv6SdD4nPVl4rYMfYGLD4bqCZ+w=
github.com/ipfs/go-datastore v0.9.0/go.mod h1:uT77w/XEGrvJWwHgdrMr8bqCN6ZTW9gzmi+3uK+ouHg=
github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
github.com/ipfs/go-log/v2 v2.8.1 h1:Y/X36z7ASoLJaYIJAL4xITXgwf7RVeqb1+/25aq/Xk0=
github.com/ipfs/go-log/v2 v2.8.1/go.mod h1:NyhTBcZmh2Y55eWVjOeKf8M7e4pnJYM3yDZNxQBWEEY=
github.com/ipfs/go-log/v2 v2.8.2 h1:nVG4nNHUwwI/sTs9Bi5iE8sXFQwXs3AjkkuWhg7+Y2I=
github.com/ipfs/go-log/v2 v2.8.2/go.mod h1:UhIYAwMV7Nb4ZmihUxfIRM2Istw/y9cAk3xaK+4Zs2c=
github.com/ipfs/go-test v0.2.3 h1:Z/jXNAReQFtCYyn7bsv/ZqUwS6E7iIcSpJ2CuzCvnrc=
github.com/ipfs/go-test v0.2.3/go.mod h1:QW8vSKkwYvWFwIZQLGQXdkt9Ud76eQXRQ9Ao2H+cA1o=
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
Expand Down