logictest: make schema_locked enabled for all tests

Previously, schema-locking was only tested under the local-schema-locked
setting. This patch removes the local-schema-locked configuration and
enables schema-locked by default for all configs except mixed-version
and legacy schema changer setups. A new config set,
schema-locked-disabled, has been added to skip schema-locking related
logic.

As part of this change, expected values in the execbuilder logictests
have been updated for schema_locked, and ccl logictests are now updated
to expect schema-locked tables by default.

Additionally, schema-locking is now bypassed for the following specific
cases:
	- Transactional test cases.
	- ALTER TABLE ... SET LOCALITY test cases, due to missing
	  declarative schema changer support.

Most of the logic test edits involve search and replace operations, such
as changing skipif config local-schema-locked to onlyif config
schema-locked-disabled.

Informs: #129694
Release note: None

Author: fqazi

pkg/BUILD.bazel

@@ -62,7 +62,6 @@ ALL_TESTS = [
     "//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
     "//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
-    "//pkg/ccl/logictestccl/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
     "//pkg/ccl/logictestccl/tests/local:local_test",
     "//pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs:multiregion-15node-5region-3azs_test",
@@ -508,7 +507,6 @@ ALL_TESTS = [
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
-    "//pkg/sql/logictest/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -526,7 +524,6 @@ ALL_TESTS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
-    "//pkg/sql/opt/exec/execbuilder/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder_test",
@@ -632,7 +629,6 @@ ALL_TESTS = [
     "//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
-    "//pkg/sql/sqlitelogictest/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/sqlitelogictest/tests/local:local_test",
     "//pkg/sql/sqlliveness/slinstance:slinstance_test",
@@ -964,7 +960,6 @@ GO_TARGETS = [
     "//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
     "//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
-    "//pkg/ccl/logictestccl/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
     "//pkg/ccl/logictestccl/tests/local:local_test",
     "//pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs:multiregion-15node-5region-3azs_test",
@@ -2032,7 +2027,6 @@ GO_TARGETS = [
     "//pkg/sql/logictest/tests/fakedist:fakedist_test",
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
-    "//pkg/sql/logictest/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/logictest/tests/local:local_test",
     "//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
@@ -2059,7 +2053,6 @@ GO_TARGETS = [
     "//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
-    "//pkg/sql/opt/exec/execbuilder/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
     "//pkg/sql/opt/exec/execbuilder:execbuilder",
@@ -2312,7 +2305,6 @@ GO_TARGETS = [
     "//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
     "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
-    "//pkg/sql/sqlitelogictest/tests/local-schema-locked:local-schema-locked_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/sqlitelogictest/tests/local:local_test",
     "//pkg/sql/sqlitelogictest:sqlitelogictest",

pkg/ccl/logictestccl/testdata/logic_test/alter_table_locality

@@ -1,5 +1,10 @@
 # LogicTest: multiregion-9node-3region-3azs multiregion-9node-3region-3azs-no-los
 
+# Disable schema_locked for this test since alter table
+# locality is only in the legacy schema changer.
+statement ok
+SET create_table_with_schema_locked=false
+
 statement ok
 CREATE DATABASE alter_locality_test primary region "ca-central-1" regions "ap-southeast-2", "us-east-1"
 

pkg/ccl/logictestccl/testdata/logic_test/auto_rehoming

@@ -24,11 +24,13 @@ db.public.rbr  CREATE TABLE public.rbr (
                  s STRING NULL,
                  crdb_region public.crdb_internal_region NOT VISIBLE NOT NULL DEFAULT default_to_database_primary_region(gateway_region())::public.crdb_internal_region ON UPDATE rehome_row()::public.crdb_internal_region,
                  CONSTRAINT rbr_pkey PRIMARY KEY (p ASC)
-               ) LOCALITY REGIONAL BY ROW;
+               ) WITH (schema_locked = true) LOCALITY REGIONAL BY ROW;
 
 
+# Locality cannot be modified with schema_locked set, until declarative
+# schema changer support is added.
 statement ok
-CREATE TABLE db.rbr_altered (p INT PRIMARY KEY) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
+CREATE TABLE db.rbr_altered (p INT PRIMARY KEY) WITH (schema_locked=false) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
 
 statement ok
 ALTER TABLE db.rbr_altered SET LOCALITY REGIONAL BY ROW

pkg/ccl/logictestccl/testdata/logic_test/case_sensitive_names

@@ -17,6 +17,6 @@ p  CREATE TABLE public.p (
      PARTITION p1 VALUES IN ((1)),
      PARTITION "P1" VALUES IN ((2)),
      PARTITION "Amélie" VALUES IN ((3))
-   )
+   ) WITH (schema_locked = true)
    -- Warning: Partitioned table with no zone configurations.
    ;

pkg/ccl/logictestccl/testdata/logic_test/multi_region

@@ -396,7 +396,7 @@ CREATE TABLE public.regional_primary_region_table (
   a INT8 NULL,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT regional_primary_region_table_pkey PRIMARY KEY (rowid ASC)
-) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
 
 query TT
 SHOW ZONE CONFIGURATION FOR TABLE regional_primary_region_table
@@ -431,7 +431,7 @@ CREATE TABLE public.regional_implicit_primary_region_table (
   a INT8 NULL,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT regional_implicit_primary_region_table_pkey PRIMARY KEY (rowid ASC)
-) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
 
 query TT
 SHOW ZONE CONFIGURATION FOR TABLE regional_implicit_primary_region_table
@@ -456,7 +456,7 @@ CREATE TABLE public."regional_us-east-1_table" (
   a INT8 NULL,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT "regional_us-east-1_table_pkey" PRIMARY KEY (rowid ASC)
-) LOCALITY REGIONAL BY TABLE IN "us-east-1";
+) WITH (schema_locked = true) LOCALITY REGIONAL BY TABLE IN "us-east-1";
 
 query TT
 SHOW ZONE CONFIGURATION FOR TABLE "regional_us-east-1_table"
@@ -484,7 +484,7 @@ CREATE TABLE public.global_table (
   a INT8 NULL,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT global_table_pkey PRIMARY KEY (rowid ASC)
-) LOCALITY GLOBAL;
+) WITH (schema_locked = true) LOCALITY GLOBAL;
 
 query TT
 SHOW ZONE CONFIGURATION FOR TABLE global_table
@@ -1071,7 +1071,7 @@ CREATE TABLE public.t (
   k INT8 NULL,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT t_pkey PRIMARY KEY (rowid ASC)
-) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
 
 statement ok
 CREATE DATABASE non_multi_region_db
@@ -1230,18 +1230,30 @@ CREATE TABLE southeast() LOCALITY REGIONAL BY TABLE IN "ap-southeast-2"
 statement error pq: could not remove enum value "ap-southeast-2" as it is the home region for table "southeast"
 ALTER DATABASE drop_regions_alter_patterns DROP REGION "ap-southeast-2"
 
+statement ok
+ALTER TABLE southeast SET (schema_locked=false)
+
 statement ok
 ALTER TABLE southeast SET LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
 
+statement ok
+ALTER TABLE southeast SET (schema_locked=true)
+
 statement ok
 ALTER DATABASE drop_regions_alter_patterns DROP REGION "ap-southeast-2"
 
 statement error pq: could not remove enum value "us-east-1" as it is the home region for table "east"
 ALTER DATABASE drop_regions_alter_patterns DROP REGION "us-east-1"
 
+statement ok
+ALTER TABLE east SET (schema_locked=false)
+
 statement ok
 ALTER TABLE east SET LOCALITY GLOBAL
 
+statement ok
+ALTER TABLE east SET (schema_locked=true)
+
 statement ok
 ALTER DATABASE drop_regions_alter_patterns DROP REGION "us-east-1"
 
@@ -1329,6 +1341,9 @@ DATABASE drop_primary_regions_db  ALTER DATABASE drop_primary_regions_db CONFIGU
 
 
 
+statement ok
+ALTER TABLE drop_primary_regions_db.primary SET (schema_locked = false);
+
 statement ok
 ALTER TABLE drop_primary_regions_db.primary SET LOCALITY REGIONAL BY TABLE IN "ca-central-1"
 
@@ -1338,6 +1353,9 @@ ALTER DATABASE drop_primary_regions_db DROP REGION "ca-central-1"
 statement ok
 ALTER TABLE drop_primary_regions_db.primary SET LOCALITY REGIONAL BY TABLE IN PRIMARY REGION
 
+statement ok
+ALTER TABLE drop_primary_regions_db.primary SET (schema_locked = true);
+
 statement ok
 ALTER DATABASE drop_primary_regions_db DROP REGION "ca-central-1"
 
@@ -1525,12 +1543,19 @@ CREATE TABLE public.t_as (
   crdb_region public.crdb_internal_region NULL,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT t_as_pkey PRIMARY KEY (rowid ASC)
-) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY TABLE IN PRIMARY REGION;
+
 
+statement ok
+ALTER TABLE t_as SET (schema_locked = false);
 
 statement error cannot use column crdb_region for REGIONAL BY ROW table as it may contain NULL values
 ALTER TABLE t_as SET LOCALITY REGIONAL BY ROW AS crdb_region
 
+
+statement ok
+ALTER TABLE t_as SET (schema_locked = true);
+
 statement ok
 ALTER TABLE t_as ALTER COLUMN crdb_region SET NOT NULL
 
@@ -1540,9 +1565,15 @@ ALTER TABLE t_as ALTER COLUMN crdb_region SET NOT VISIBLE
 statement ok
 ALTER TABLE t_as ALTER COLUMN crdb_region SET DEFAULT default_to_database_primary_region(gateway_region())::public.crdb_internal_region
 
+statement ok
+ALTER TABLE t_as SET (schema_locked = false);
+
 statement ok
 ALTER TABLE t_as SET LOCALITY REGIONAL BY ROW AS crdb_region
 
+statement ok
+ALTER TABLE t_as SET (schema_locked = true);
+
 query T colnames
 SELECT create_statement from [SHOW CREATE TABLE t_as]
 ----
@@ -1552,7 +1583,7 @@ CREATE TABLE public.t_as (
   crdb_region public.crdb_internal_region NOT VISIBLE NOT NULL DEFAULT default_to_database_primary_region(gateway_region())::public.crdb_internal_region,
   rowid INT8 NOT VISIBLE NOT NULL DEFAULT unique_rowid(),
   CONSTRAINT t_as_pkey PRIMARY KEY (rowid ASC)
-) LOCALITY REGIONAL BY ROW AS crdb_region;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY ROW AS crdb_region;
 
 query TI colnames,rowsort
 SELECT crdb_region, i FROM t_as
@@ -1594,7 +1625,7 @@ CREATE TABLE public.t_as (
   i INT8 NOT NULL,
   crdb_region public.crdb_internal_region NOT VISIBLE NOT NULL DEFAULT default_to_database_primary_region(gateway_region())::public.crdb_internal_region,
   CONSTRAINT t_as_pkey PRIMARY KEY (i ASC)
-) LOCALITY REGIONAL BY ROW AS crdb_region;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY ROW AS crdb_region;
 
 query T colnames
 SELECT create_statement from [SHOW CREATE TABLE t]
@@ -1604,7 +1635,7 @@ CREATE TABLE public.t (
   i INT8 NOT NULL,
   crdb_region public.crdb_internal_region NOT VISIBLE NOT NULL DEFAULT default_to_database_primary_region(gateway_region())::public.crdb_internal_region,
   CONSTRAINT t_pkey PRIMARY KEY (i ASC)
-) LOCALITY REGIONAL BY ROW;
+) WITH (schema_locked = true) LOCALITY REGIONAL BY ROW;
 
 # Declare victory, as this is the closest we can get.
 statement ok

pkg/ccl/logictestccl/testdata/logic_test/multi_region_alter_table_regional_by_row

@@ -10,8 +10,10 @@ CREATE DATABASE region_test_db PRIMARY REGION "ap-southeast-2" SURVIVE ZONE FAIL
 statement ok
 USE region_test_db;
 
+# This test is only focused on locality changes which are only supported
+# by the legacy schema changer.
 statement ok
-CREATE TABLE t (i INT8 NULL, INDEX (i));
+CREATE TABLE t (i INT8 NULL, INDEX (i)) WITH (schema_locked = false);
 
 statement ok
 INSERT INTO t VALUES (1);