Skip to content
Merged
Show file tree
Hide file tree
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
41 changes: 28 additions & 13 deletions writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,23 +141,26 @@ func (w *writer[T]) Close(ctx context.Context) error {

if w.options.FileRollOnClose {
// close previous buffer and write file to fs
if w.bufferCloser != nil {
if w.encoder != nil && w.buffer != nil {
// skip if there are no blocks to write
if w.lastBlockNum < w.firstBlockNum {
return nil
}

err := w.bufferCloser.Close()
if err != nil {
return err
// close buffer writers
if w.bufferCloser != nil {
if err := w.bufferCloser.Close(); err != nil {
return err
}

w.bufferCloser = nil
}

err = w.writeFile(ctx)
if err != nil {
// write buffer into FS
if err := w.writeFile(ctx); err != nil {
return err
}
}
w.bufferCloser = nil
}
return nil
}
Expand All @@ -176,19 +179,23 @@ func (w *writer[T]) isReadyToWrite() bool {

func (w *writer[T]) rollFile(ctx context.Context) error {
// close previous buffer and write file to fs
if w.bufferCloser != nil {
if w.encoder != nil && w.buffer != nil {
// skip if there are no blocks to write
if w.lastBlockNum < w.firstBlockNum {
return nil
}

err := w.bufferCloser.Close()
if err != nil {
return err
// close buffer writers
if w.bufferCloser != nil {
if err := w.bufferCloser.Close(); err != nil {
return err
}

w.bufferCloser = nil
}

err = w.writeFile(ctx)
if err != nil {
// write buffer into FS
if err := w.writeFile(ctx); err != nil {
return err
}
}
Expand All @@ -207,6 +214,14 @@ func (w *writer[T]) writeFile(ctx context.Context) error {
return err
}

defer func() {
if err != nil {
// remove last file from file index as it's not written
files := w.fileIndex.Files()[:len(w.fileIndex.Files())-1]
w.fileIndex = NewFileIndexFromFiles(w.fs, files)
}
}()

// save file index
err = w.fileIndex.Save(ctx)
if err != nil {
Expand Down
Loading