@@ -542,9 +542,7 @@ fn wal_writer_records_cursor_without_truncating() {
542542 safe_offset : first_entry. next_offset ,
543543 ..WalConsumerCheckpoint :: default ( )
544544 } ;
545- writer
546- . advance_consumer_checkpoint ( & cursor)
547- . expect ( "record cursor" ) ;
545+ writer. checkpoint_cursor ( & cursor) . expect ( "record cursor" ) ;
548546 drop ( writer) ;
549547
550548 let len_after = std:: fs:: metadata ( & wal_path) . expect ( "metadata" ) . len ( ) ;
@@ -602,16 +600,16 @@ fn wal_writer_enforces_safe_offset_boundaries() {
602600 safe_sequence : first_entry. sequence ,
603601 } ;
604602
605- match writer. advance_consumer_checkpoint ( & cursor) {
603+ match writer. checkpoint_cursor ( & cursor) {
606604 Err ( WalError :: InvalidConsumerCheckpoint ( message) ) => {
607605 assert_eq ! ( message, "safe offset splits entry boundary" )
608606 }
609607 other => panic ! ( "expected invalid cursor error, got {other:?}" ) ,
610608 }
611609
612- cursor. advance ( & first_entry) ;
610+ cursor. increment ( & first_entry) ;
613611 writer
614- . advance_consumer_checkpoint ( & cursor)
612+ . checkpoint_cursor ( & cursor)
615613 . expect ( "record succeeds with aligned cursor" ) ;
616614 drop ( writer) ;
617615
@@ -639,9 +637,7 @@ fn wal_writer_persists_consumer_checkpoint_sidecar() {
639637 safe_offset : file_len,
640638 ..WalConsumerCheckpoint :: default ( )
641639 } ;
642- writer
643- . advance_consumer_checkpoint ( & cursor)
644- . expect ( "record cursor" ) ;
640+ writer. checkpoint_cursor ( & cursor) . expect ( "record cursor" ) ;
645641 drop ( writer) ;
646642
647643 let sidecar_path = wal_path. parent ( ) . expect ( "dir" ) . join ( "checkpoint.offset" ) ;
@@ -803,7 +799,7 @@ fn wal_writer_enforces_size_cap_and_purges_rotations() {
803799 ..WalConsumerCheckpoint :: default ( )
804800 } ;
805801 writer
806- . advance_consumer_checkpoint ( & cursor)
802+ . checkpoint_cursor ( & cursor)
807803 . expect ( "record cursor purges rotated chunks" ) ;
808804
809805 assert ! (
@@ -857,9 +853,7 @@ fn wal_writer_ignores_invalid_checkpoint_sidecar() {
857853 safe_offset : file_len,
858854 ..WalConsumerCheckpoint :: default ( )
859855 } ;
860- writer
861- . advance_consumer_checkpoint ( & cursor)
862- . expect ( "record cursor" ) ;
856+ writer. checkpoint_cursor ( & cursor) . expect ( "record cursor" ) ;
863857 drop ( writer) ;
864858
865859 let state = CheckpointSidecar :: read_from ( & sidecar_path) . expect ( "sidecar" ) ;
@@ -1407,7 +1401,7 @@ fn wal_reader_iter_from_respects_offsets() {
14071401 assert_eq ! ( entry_one. next_offset, entry_two. offset. position) ;
14081402
14091403 let mut cursor = WalConsumerCheckpoint :: default ( ) ;
1410- cursor. advance ( & entry_one) ;
1404+ cursor. increment ( & entry_one) ;
14111405 assert_eq ! ( cursor. safe_offset, entry_one. next_offset) ;
14121406 assert_eq ! ( cursor. safe_sequence, entry_one. sequence) ;
14131407
@@ -1607,7 +1601,7 @@ fn wal_consumer_checkpoint_recovers_after_partial_entry() {
16071601 let mut iter = reader. iter_from ( 0 ) . expect ( "iterator" ) ;
16081602 let first_entry = iter. next ( ) . expect ( "first entry" ) . expect ( "ok" ) ;
16091603 let mut cursor = WalConsumerCheckpoint :: default ( ) ;
1610- cursor. advance ( & first_entry) ;
1604+ cursor. increment ( & first_entry) ;
16111605 drop ( reader) ;
16121606
16131607 // Simulate a crash that truncates the file in the middle of the second
@@ -1811,7 +1805,7 @@ fn run_crash_case(case: CrashCase) {
18111805 case. name
18121806 ) ;
18131807 writer_test_support:: inject_crash ( case. injection ) ;
1814- let err = match writer. advance_consumer_checkpoint ( & cursor) {
1808+ let err = match writer. checkpoint_cursor ( & cursor) {
18151809 Ok ( _) => panic ! ( "{}: crash injection did not trigger" , case. name) ,
18161810 Err ( err) => err,
18171811 } ;
@@ -1841,7 +1835,7 @@ fn wal_cursor_after_entries(path: &Path, entry_count: usize) -> WalConsumerCheck
18411835 )
18421836 } )
18431837 . expect ( "entry ok while building cursor" ) ;
1844- cursor. advance ( & bundle) ;
1838+ cursor. increment ( & bundle) ;
18451839 }
18461840 cursor
18471841}
@@ -2061,7 +2055,7 @@ fn wal_writer_rejects_checkpoint_sequence_regression() {
20612055 safe_sequence : entries[ 1 ] . sequence ,
20622056 } ;
20632057 writer
2064- . advance_consumer_checkpoint ( & cursor_at_second)
2058+ . checkpoint_cursor ( & cursor_at_second)
20652059 . expect ( "advance to second entry" ) ;
20662060
20672061 // Now try to regress to the first entry (sequence=0)
@@ -2070,7 +2064,7 @@ fn wal_writer_rejects_checkpoint_sequence_regression() {
20702064 safe_sequence : entries[ 0 ] . sequence , // sequence=0, which is less than 1
20712065 } ;
20722066
2073- match writer. advance_consumer_checkpoint ( & cursor_at_first) {
2067+ match writer. checkpoint_cursor ( & cursor_at_first) {
20742068 Err ( WalError :: InvalidConsumerCheckpoint ( msg) ) => {
20752069 assert ! (
20762070 msg. contains( "regressed" ) ,
@@ -2105,7 +2099,7 @@ fn wal_writer_rejects_checkpoint_offset_regression() {
21052099 safe_sequence : entries[ 1 ] . sequence ,
21062100 } ;
21072101 writer
2108- . advance_consumer_checkpoint ( & cursor_at_second)
2102+ . checkpoint_cursor ( & cursor_at_second)
21092103 . expect ( "advance to second entry" ) ;
21102104
21112105 // Now try to advance with a higher sequence but lower offset
@@ -2115,7 +2109,7 @@ fn wal_writer_rejects_checkpoint_offset_regression() {
21152109 safe_sequence : entries[ 1 ] . sequence + 1 , // higher sequence to pass that check
21162110 } ;
21172111
2118- match writer. advance_consumer_checkpoint ( & bad_cursor) {
2112+ match writer. checkpoint_cursor ( & bad_cursor) {
21192113 Err ( WalError :: InvalidConsumerCheckpoint ( msg) ) => {
21202114 assert ! (
21212115 msg. contains( "regressed" ) ,
@@ -2218,7 +2212,7 @@ fn wal_recovery_clamps_stale_sidecar_offset() {
22182212 safe_sequence : offset. sequence ,
22192213 } ;
22202214 writer
2221- . advance_consumer_checkpoint ( & cursor)
2215+ . checkpoint_cursor ( & cursor)
22222216 . expect ( "advance checkpoint to end of WAL" ) ;
22232217 drop ( writer) ;
22242218
0 commit comments