Skip to content

Commit 30716c3

Browse files
committed
fix(embedded/sql): fix sql temporal range evaluation
Signed-off-by: Jeronimo Irazabal <[email protected]>
1 parent acb0ed4 commit 30716c3

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

embedded/sql/row_reader.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -366,20 +366,14 @@ func (r *rawRowReader) reduceTxRange() (err error) {
366366

367367
if r.period.start != nil {
368368
txRange.initialTxID, err = r.period.start.instant.resolve(r.tx, r.params, true, r.period.start.inclusive)
369-
if errors.Is(err, store.ErrTxNotFound) {
370-
txRange.initialTxID = uint64(math.MaxUint64)
371-
}
372-
if err != nil && err != store.ErrTxNotFound {
369+
if err != nil {
373370
return err
374371
}
375372
}
376373

377374
if r.period.end != nil {
378375
txRange.finalTxID, err = r.period.end.instant.resolve(r.tx, r.params, false, r.period.end.inclusive)
379-
if errors.Is(err, store.ErrTxNotFound) {
380-
txRange.finalTxID = uint64(0)
381-
}
382-
if err != nil && err != store.ErrTxNotFound {
376+
if err != nil {
383377
return err
384378
}
385379
}
@@ -399,6 +393,9 @@ func (r *rawRowReader) Read(ctx context.Context) (row *Row, err error) {
399393

400394
// evaluation of txRange is postponed to allow parameters to be provided after rowReader initialization
401395
err = r.reduceTxRange()
396+
if errors.Is(err, store.ErrTxNotFound) {
397+
return nil, ErrNoMoreRows
398+
}
402399
if err != nil {
403400
return nil, err
404401
}

0 commit comments

Comments
 (0)