Merge #82945 #83477

82945: sql: update crdb_internal.cluster_contended_keys join r=ericharmeling a=ericharmeling This PR adds an additional join condition on the `crdb_internal.cluster_contention_events` and `crdb_internal.table_indexes` table join in the `crdb_internal.cluster_contended_keys` CREATE statement. Fixes #80643. Release note (bug fix): Previously, the CREATE statement for the `crdb_internal.cluster_contended_keys` view was missing the `crdb_internal.table_indexes.descriptor_id = crdb_internal.cluster_contention_events.table_id` JOIN condition, resulting in the view having more rows than expected. Now, the view properly joins the `crdb_internal.cluster_contention_events` and `crdb_internal.table_indexes` tables with all necessary JOIN conditions. 83477: changefeedccl: Do not error when casting to builtin types. r=honoredb a=miretskiy Ignore built in types during when checking for user defined type use during CDC expression normalization. Fixes #83464 Release Notes: None Co-authored-by: Eric Harmeling <[email protected]> Co-authored-by: Yevgeniy Miretskiy <[email protected]>
cockroachdb · Jun 28, 2022 · 969bcf7 · 969bcf7
3 parents e19d98d + 1d19f29 + d060404
commit 969bcf7
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/pkg/ccl/changefeedccl/cdceval/validation.go b/pkg/ccl/changefeedccl/cdceval/validation.go
@@ -180,13 +180,13 @@ func normalizeSelectClause(
 	semaCtx.SearchPath = &cdcCustomFunctionResolver{SearchPath: semaCtx.SearchPath}
 	semaCtx.Properties.Require("cdc", rejectInvalidCDCExprs)
 
-	resolveType := func(ref tree.ResolvableTypeReference) (tree.ResolvableTypeReference, error) {
+	resolveType := func(ref tree.ResolvableTypeReference) (tree.ResolvableTypeReference, bool, error) {
 		typ, err := tree.ResolveType(ctx, ref, semaCtx.GetTypeResolver())
 		if err != nil {
-			return nil, pgerror.Wrapf(err, pgcode.IndeterminateDatatype,
+			return nil, false, pgerror.Wrapf(err, pgcode.IndeterminateDatatype,
 				"could not resolve type %s", ref.SQLString())
 		}
-		return &tree.OIDTypeReference{OID: typ.Oid()}, nil
+		return &tree.OIDTypeReference{OID: typ.Oid()}, typ.UserDefined(), nil
 	}
 
 	// Verify that any UDTs used in the statement reference only the UDTs that are
@@ -199,16 +199,25 @@ func normalizeSelectClause(
 		// Replace type references with resolved type.
 		switch e := expr.(type) {
 		case *tree.AnnotateTypeExpr:
-			typ, err := resolveType(e.Type)
+			typ, udt, err := resolveType(e.Type)
 			if err != nil {
 				return false, expr, err
 			}
+			if !udt {
+				// Only care about user defined types.
+				return true, expr, nil
+			}
 			e.Type = typ
 		case *tree.CastExpr:
-			typ, err := resolveType(e.Type)
+			typ, udt, err := resolveType(e.Type)
 			if err != nil {
 				return false, expr, err
 			}
+			if !udt {
+				// Only care about user defined types.
+				return true, expr, nil
+			}
+
 			e.Type = typ
 		}
 

diff --git a/pkg/ccl/changefeedccl/cdceval/validation_test.go b/pkg/ccl/changefeedccl/cdceval/validation_test.go
@@ -115,6 +115,14 @@ func TestNormalizeAndValidate(t *testing.T) {
 					"FROM [%d AS bar] WHERE status = 'open':::defaultdb.public.status",
 				fooDesc.GetID()),
 		},
+		{
+			name: "can cast to standard type",
+			desc: fooDesc,
+			stmt: "SELECT 'cast'::string, 'type_annotation':::string FROM foo AS bar",
+			expectStmt: fmt.Sprintf(
+				"SELECT 'cast'::STRING, 'type_annotation':::STRING FROM [%d AS bar]",
+				fooDesc.GetID()),
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			sc, err := ParseChangefeedExpression(tc.stmt)

diff --git a/pkg/sql/crdb_internal.go b/pkg/sql/crdb_internal.go
@@ -2162,6 +2162,8 @@ CREATE VIEW crdb_internal.cluster_contended_keys (
   WHERE
     crdb_internal.cluster_contention_events.index_id
     = crdb_internal.table_indexes.index_id
+    AND crdb_internal.cluster_contention_events.table_id
+      = crdb_internal.table_indexes.descriptor_id
     AND crdb_internal.cluster_contention_events.table_id
       = crdb_internal.tables.table_id
   GROUP BY

diff --git a/pkg/sql/logictest/testdata/logic_test/create_statements b/pkg/sql/logictest/testdata/logic_test/create_statements
@@ -138,7 +138,11 @@ CREATE VIEW crdb_internal.cluster_contended_keys (
   FROM
     crdb_internal.cluster_contention_events, crdb_internal.tables, crdb_internal.table_indexes
   WHERE
-    crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id
+    (
+      crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id
+      AND crdb_internal.cluster_contention_events.table_id
+        = crdb_internal.table_indexes.descriptor_id
+    )
     AND crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id
   GROUP BY
     database_name, schema_name, name, index_name, key  CREATE VIEW crdb_internal.cluster_contended_keys (
@@ -153,7 +157,11 @@ CREATE VIEW crdb_internal.cluster_contended_keys (
   FROM
     crdb_internal.cluster_contention_events, crdb_internal.tables, crdb_internal.table_indexes
   WHERE
-    crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id
+    (
+      crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id
+      AND crdb_internal.cluster_contention_events.table_id
+        = crdb_internal.table_indexes.descriptor_id
+    )
     AND crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id
   GROUP BY
     database_name, schema_name, name, index_name, key  {}  {}