Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: Cleanup batch writers #1386

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 2 commits into from
Nov 30, 2023
Merged

fix: Cleanup batch writers #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b738e
chore: Cleanup batch writers
candiduslynx Nov 28, 2023
5a4e520
Merge branch 'main' into fix/batch-writers-cleanup
kodiakhq[bot] Nov 30, 2023
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
2 changes: 0 additions & 2 deletions writers/batchwriter/batchwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ func WithBatchSizeBytes(size int) Option {
}

type worker struct {
count int
ch chan *message.WriteInsert
flush chan chan bool
}
Expand Down Expand Up @@ -322,7 +321,6 @@ func (w *BatchWriter) startWorker(_ context.Context, msg *message.WriteInsert) e
ch := make(chan *message.WriteInsert)
flush := make(chan chan bool)
wr = &worker{
count: 1,
ch: ch,
flush: flush,
}
Expand Down
20 changes: 12 additions & 8 deletions writers/streamingbatchwriter/streamingbatchwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,11 @@ func (w *StreamingBatchWriter) startWorker(ctx context.Context, errCh chan<- err
return nil
}
ch := make(chan *message.WriteMigrateTable)
flush := make(chan chan bool)
w.migrateWorker = &streamingWorkerManager[*message.WriteMigrateTable]{
ch: ch,
writeFunc: w.client.MigrateTable,

flush: flush,
flush: make(chan chan bool),
errCh: errCh,

batchSizeRows: w.batchSizeRows,
Expand All @@ -251,12 +250,11 @@ func (w *StreamingBatchWriter) startWorker(ctx context.Context, errCh chan<- err
return nil
}
ch := make(chan *message.WriteDeleteStale)
flush := make(chan chan bool)
w.deleteStaleWorker = &streamingWorkerManager[*message.WriteDeleteStale]{
ch: ch,
writeFunc: w.client.DeleteStale,

flush: flush,
flush: make(chan chan bool),
errCh: errCh,

batchSizeRows: w.batchSizeRows,
Expand All @@ -278,12 +276,11 @@ func (w *StreamingBatchWriter) startWorker(ctx context.Context, errCh chan<- err
}

ch := make(chan *message.WriteInsert)
flush := make(chan chan bool)
wr = &streamingWorkerManager[*message.WriteInsert]{
ch: ch,
writeFunc: w.client.WriteTable,

flush: flush,
flush: make(chan chan bool),
errCh: errCh,

batchSizeRows: w.batchSizeRows,
Expand All @@ -292,6 +289,14 @@ func (w *StreamingBatchWriter) startWorker(ctx context.Context, errCh chan<- err
tickerFn: w.tickerFn,
}
w.workersLock.Lock()
wrOld, ok := w.insertWorkers[tableName]
if ok {
w.workersLock.Unlock()
// some other goroutine could have already added the worker
// just send the message to it & discard our allocated worker
wrOld.ch <- m
return nil
}
w.insertWorkers[tableName] = wr
w.workersLock.Unlock()

Expand All @@ -307,13 +312,12 @@ func (w *StreamingBatchWriter) startWorker(ctx context.Context, errCh chan<- err
return nil
}
ch := make(chan *message.WriteDeleteRecord)
flush := make(chan chan bool)
// TODO: flush all workers for nested tables as well (See https://github.com/cloudquery/plugin-sdk/issues/1296)
w.deleteRecordWorker = &streamingWorkerManager[*message.WriteDeleteRecord]{
ch: ch,
writeFunc: w.client.DeleteRecords,

flush: flush,
flush: make(chan chan bool),
errCh: errCh,

batchSizeRows: w.batchSizeRows,
Expand Down