Skip to content

Commit 04fd8f4

Browse files
committed
check negative rollover; better handle errors
1 parent 8eaa333 commit 04fd8f4

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

index/format.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,16 @@ func (w *Writer) SyncAndClose() error {
8888
return w.Close()
8989
}
9090

91-
func Write(path string, opts Params, index []Item) error {
91+
func Write(path string, opts Params, index []Item) (retErr error) {
9292
w, err := OpenWriter(path, opts)
9393
if err != nil {
9494
return err
9595
}
96-
defer func() { _ = w.Close() }() // ignoring since its only applicable if an error has happened
96+
defer func() {
97+
if retErr != nil {
98+
_ = w.Close()
99+
}
100+
}()
97101

98102
for _, item := range index {
99103
if err := w.Write(item); err != nil {

log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var errDeleteRelative = fmt.Errorf("%w: delete relative offsets", message.ErrInv
2323

2424
// Open opens or creates a [Log] based on a dir and set of options
2525
func Open(dir string, opts Options) (result Log, err error) {
26-
if opts.Rollover == 0 {
26+
if opts.Rollover <= 0 {
2727
opts.Rollover = 1024 * 1024
2828
}
2929

typed_blocking.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (l *tlogBlocking[K, V]) Publish(tmessages []TMessage[K, V]) (int64, error)
4747
}
4848

4949
l.notify.Set(nextOffset)
50-
return nextOffset, err
50+
return nextOffset, nil
5151
}
5252

5353
func (l *tlogBlocking[K, V]) ConsumeBlocking(ctx context.Context, offset int64, maxCount int64) (int64, []TMessage[K, V], error) {

0 commit comments

Comments
 (0)