Skip to content

fix: Change logic for batch writing to write when batch size is reached, not exceeded #2153

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
kodiakhq merged 3 commits into from
May 19, 2025
Merged

fix: Change logic for batch writing to write when batch size is reached, not exceeded #2153

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b95f7ee
change logic for batch size checking
maaarcelino May 16, 2025
05b4212
refactor limit check
maaarcelino May 19, 2025
72c3096
Merge remote-tracking branch 'origin/main' into feat/delete-test-batch
maaarcelino May 19, 2025
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
6 changes: 3 additions & 3 deletions writers/batchwriter/batchwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func (w *BatchWriter) Write(ctx context.Context, msgs <-chan message.WriteMessag
w.deleteStaleMessages = append(w.deleteStaleMessages, m)
l := int64(len(w.deleteStaleMessages))
w.deleteStaleLock.Unlock()
if w.batchSize > 0 && l > w.batchSize {
if w.batchSize > 0 && l >= w.batchSize {
if err := w.flushDeleteStaleTables(ctx); err != nil {
return err
}
Expand All @@ -298,7 +298,7 @@ func (w *BatchWriter) Write(ctx context.Context, msgs <-chan message.WriteMessag
w.deleteRecordMessages = append(w.deleteRecordMessages, m)
l := int64(len(w.deleteRecordMessages))
w.deleteRecordLock.Unlock()
if w.batchSize > 0 && l > w.batchSize {
if w.batchSize > 0 && l >= w.batchSize {
Copy link
Copy Markdown
Member

@erezrokah erezrokah May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if w.batchSize > 0 && l >= w.batchSize {
limit := batch.CappedAt(0, w.batchSize)
limit.AddRows(l)
if limit.ReachedLimit() {

I think this is more aligned with the rest of the codebase e.g.

plugin-sdk/writers/streamingbatchwriter/streamingbatchwriter.go

Line 406 in c82d006

if len(toFlush) > 0 || rest != nil || s.limit.ReachedLimit() {

same comment for other places where we check the limit

Copy link
Copy Markdown
Contributor Author

@maaarcelino maaarcelino May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 05b4212. Tested and it works correctly

if err := w.flushDeleteRecordTables(ctx); err != nil {
return err
}
Expand All @@ -322,7 +322,7 @@ func (w *BatchWriter) Write(ctx context.Context, msgs <-chan message.WriteMessag
w.migrateTableMessages = append(w.migrateTableMessages, m)
l := int64(len(w.migrateTableMessages))
w.migrateTableLock.Unlock()
if w.batchSize > 0 && l > w.batchSize {
if w.batchSize > 0 && l >= w.batchSize {
if err := w.flushMigrateTables(ctx); err != nil {
return err
}
Expand Down
Loading