refactor

Author: raulb

source/logrepl/combined.go

@@ -121,17 +121,17 @@ func (c *CombinedIterator) NextN(ctx context.Context, n int) ([]opencdc.Record,
 
 	records, err := c.activeIterator.NextN(ctx, n)
 	if err != nil {
+		if !errors.Is(err, snapshot.ErrIteratorDone) {
+			return nil, fmt.Errorf("failed to fetch records in batch: %w", err)
+		}
+
 		// Snapshot iterator is done, handover to CDC iterator
-		if errors.Is(err, snapshot.ErrIteratorDone) {
-			if err := c.useCDCIterator(ctx); err != nil {
-				return nil, err
-			}
-			sdk.Logger(ctx).Debug().Msg("Snapshot completed, switching to CDC mode")
-
-			// Retry with new iterator
-			return c.NextN(ctx, n)
+		if err := c.useCDCIterator(ctx); err != nil {
+			return nil, err
 		}
-		return nil, fmt.Errorf("failed to fetch records in batch: %w", err)
+
+		sdk.Logger(ctx).Debug().Msg("Snapshot completed, switching to CDC mode")
+		return c.NextN(ctx, n)
 	}
 	return records, nil
 }