Skip to content
This repository has been archived by the owner on Aug 21, 2023. It is now read-only.

Improve for_select_default_busy #169

Merged
merged 4 commits into from
Oct 21, 2020
Merged
Changes from all commits
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
43 changes: 20 additions & 23 deletions v4/export/writer_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,21 +193,19 @@ func WriteInsert(pCtx context.Context, tblIR TableDataIR, w storage.Writer, file
bf.WriteString(";\n")
}
if bf.Len() >= lengthLimit {
wp.input <- bf
bf = pool.Get().(*bytes.Buffer)
if bfCap := bf.Cap(); bfCap < lengthLimit {
bf.Grow(lengthLimit - bfCap)
select {
case <-pCtx.Done():
return pCtx.Err()
case err := <-wp.errCh:
return err
case wp.input <- bf:
bf = pool.Get().(*bytes.Buffer)
if bfCap := bf.Cap(); bfCap < lengthLimit {
bf.Grow(lengthLimit - bfCap)
}
}
}

select {
case <-pCtx.Done():
return pCtx.Err()
case err := <-wp.errCh:
return err
default:
}

if shouldSwitch {
break
}
Expand Down Expand Up @@ -288,21 +286,20 @@ func WriteInsertInCsv(pCtx context.Context, tblIR TableDataIR, w storage.Writer,

bf.WriteByte('\n')
if bf.Len() >= lengthLimit {
wp.input <- bf
bf = pool.Get().(*bytes.Buffer)
if bfCap := bf.Cap(); bfCap < lengthLimit {
bf.Grow(lengthLimit - bfCap)
select {
case <-pCtx.Done():
return pCtx.Err()
case err := <-wp.errCh:
return err
case wp.input <- bf:
bf = pool.Get().(*bytes.Buffer)
if bfCap := bf.Cap(); bfCap < lengthLimit {
bf.Grow(lengthLimit - bfCap)
}
}
}

fileRowIter.Next()
select {
case <-pCtx.Done():
return pCtx.Err()
case err := <-wp.errCh:
return err
default:
}
if wp.ShouldSwitchFile() {
break
}
Expand Down