clusterversion: rm V25_1_MoveRaftTruncatedState

Epic: none
Release note: none

Author: pav-kv

pkg/clusterversion/cockroach_versions.go

@@ -190,10 +190,6 @@ const (
 	// TODO_Delete_V25_1_AddJobsTables added new jobs tables.
 	TODO_Delete_V25_1_AddJobsTables
 
-	// TODO_Delete_V25_1_MoveRaftTruncatedState moves the RaftTruncatedState in eval result
-	// from ReplicaState to its own field.
-	TODO_Delete_V25_1_MoveRaftTruncatedState
-
 	// TODO_Delete_V25_1_AddRangeForceFlushKey adds the RangeForceFlushKey, a replicated
 	// range-ID local key, which is written below raft.
 	TODO_Delete_V25_1_AddRangeForceFlushKey
@@ -276,7 +272,6 @@ var versionTable = [numKeys]roachpb.Version{
 	TODO_Delete_V25_1_Start: {Major: 24, Minor: 3, Internal: 2},
 
 	TODO_Delete_V25_1_AddJobsTables:             {Major: 24, Minor: 3, Internal: 4},
-	TODO_Delete_V25_1_MoveRaftTruncatedState:    {Major: 24, Minor: 3, Internal: 6},
 	TODO_Delete_V25_1_AddRangeForceFlushKey:     {Major: 24, Minor: 3, Internal: 8},
 	TODO_Delete_V25_1_BatchStreamRPC:            {Major: 24, Minor: 3, Internal: 10},
 	TODO_Delete_V25_1_PreparedTransactionsTable: {Major: 24, Minor: 3, Internal: 12},

pkg/kv/kvserver/batcheval/cmd_truncate_log.go

@@ -9,7 +9,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result"
@@ -125,16 +124,11 @@ func TruncateLog(
 	}
 	ms.SysBytes = -ms.SysBytes // simulate the deletion
 
-	tState := &kvserverpb.RaftTruncatedState{
+	var pd result.Result
+	pd.Replicated.SetRaftTruncatedState(&kvserverpb.RaftTruncatedState{
 		Index: args.Index - 1,
 		Term:  term,
-	}
-
-	var pd result.Result
-	pd.Replicated.SetRaftTruncatedState(tState,
-		cArgs.EvalCtx.ClusterSettings().Version.IsActive(
-			ctx, clusterversion.TODO_Delete_V25_1_MoveRaftTruncatedState),
-	)
+	})
 	pd.Replicated.RaftLogDelta = ms.SysBytes
 	pd.Replicated.RaftExpectedFirstIndex = firstIndex
 	return pd, nil

pkg/kv/kvserver/kvserverpb/proposer_kv.go

@@ -81,24 +81,17 @@ func (r *ReplicatedEvalResult) IsTrivial() bool {
 }
 
 // SetRaftTruncatedState puts the given RaftTruncatedState into this evaluation
-// result. Since v25.1, it uses r.RaftTruncatedState field, and falls back to
-// r.State.TruncatedState for backwards compatibility in mixed-version clusters.
-//
-// TODO(#97613): use r.RaftTruncatedState unconditionally when the ReplicaState
-// field is removed.
-func (r *ReplicatedEvalResult) SetRaftTruncatedState(ts *RaftTruncatedState, v25dot1 bool) {
-	if v25dot1 {
-		r.RaftTruncatedState = ts
-	} else if r.State != nil {
-		r.State.TruncatedState = ts
-	} else {
-		r.State = &ReplicaState{TruncatedState: ts}
-	}
+// result.
+func (r *ReplicatedEvalResult) SetRaftTruncatedState(ts *RaftTruncatedState) {
+	r.RaftTruncatedState = ts
 }
 
 // GetRaftTruncatedState returns the RaftTruncatedState present in this
 // evaluation result. Since v25.1, it can be present in one of the two places.
-// See SetRaftTruncatedState.
+//
+// TODO(#97613): use r.RaftTruncatedState unconditionally when the truncated
+// state field in ReplicaState is removed and can't be set. Currently,
+// historical proposals can still have it.
 func (r *ReplicatedEvalResult) GetRaftTruncatedState() *RaftTruncatedState {
 	if ts := r.RaftTruncatedState; ts != nil {
 		return ts

pkg/kv/kvserver/replica_application_state_machine_test.go

@@ -159,7 +159,7 @@ func TestReplicaStateMachineRaftLogTruncationStronglyCoupled(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	runTest := func(t *testing.T, accurate, v25dot1 bool) {
+	runTest := func(t *testing.T, accurate bool) {
 		tc := testContext{}
 		ctx := context.Background()
 		stopper := stop.NewStopper()
@@ -201,7 +201,7 @@ func TestReplicaStateMachineRaftLogTruncationStronglyCoupled(t *testing.T) {
 		}
 		evalResult.SetRaftTruncatedState(&kvserverpb.RaftTruncatedState{
 			Index: truncatedIndex + 1,
-		}, v25dot1)
+		})
 
 		ent := &raftlog.Entry{
 			Entry: raftpb.Entry{
@@ -258,17 +258,15 @@ func TestReplicaStateMachineRaftLogTruncationStronglyCoupled(t *testing.T) {
 	}
 
 	testutils.RunTrueAndFalse(t, "accurate first index", func(t *testing.T, accurate bool) {
-		testutils.RunTrueAndFalse(t, "v25.1", func(t *testing.T, v25dot1 bool) {
-			runTest(t, accurate, v25dot1)
-		})
+		runTest(t, accurate)
 	})
 }
 
 func TestReplicaStateMachineRaftLogTruncationLooselyCoupled(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
-	runTest := func(t *testing.T, accurate, v25dot1 bool) {
+	runTest := func(t *testing.T, accurate bool) {
 		tc := testContext{}
 		ctx := context.Background()
 		stopper := stop.NewStopper()
@@ -329,7 +327,7 @@ func TestReplicaStateMachineRaftLogTruncationLooselyCoupled(t *testing.T) {
 			}
 			evalResult.SetRaftTruncatedState(&kvserverpb.RaftTruncatedState{
 				Index: truncatedIndex + 1,
-			}, v25dot1)
+			})
 			ent := &raftlog.Entry{
 				Entry: raftpb.Entry{
 					Index: uint64(raftAppliedIndex + 1),
@@ -406,9 +404,7 @@ func TestReplicaStateMachineRaftLogTruncationLooselyCoupled(t *testing.T) {
 	}
 
 	testutils.RunTrueAndFalse(t, "accurate first index", func(t *testing.T, accurate bool) {
-		testutils.RunTrueAndFalse(t, "v25.1", func(t *testing.T, v25dot1 bool) {
-			runTest(t, accurate, v25dot1)
-		})
+		runTest(t, accurate)
 	})
 }