clusterversion,kv: remove CPutInline

Partially addresses cockroachdb#66544 by removing a cluster version and its associated
dependencies which, for any cluster whose version is at least 21.1, is certain
to be active.

Release justification: cluster version cleanup

pkg/clusterversion/cockroach_versions.go

@@ -180,8 +180,6 @@ const (
 	//
 	// Start21_1 demarcates work towards CockroachDB v21.1.
 	Start21_1
-	// CPutInline is conditional put support for inline values.
-	CPutInline
 	// ReplicaVersions enables the versioning of Replica state.
 	ReplicaVersions
 	// replacedTruncatedAndRangeAppliedStateMigration stands in for
@@ -361,10 +359,6 @@ var versionsSingleton = keyedVersions{
 		Key:     Start21_1,
 		Version: roachpb.Version{Major: 20, Minor: 2, Internal: 2},
 	},
-	{
-		Key:     CPutInline,
-		Version: roachpb.Version{Major: 20, Minor: 2, Internal: 10},
-	},
 	{
 		Key:     ReplicaVersions,
 		Version: roachpb.Version{Major: 20, Minor: 2, Internal: 12},

pkg/kv/BUILD.bazel

@@ -17,7 +17,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/base",
-        "//pkg/clusterversion",
         "//pkg/keys",
         "//pkg/kv/kvbase",
         "//pkg/roachpb:with-mocks",

pkg/kv/batch.go

@@ -13,7 +13,6 @@ package kv
 import (
 	"context"
 
-	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -464,7 +463,7 @@ func (b *Batch) CPutAllowingIfNotExists(key, value interface{}, expValue []byte)
 	b.cputInternal(key, value, expValue, true, false)
 }
 
-// cPutInline conditionally sets the value for a key if the existing value is
+// CPutInline conditionally sets the value for a key if the existing value is
 // equal to expValue, but does not maintain multi-version values. To
 // conditionally set a value only if the key doesn't currently exist, pass an
 // empty expValue. The most recent value is always overwritten. Inline values
@@ -478,14 +477,7 @@ func (b *Batch) CPutAllowingIfNotExists(key, value interface{}, expValue []byte)
 //
 // A nil value can be used to delete the respective key, since there is no
 // DelInline(). This is different from CPut().
-//
-// Callers should check the version gate clusterversion.CPutInline to make sure
-// this is supported. The method is unexported to prevent external callers using
-// this without checking the version, since the CtxForCPutInline guard can't be
-// used with Batch.
-func (b *Batch) cPutInline(key, value interface{}, expValue []byte) {
-	// TODO(erikgrinaker): export once clusterversion.CPutInline is removed.
-	_ = clusterversion.CPutInline
+func (b *Batch) CPutInline(key, value interface{}, expValue []byte) {
 	b.cputInternal(key, value, expValue, false, true)
 }
 

pkg/kv/client_test.go

@@ -369,10 +369,10 @@ func TestClientPutInline(t *testing.T) {
 func TestClientCPutInline(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	ctx := context.Background()
 	s, _, _ := serverutils.StartServer(t, base.TestServerArgs{})
-	defer s.Stopper().Stop(context.Background())
+	defer s.Stopper().Stop(ctx)
 	db := createTestClient(t, s)
-	ctx := kv.CtxForCPutInline(context.Background())
 	key := testUser + "/key"
 	value := []byte("value")
 

pkg/kv/db.go

@@ -16,7 +16,6 @@ import (
 	"strings"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
-	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
 	"github.com/cockroachdb/cockroach/pkg/util/admission"
@@ -409,18 +408,6 @@ func (db *DB) CPut(ctx context.Context, key, value interface{}, expValue []byte)
 	return getOneErr(db.Run(ctx, b), b)
 }
 
-// CtxForCPutInline is a gate to make sure the caller is aware that CPutInline
-// is only available with clusterversion.CPutInline, and must check this before
-// using the method.
-func CtxForCPutInline(ctx context.Context) context.Context {
-	// TODO(erikgrinaker): This code and all of its uses can be removed when the
-	// version below is removed:
-	_ = clusterversion.CPutInline
-	return context.WithValue(ctx, canUseCPutInline{}, canUseCPutInline{})
-}
-
-type canUseCPutInline struct{}
-
 // CPutInline conditionally sets the value for a key if the existing value is
 // equal to expValue, but does not maintain multi-version values. To
 // conditionally set a value only if the key doesn't currently exist, pass an
@@ -436,17 +423,9 @@ type canUseCPutInline struct{}
 // An empty expValue means that the key is expected to not exist. If not empty,
 // expValue needs to correspond to a Value.TagAndDataBytes() - i.e. a key's
 // value without the checksum (as the checksum includes the key too).
-//
-// Callers should check the version gate clusterversion.CPutInline to make sure
-// this is supported, and must wrap the context using CtxForCPutInline(ctx) to
-// enable the call.
 func (db *DB) CPutInline(ctx context.Context, key, value interface{}, expValue []byte) error {
-	if ctx.Value(canUseCPutInline{}) == nil {
-		return errors.New("CPutInline is new in 21.1, you must check the CPutInline cluster version " +
-			"and use CtxForCPutInline to enable it")
-	}
 	b := &Batch{}
-	b.cPutInline(key, value, expValue)
+	b.CPutInline(key, value, expValue)
 	return getOneErr(db.Run(ctx, b), b)
 }
 

pkg/kv/db_test.go

@@ -170,9 +170,9 @@ func TestDB_CPut(t *testing.T) {
 func TestDB_CPutInline(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+	ctx := context.Background()
 	s, db := setup(t)
-	defer s.Stopper().Stop(context.Background())
-	ctx := kv.CtxForCPutInline(context.Background())
+	defer s.Stopper().Stop(ctx)
 
 	if err := db.PutInline(ctx, "aa", "1"); err != nil {
 		t.Fatal(err)

pkg/server/status/BUILD.bazel

@@ -40,7 +40,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/build",
-        "//pkg/clusterversion",
         "//pkg/gossip",
         "//pkg/keys",
         "//pkg/kv",

pkg/server/status/recorder.go

@@ -24,7 +24,6 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/build"
-	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/gossip"
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/kv"
@@ -512,15 +511,15 @@ func (mr *MetricsRecorder) WriteNodeStatus(
 	// of the build info in the node status, writing one of these every 10s
 	// will generate more versions than will easily fit into a range over
 	// the course of a day.
-	if mustExist && mr.settings.Version.IsActive(ctx, clusterversion.CPutInline) {
+	if mustExist {
 		entry, err := db.Get(ctx, key)
 		if err != nil {
 			return err
 		}
 		if entry.Value == nil {
 			return errors.New("status entry not found, node may have been decommissioned")
 		}
-		err = db.CPutInline(kv.CtxForCPutInline(ctx), key, &nodeStatus, entry.Value.TagAndDataBytes())
+		err = db.CPutInline(ctx, key, &nodeStatus, entry.Value.TagAndDataBytes())
 		if detail := (*roachpb.ConditionFailedError)(nil); errors.As(err, &detail) {
 			if detail.ActualValue == nil {
 				return errors.New("status entry not found, node may have been decommissioned")