randgen: use hidden rowid column in columnFamilyMutator

This commit extends the column family mutator to work in the special
(but somewhat common) case when the table has a single column that is
not the primary key. When the user doesn't specify a primary key,
CREATE TABLE adds a hidden 'rowid' column to use as the primary key.
We now use this column in addition to the explicitly defined column to
exercise randomized column families. In particular, this would have
caught the CIText bug with multiple column families from a couple weeks
ago.

Additionally, this commit extends the logic test framework to support
`statement disable-cf-mutator ok` variant which disables the CF mutator
if applicable (it's applied only to CREATE TABLE stmts). Previously, the
only way to disable the mutator was to explicitly include column family
definitions, and `disable-cf-mutator` seems nicer.

This new option is used in many places to make the output of SHOW CREATE
TABLE deterministic. An attempt is made to minimize the test churn while
also disabling the CF mutator in reduced scopes.

Release note: None

Author: yuzefovich

pkg/ccl/logictestccl/testdata/logic_test/alter_table_locality

@@ -995,7 +995,7 @@ TABLE regional_by_table_no_region  ALTER TABLE regional_by_table_no_region CONFI
 statement ok
 DROP TABLE regional_by_table_no_region
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE regional_by_table_no_region (i int)
 
 statement ok

pkg/ccl/logictestccl/testdata/logic_test/multi_region

@@ -386,7 +386,7 @@ CREATE TABLE partition_by_table_in_mr_database (
 )
 LOCALITY REGIONAL BY TABLE
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE regional_primary_region_table (a int) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
 
 query T
@@ -421,7 +421,7 @@ CREATE INDEX bad_idx ON regional_primary_region_table(a) PARTITION BY LIST (a) (
   PARTITION one VALUES IN (1)
 )
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE regional_implicit_primary_region_table (a int) LOCALITY REGIONAL BY TABLE
 
 query T
@@ -446,7 +446,7 @@ TABLE regional_implicit_primary_region_table  ALTER TABLE regional_implicit_prim
                                                 voter_constraints = '{+region=ca-central-1: 2}',
                                                 lease_preferences = '[[+region=ca-central-1]]'
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE "regional_us-east-1_table" (a int) LOCALITY REGIONAL BY TABLE IN "us-east-1"
 
 query T
@@ -474,7 +474,7 @@ TABLE "regional_us-east-1_table"  ALTER TABLE "regional_us-east-1_table" CONFIGU
 statement error region "test4" has not been added to database "multi_region_test_db"\nHINT: available regions: ap-southeast-2, ca-central-1, us-east-1
 CREATE TABLE regional_test4_table (a int) LOCALITY REGIONAL BY TABLE IN "test4"
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE global_table (a int) LOCALITY GLOBAL
 
 query T
@@ -1046,6 +1046,8 @@ ALTER DATABASE no_initial_region SET PRIMARY REGION "us-east-1"
 
 statement ok
 DROP TABLE idx_with_partition_by;
+
+statement disable-cf-mutator ok
 CREATE TABLE no_initial_region.t(k INT)
 
 statement ok

pkg/ccl/logictestccl/testdata/logic_test/multi_region_backup

@@ -1186,7 +1186,7 @@ CREATE DATABASE non_mr_backup;
 statement ok
 USE non_mr_backup
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE non_mr_table (i int)
 
 # For comparing the zone configurations before restore.

pkg/sql/logictest/logic.go

@@ -227,6 +227,9 @@ import (
 //      statement ok
 //      CREATE TABLE kv (k INT PRIMARY KEY, v INT)
 //
+//  - statement disable-cf-mutator ok
+//    Like "statement ok" but disables the column family mutator if applicable.
+//
 //  - statement notice <regexp>
 //    Like "statement ok" but expects a notice that matches the given regexp.
 //
@@ -2732,6 +2735,7 @@ func (t *logicTest) processSubtest(
 				fields = fields[:len(fields)-2]
 			}
 			fullyConsumed := len(fields) == 1
+			var disableCFMutator bool
 			// Parse "statement (notice|error) <regexp>"
 			if m := noticeRE.FindStringSubmatch(s.Text()); m != nil {
 				stmt.expectNotice = m[1]
@@ -2740,6 +2744,9 @@ func (t *logicTest) processSubtest(
 				stmt.expectErrCode = m[1]
 				stmt.expectErr = m[2]
 				fullyConsumed = true
+			} else if len(fields) == 3 && fields[1] == "disable-cf-mutator" && fields[2] == "ok" {
+				disableCFMutator = true
+				fullyConsumed = true
 			} else if len(fields) == 2 && fields[1] == "ok" {
 				// Match 'ok' only if there are no options after it.
 				fullyConsumed = true
@@ -2758,11 +2765,11 @@ func (t *logicTest) processSubtest(
 						err = testutils.SucceedsWithinError(func() error {
 							t.purgeZoneConfig()
 							var tempErr error
-							cont, tempErr = t.execStatement(stmt)
+							cont, tempErr = t.execStatement(stmt, disableCFMutator)
 							return tempErr
 						}, t.retryDuration)
 					} else {
-						cont, err = t.execStatement(stmt)
+						cont, err = t.execStatement(stmt, disableCFMutator)
 					}
 					if err != nil {
 						if !cont {
@@ -3594,7 +3601,7 @@ func (t *logicTest) unexpectedError(sql string, pos string, err error) (bool, er
 
 var uniqueHashPattern = regexp.MustCompile(`UNIQUE.*USING\s+HASH`)
 
-func (t *logicTest) execStatement(stmt logicStatement) (bool, error) {
+func (t *logicTest) execStatement(stmt logicStatement, disableCFMutator bool) (bool, error) {
 	db := t.db
 	t.noticeBuffer = nil
 	if *showSQL {
@@ -3606,7 +3613,7 @@ func (t *logicTest) execStatement(stmt logicStatement) (bool, error) {
 	// reserialized with a UNIQUE constraint, not a UNIQUE INDEX, which may not
 	// be parsable because constraints do not support all the options that
 	// indexes do.
-	if !uniqueHashPattern.MatchString(stmt.sql) {
+	if !uniqueHashPattern.MatchString(stmt.sql) && !disableCFMutator {
 		var changed bool
 		execSQL, changed = randgen.ApplyString(t.rng, execSQL, randgen.ColumnFamilyMutator)
 		if changed {

pkg/sql/logictest/testdata/logic_test/alter_column_type

@@ -329,7 +329,7 @@ statement error default for column "x" cannot be cast automatically to type DATE
 ALTER TABLE t7 ALTER COLUMN x TYPE DATE USING x::DATE;
 
 # Ensure a runtime error correctly rolls back and the table is unchanged.
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t8 (x STRING)
 
 statement ok
@@ -560,7 +560,7 @@ true
 true
 
 # Ensure ALTER COLUMN TYPE rolls back if is not applicable to value in the column.
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t24 (x STRING);
 
 statement ok
@@ -1890,7 +1890,7 @@ SELECT value FROM information_schema.session_variables where variable='use_decla
 statement ok
 set use_declarative_schema_changer = 'unsafe_always';
 
-statement ok
+statement disable-cf-mutator ok
 create table t_droppedcol (dropme int);
 
 statement ok

pkg/sql/logictest/testdata/logic_test/alter_primary_key

@@ -707,7 +707,7 @@ ALTER TABLE t ADD PRIMARY KEY (x)
 statement ok
 DROP TABLE IF EXISTS t;
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t (x INT NOT NULL)
 
 statement ok
@@ -736,7 +736,7 @@ t  CREATE TABLE public.t (
 statement ok
 DROP TABLE IF EXISTS t;
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t (x INT NOT NULL);
 
 statement ok
@@ -766,7 +766,7 @@ t  CREATE TABLE public.t (
 statement ok
 DROP TABLE IF EXISTS t;
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t (x INT NOT NULL);
 
 statement ok

pkg/sql/logictest/testdata/logic_test/alter_table

@@ -1266,6 +1266,8 @@ subtest add_col_references
 statement ok
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (x INT PRIMARY KEY);
+
+statement disable-cf-mutator ok
 CREATE TABLE t2 (y INT)
 
 statement ok
@@ -1307,7 +1309,7 @@ t2  CREATE TABLE public.t2 (
 
 # Test that only one index gets created when adding a column
 # with references and unique.
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t3 (y INT)
 
 statement ok
@@ -1411,7 +1413,7 @@ DROP TABLE t1, t2 CASCADE
 statement ok
 SET create_table_with_schema_locked=false
 
-statement ok
+statement disable-cf-mutator ok
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 SET LOCAL autocommit_before_ddl = false;
 CREATE TABLE t1 (x INT PRIMARY KEY);
@@ -1434,7 +1436,7 @@ t2  CREATE TABLE public.t2 (
 statement ok
 DROP TABLE t1, t2 CASCADE
 
-statement ok
+statement disable-cf-mutator ok
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 SET LOCAL autocommit_before_ddl = false;
 CREATE TABLE t1 (x INT PRIMARY KEY);
@@ -1458,7 +1460,7 @@ t2  CREATE TABLE public.t2 (
 statement ok
 DROP TABLE t1, t2 CASCADE
 
-statement ok
+statement disable-cf-mutator ok
 BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 SET LOCAL autocommit_before_ddl = false;
 CREATE TABLE t1 (x INT PRIMARY KEY);
@@ -1489,6 +1491,8 @@ DROP TABLE t1, t2 CASCADE;
 
 statement ok
 CREATE TABLE t1 (x INT PRIMARY KEY);
+
+statement disable-cf-mutator ok
 CREATE TABLE t2 (y INT)
 
 statement ok
@@ -1517,6 +1521,8 @@ DROP TABLE t1, t2 CASCADE;
 
 statement ok
 CREATE TABLE t1 (x INT PRIMARY KEY);
+
+statement disable-cf-mutator ok
 CREATE TABLE t2 (x INT)
 
 statement ok
@@ -1544,7 +1550,11 @@ DROP TABLE t1, t2 CASCADE
 statement ok
 CREATE TABLE t1 (x INT PRIMARY KEY);
 INSERT INTO t1 VALUES (1);
+
+statement disable-cf-mutator ok
 CREATE TABLE t2 (y INT);
+
+statement ok
 INSERT INTO t2 VALUES (2)
 
 statement error pq: foreign key violation
@@ -2210,7 +2220,7 @@ subtest generated_as_identity
 statement ok
 DROP TABLE IF EXISTS t;
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t (a INT UNIQUE)
 
 statement ok
@@ -2368,7 +2378,7 @@ ALTER TABLE t ALTER COLUMN b TYPE numeric(10,2)
 statement ok
 DROP TABLE IF EXISTS t;
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t (a INT UNIQUE)
 
 statement ok
@@ -2438,7 +2448,7 @@ ALTER TABLE t ALTER COLUMN b TYPE numeric(10,2)
 statement ok
 DROP TABLE IF EXISTS t;
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t (id INT NOT NULL)
 
 statement ok
@@ -2876,7 +2886,7 @@ RESET create_table_with_schema_locked
 
 subtest table_settings
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t5 (a int)
 
 # Turn on automatic stats collection
@@ -4738,7 +4748,7 @@ skipif config local-legacy-schema-changer
 statement ok
 set use_declarative_schema_changer = 'unsafe_always';
 
-statement ok
+statement disable-cf-mutator ok
 create table t_droppedcol (dropme int);
 
 statement ok
@@ -4827,7 +4837,7 @@ subtest end
 
 subtest serial_columns
 
-statement ok
+statement disable-cf-mutator ok
 create table t1_serial_columns(n int);
 
 statement ok
@@ -5148,7 +5158,7 @@ subtest end
 # not break as seen in #128420
 subtest add_unique_and_alter_primary_key
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE t_128420 (i int not null);
 
 # Not supported in mixed version configurations

pkg/sql/logictest/testdata/logic_test/array

@@ -477,7 +477,7 @@ query T
 SELECT ARRAY[ROW()] FROM ident
 ----
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE a (b INT ARRAY)
 
 onlyif config schema-locked-disabled
@@ -505,7 +505,7 @@ DROP TABLE a
 
 # Int array columns.
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE a (b INT[])
 
 statement ok
@@ -631,7 +631,7 @@ DROP TABLE a
 
 # Ensure that additional type info stays when used as an array.
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE a (b SMALLINT[])
 
 onlyif config schema-locked-disabled

pkg/sql/logictest/testdata/logic_test/bit

@@ -191,9 +191,11 @@ FROM bits x, bits y
 
 subtest bit_ordering
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE obits(x VARBIT);
- INSERT INTO obits(x) VALUES
+
+statement ok
+INSERT INTO obits(x) VALUES
  (B'0'),
  (B'1'),
  (B'0000'),
@@ -258,9 +260,11 @@ SELECT ARRAY[B'101011'] AS a, '{111001}'::VARBIT[] AS b
 a         b
 {101011}  {111001}
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE obitsa(x VARBIT(20)[]);
- INSERT INTO obitsa(x) VALUES
+
+statement ok
+INSERT INTO obitsa(x) VALUES
  (ARRAY[B'01', B'']),
  (ARRAY[B'01', B'0']),
  (ARRAY[B'01', B'1']),

pkg/sql/logictest/testdata/logic_test/builtin_function

@@ -1,6 +1,6 @@
 # tenant-capability-override-opt: can_check_consistency=true
 
-statement ok
+statement disable-cf-mutator ok
 CREATE TABLE foo (a int)
 
 statement ok