rename LatestCheckpoint to LatestCheckpointV6

Author: zhangchiqing

ledger/complete/compactor.go

@@ -184,7 +184,7 @@ func (c *Compactor) run() {
 		activeSegmentNum = -1
 	}
 
-	lastCheckpointNum, err := c.checkpointer.LatestCheckpoint()
+	lastCheckpointNum, err := c.checkpointer.LatestCheckpointV6()
 	if err != nil {
 		c.logger.Error().Err(err).Msg("compactor failed to get last checkpoint number")
 		lastCheckpointNum = -1

ledger/complete/wal/checkpointer.go

@@ -116,9 +116,14 @@ func NewCheckpointer(wal *DiskWAL, keyByteSize int, forestCapacity int) *Checkpo
 	}
 }
 
-// listCheckpoints returns all the numbers (unsorted) of the checkpoint files, and the number of the last checkpoint.
-func (c *Checkpointer) listCheckpoints() ([]int, int, error) {
-	return ListCheckpoints(c.dir)
+// listV6Checkpoints returns V6 checkpoint numbers (unsorted) and the last V6 number.
+// This Checkpointer writes V6 only, so its scheduling decisions (LatestCheckpointV6,
+// NotCheckpointedSegments, the Checkpoint(to) no-op short-circuit) must track V6
+// progress to avoid being misled by stray V7 files dropped in the same directory.
+// For cross-version inspection, use the package-level ListCheckpoints or
+// ListV7Checkpoints functions.
+func (c *Checkpointer) listV6Checkpoints() ([]int, int, error) {
+	return ListV6Checkpoints(c.dir)
 }
 
 // ListCheckpoints returns all the numbers of the checkpoint files (both V6 and V7), and the number of the last checkpoint.
@@ -261,17 +266,19 @@ func (c *Checkpointer) CheckpointsV7() ([]int, error) {
 	return list, nil
 }
 
-// LatestCheckpoint returns number of latest checkpoint or -1 if there are no checkpoints
-func (c *Checkpointer) LatestCheckpoint() (int, error) {
-	_, last, err := c.listCheckpoints()
+// LatestCheckpointV6 returns the number of the latest V6 checkpoint, or -1 if
+// there are no V6 checkpoints. V7 (payloadless) files in the same directory are
+// ignored — see [Checkpointer.listV6Checkpoints] for rationale.
+func (c *Checkpointer) LatestCheckpointV6() (int, error) {
+	_, last, err := c.listV6Checkpoints()
 	return last, err
 }
 
 // NotCheckpointedSegments - returns numbers of segments which are not checkpointed yet,
 // or -1, -1 if there are no segments
 func (c *Checkpointer) NotCheckpointedSegments() (from, to int, err error) {
 
-	latestCheckpoint, err := c.LatestCheckpoint()
+	latestCheckpoint, err := c.LatestCheckpointV6()
 	if err != nil {
 		return -1, -1, fmt.Errorf("cannot get last checkpoint: %w", err)
 	}
@@ -312,7 +319,7 @@ func (c *Checkpointer) Checkpoint(to int) (err error) {
 		return fmt.Errorf("cannot get not checkpointed segments: %w", err)
 	}
 
-	latestCheckpoint, err := c.LatestCheckpoint()
+	latestCheckpoint, err := c.LatestCheckpointV6()
 	if err != nil {
 		return fmt.Errorf("cannot get latest checkpoint: %w", err)
 	}

ledger/complete/wal/checkpointer_test.go

@@ -383,7 +383,7 @@ func Test_Checkpointing(t *testing.T) {
 			randomlyModifyFile(t, path.Join(dir, "checkpoint.00000010"))
 
 			// make sure 10 is latest checkpoint
-			latestCheckpoint, err := checkpointer.LatestCheckpoint()
+			latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 			require.NoError(t, err)
 			require.Equal(t, 10, latestCheckpoint)
 

ledger/complete/wal/wal_test.go

@@ -42,7 +42,7 @@ func RunWithWALCheckpointerWithFiles(t *testing.T, names ...interface{}) {
 
 func Test_emptyDir(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, -1, latestCheckpoint)
 
@@ -57,7 +57,7 @@ func Test_emptyDir(t *testing.T) {
 // Prometheus WAL require files to be 8 characters, otherwise it gets confused
 func Test_noCheckpoints(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "00000000", "00000001", "00000002", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, -1, latestCheckpoint)
 
@@ -70,7 +70,7 @@ func Test_noCheckpoints(t *testing.T) {
 
 func Test_someCheckpoints(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "00000000", "00000001", "00000002", "00000003", "00000004", "00000005", "checkpoint.00000002", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, 2, latestCheckpoint)
 
@@ -83,7 +83,7 @@ func Test_someCheckpoints(t *testing.T) {
 
 func Test_loneCheckpoint(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "checkpoint.00000005", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, 5, latestCheckpoint)
 
@@ -96,15 +96,15 @@ func Test_loneCheckpoint(t *testing.T) {
 
 func Test_lastCheckpointIsFoundByNumericValue(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "checkpoint.00000005", "checkpoint.00000004", "checkpoint.00000006", "checkpoint.00000002", "checkpoint.00000001", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, 6, latestCheckpoint)
 	})
 }
 
 func Test_checkpointWithoutPrecedingSegments(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "checkpoint.00000005", "00000006", "00000007", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, 5, latestCheckpoint)
 
@@ -117,7 +117,7 @@ func Test_checkpointWithoutPrecedingSegments(t *testing.T) {
 
 func Test_checkpointWithSameSegment(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "checkpoint.00000005", "00000005", "00000006", "00000007", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, 5, latestCheckpoint)
 
@@ -139,7 +139,7 @@ func Test_listingCheckpoints(t *testing.T) {
 
 func Test_NoGapBetweenSegmentsAndLastCheckpoint(t *testing.T) {
 	RunWithWALCheckpointerWithFiles(t, "checkpoint.00000004", "00000006", "00000007", func(t *testing.T, wal *DiskWAL, checkpointer *Checkpointer) {
-		latestCheckpoint, err := checkpointer.LatestCheckpoint()
+		latestCheckpoint, err := checkpointer.LatestCheckpointV6()
 		require.NoError(t, err)
 		require.Equal(t, 4, latestCheckpoint)