Merge cockroachdb#107233 cockroachdb#107358

107233: sql: TestRandomSyntaxFunctions fix flakes r=fqazi a=fqazi

Previously, this test could flake due to the following:

1. The timeout is used for specific functions, so moving to a resettable timeout is beneficial, which allows these to be extended as long as connections make progress
2. Panics inside crdb_internal.tenant_span_stats due to nil pointer dereferences.

Fixes: cockroachdb#99182
Fixes: cockroachdb#107237

107358: sql: handle mixed-case for pg_get_serial_sequence r=rafiss a=rafiss

fixes cockroachdb#107234
Release note (bug fix): The pg_get_serial_sequence builtin function can now handle mixed-case names correctly.

Co-authored-by: Faizan Qazi <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>

Author: 3 people

pkg/sql/logictest/testdata/logic_test/serial

@@ -245,7 +245,18 @@ create table serial_2 ("capITALS" SERIAL)
 query T
 SELECT pg_get_serial_sequence('serial_2', 'capITALS')
 ----
-public.serial_2_capITALS_seq
+public."serial_2_capITALS_seq"
+
+statement ok
+create schema "schema-hyphen"
+
+statement ok
+create table "schema-hyphen"."Serial_3" ("capITALS" SERIAL)
+
+query T
+SELECT pg_get_serial_sequence('"schema-hyphen"."Serial_3"', 'capITALS')
+----
+"schema-hyphen"."Serial_3_capITALS_seq"
 
 statement ok
 INSERT INTO serial (a, b) VALUES (0, 2), (DEFAULT, DEFAULT), (DEFAULT, 3)

pkg/sql/sem/builtins/generator_builtins.go

@@ -3314,7 +3314,7 @@ func makeSpanStatsGenerator(
 	spans := make([]roachpb.Span, 0, argSpans.Len())
 	for _, span := range argSpans.Array {
 		s := tree.MustBeDTuple(span)
-		if s.D[0] == tree.DNull || s.D[1] == tree.DNull {
+		if len(s.D) != 2 || s.D[0] == tree.DNull || s.D[1] == tree.DNull {
 			continue
 		}
 		startKey := roachpb.Key(tree.MustBeDBytes(s.D[0]))

pkg/sql/sem/builtins/pg_builtins.go

@@ -849,7 +849,7 @@ var pgBuiltins = map[string]builtinDefinition{
 					return tree.DNull, nil
 				}
 				res.ExplicitCatalog = false
-				return tree.NewDString(fmt.Sprintf(`%s.%s`, res.Schema(), res.Object())), nil
+				return tree.NewDString(fmt.Sprintf(`%s.%s`, res.SchemaName.String(), res.ObjectName.String())), nil
 			},
 			Info:       "Returns the name of the sequence used by the given column_name in the table table_name.",
 			Volatility: volatility.Stable,

pkg/sql/tests/rsg_test.go

@@ -352,7 +352,8 @@ func TestRandomSyntaxFunctions(t *testing.T) {
 					continue
 				case "crdb_internal.reset_sql_stats",
 					"crdb_internal.check_consistency",
-					"crdb_internal.request_statement_bundle":
+					"crdb_internal.request_statement_bundle",
+					"crdb_internal.reset_activity_tables":
 					// Skipped due to long execution time.
 					continue
 				}
@@ -414,7 +415,11 @@ func TestRandomSyntaxFunctions(t *testing.T) {
 			limit = " LIMIT 100"
 		}
 		s := fmt.Sprintf("SELECT %s(%s) %s", nb.name, strings.Join(args, ", "), limit)
-		return db.exec(t, ctx, s)
+		// Use a re-settable timeout since in concurrent scenario some operations may
+		// involve schema changes like truncates. In general this should make
+		// this test more resilient as the timeouts are reset as long progress
+		// is made on *some* connection.
+		return db.execWithResettableTimeout(t, ctx, s, *flagRSGExecTimeout, *flagRSGGoRoutines)
 	})
 }