clusterversions: remove RowLevelTTL version

Release note: None
aadityasondhi · Aug 16, 2022 · 4710f62 · 4710f62
1 parent 4561f22
commit 4710f62
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 82 deletions.
diff --git a/pkg/clusterversion/cockroach_versions.go b/pkg/clusterversion/cockroach_versions.go
@@ -196,8 +196,6 @@ const (
 	// ChangefeedIdleness is the version where changefeed aggregators forward
 	// idleness-related information alnog with resolved spans to the frontier
 	ChangefeedIdleness
-	// RowLevelTTL is the version where we allow row level TTL tables.
-	RowLevelTTL
 	// EnableNewStoreRebalancer enables the new store rebalancer introduced in
 	// 22.1.
 	EnableNewStoreRebalancer
@@ -396,10 +394,6 @@ var versionsSingleton = keyedVersions{
 		Key:     ChangefeedIdleness,
 		Version: roachpb.Version{Major: 21, Minor: 2, Internal: 82},
 	},
-	{
-		Key:     RowLevelTTL,
-		Version: roachpb.Version{Major: 21, Minor: 2, Internal: 88},
-	},
 	{
 		Key:     EnableNewStoreRebalancer,
 		Version: roachpb.Version{Major: 21, Minor: 2, Internal: 96},

diff --git a/pkg/clusterversion/key_string.go b/pkg/clusterversion/key_string.go
diff --git a/pkg/sql/alter_table.go b/pkg/sql/alter_table.go
@@ -1859,13 +1859,6 @@ func handleTTLStorageParamChange(
 	tableDesc *tabledesc.Mutable,
 	before, after *catpb.RowLevelTTL,
 ) error {
-
-	if before == nil && after != nil {
-		if err := checkTTLEnabledForCluster(params.ctx, params.p.ExecCfg().Settings); err != nil {
-			return err
-		}
-	}
-
 	// update existing config
 	if before != nil && after != nil {
 

diff --git a/pkg/sql/create_table.go b/pkg/sql/create_table.go
@@ -1475,9 +1475,6 @@ func NewTableDesc(
 
 	// Create the TTL automatic column (crdb_internal_expiration) if one does not already exist.
 	if ttl := desc.GetRowLevelTTL(); ttl != nil && ttl.HasDurationExpr() {
-		if err := checkTTLEnabledForCluster(ctx, st); err != nil {
-			return nil, err
-		}
 		hasRowLevelTTLColumn := false
 		for _, def := range n.Defs {
 			switch def := def.(type) {
@@ -2422,16 +2419,6 @@ func newRowLevelTTLScheduledJob(
 	return sj, nil
 }
 
-func checkTTLEnabledForCluster(ctx context.Context, st *cluster.Settings) error {
-	if !st.Version.IsActive(ctx, clusterversion.RowLevelTTL) {
-		return pgerror.Newf(
-			pgcode.FeatureNotSupported,
-			"row level TTL is only available once the cluster is fully upgraded",
-		)
-	}
-	return nil
-}
-
 func checkAutoStatsTableSettingsEnabledForCluster(ctx context.Context, st *cluster.Settings) error {
 	if !st.Version.IsActive(ctx, clusterversion.AutoStatsTableSettings) {
 		return pgerror.Newf(

diff --git a/pkg/sql/logictest/testdata/logic_test/row_level_ttl_mixed_21.2_22.1 b/pkg/sql/logictest/testdata/logic_test/row_level_ttl_mixed_21.2_22.1
diff --git a/pkg/sql/logictest/tests/local-mixed-21.2-22.1/BUILD.bazel b/pkg/sql/logictest/tests/local-mixed-21.2-22.1/BUILD.bazel
@@ -9,7 +9,7 @@ go_test(
         "//c-deps:libgeos",  # keep
         "//pkg/sql/logictest:testdata",  # keep
     ],
-    shard_count = 2,
+    shard_count = 1,
     deps = [
         "//pkg/build/bazel",
         "//pkg/security/securityassets",

diff --git a/pkg/sql/logictest/tests/local-mixed-21.2-22.1/generated_test.go b/pkg/sql/logictest/tests/local-mixed-21.2-22.1/generated_test.go