Merge #152285

152285: sql: remove LTREE from mixed version clusters previous to 25.4 r=yuzefovich a=paulniziolek

#### sql: remove LTREE from mixed version clusters previous to 25.4

Currently, we hit internal panics for randomized mixed version testing. This PR
prevents this by blocking LTREE usage in mixed version clusters.

Epic: None

Release note: None


Co-authored-by: Paul Niziolek <[email protected]>

Author: craig[bot]

pkg/sql/catalog/colinfo/BUILD.bazel

@@ -16,6 +16,7 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/docs",
         "//pkg/settings/cluster",
         "//pkg/sql/catalog",

pkg/sql/catalog/colinfo/col_type_info.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/docs"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
@@ -110,14 +111,21 @@ func ValidateColumnDefType(ctx context.Context, st *cluster.Settings, t *types.T
 		types.INetFamily, types.IntervalFamily, types.JsonFamily, types.OidFamily, types.TimeFamily,
 		types.TimestampFamily, types.TimestampTZFamily, types.UuidFamily, types.TimeTZFamily,
 		types.GeographyFamily, types.GeometryFamily, types.EnumFamily, types.Box2DFamily,
-		types.TSQueryFamily, types.TSVectorFamily, types.PGLSNFamily, types.PGVectorFamily, types.RefCursorFamily,
-		types.LTreeFamily:
+		types.TSQueryFamily, types.TSVectorFamily, types.PGLSNFamily, types.PGVectorFamily, types.RefCursorFamily:
 	// These types are OK.
 
 	case types.JsonpathFamily:
 		return unimplemented.NewWithIssueDetailf(144910, t.String(),
 			"jsonpath unsupported as column type")
 
+	case types.LTreeFamily:
+		if !st.Version.IsActive(ctx, clusterversion.V25_4) {
+			return pgerror.Newf(
+				pgcode.FeatureNotSupported,
+				"ltree not supported until version 25.4",
+			)
+		}
+
 	case types.TupleFamily:
 		if !t.UserDefined() {
 			return pgerror.New(pgcode.InvalidTableDefinition, "cannot use anonymous record type as table column")

pkg/sql/logictest/testdata/logic_test/ltree

@@ -1,3 +1,5 @@
+# LogicTest: !local-mixed-25.2 !local-mixed-25.3
+
 statement ok
 CREATE TABLE l (lt LTREE);
 

pkg/sql/logictest/testdata/logic_test/mixed_version_ltree

@@ -0,0 +1,49 @@
+# LogicTest: cockroach-go-testserver-configs
+
+# Sanity check that LTREE type is only allowed to be used once the cluster is
+# upgraded to 25.4.
+
+statement error pgcode 42704 type \"ltree\" does not exist
+CREATE TABLE l (lt LTREE);
+
+statement error pgcode 42704 type \"ltree\" does not exist
+CREATE TABLE la (lta LTREE[]);
+
+statement error pgcode 42704 type \"ltree\" does not exist
+SELECT 'A.B'::LTREE
+
+statement error pgcode 42704 type \"ltree\" does not exist
+SELECT ARRAY['A', 'A.B']::LTREE[]
+
+upgrade 0
+
+statement error pgcode 0A000 ltree not supported until version 25.4
+CREATE TABLE l (lt LTREE);
+
+statement error pgcode 0A000 ltree not supported until version 25.4
+CREATE TABLE la (lta LTREE[]);
+
+statement error pgcode 0A000 ltree not supported until version 25.4
+SELECT 'A.B'::LTREE
+
+statement error pgcode 0A000 ltree\[\] not supported until version 25.4
+SELECT ARRAY['A', 'A.B']::LTREE[]
+
+upgrade 1
+
+upgrade 2
+
+statement ok
+SET CLUSTER SETTING version = crdb_internal.node_executable_version()
+
+statement ok
+CREATE TABLE l (lt LTREE);
+
+statement ok
+CREATE TABLE la (lta LTREE[]);
+
+statement ok
+SELECT 'A.B'::LTREE
+
+statement ok
+SELECT ARRAY['A', 'A.B']::LTREE[]

pkg/sql/logictest/tests/cockroach-go-testserver-25.2/BUILD.bazel

@@ -11,7 +11,7 @@ go_test(
         "//pkg/sql/logictest:testdata",  # keep
     ],
     exec_properties = {"test.Pool": "heavy"},
-    shard_count = 8,
+    shard_count = 9,
     tags = ["cpu:3"],
     deps = [
         "//pkg/base",

pkg/sql/logictest/tests/cockroach-go-testserver-25.2/generated_test.go

@@ -11,7 +11,7 @@ go_test(
         "//pkg/sql/logictest:testdata",  # keep
     ],
     exec_properties = {"test.Pool": "heavy"},
-    shard_count = 7,
+    shard_count = 8,
     tags = ["cpu:3"],
     deps = [
         "//pkg/base",