Merge cockroachdb#107990

107990: logictest: add a local-read-committed default config r=rafiss a=rafiss fixes cockroachdb#100178 Release note: None Co-authored-by: Rafi Shamim <[email protected]>
andrew-delph · Feb 16, 2024 · 5a17406 · 5a17406
2 parents b2924a1 + 2d14c05
commit 5a17406
Show file tree

Hide file tree

Showing 135 changed files with 5,173 additions and 290 deletions.
diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
@@ -56,6 +56,7 @@ ALL_TESTS = [
     "//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_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",
@@ -465,6 +466,7 @@ ALL_TESTS = [
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/sql/logictest/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/sql/logictest/tests/local-read-committed:local-read-committed_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",
@@ -483,6 +485,7 @@ ALL_TESTS = [
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/sql/opt/exec/execbuilder/tests/local-read-committed:local-read-committed_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",
@@ -584,6 +587,7 @@ ALL_TESTS = [
     "//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_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",
@@ -878,6 +882,7 @@ GO_TARGETS = [
     "//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/ccl/logictestccl/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_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",
@@ -1883,6 +1888,7 @@ GO_TARGETS = [
     "//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/logictest/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/sql/logictest/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/sql/logictest/tests/local-read-committed:local-read-committed_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",
@@ -1910,6 +1916,7 @@ GO_TARGETS = [
     "//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/sql/opt/exec/execbuilder/tests/local-read-committed:local-read-committed_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",
@@ -2155,6 +2162,7 @@ GO_TARGETS = [
     "//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-23.1:local-mixed-23_1_test",
     "//pkg/sql/sqlitelogictest/tests/local-mixed-23.2:local-mixed-23_2_test",
+    "//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
     "//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
     "//pkg/sql/sqlitelogictest/tests/local:local_test",
     "//pkg/sql/sqlitelogictest:sqlitelogictest",

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/plpgsql_cursor b/pkg/ccl/logictestccl/testdata/logic_test/plpgsql_cursor
@@ -1008,7 +1008,7 @@ FETCH foo;
 
 # The exception block can catch an error thrown as the cursor is being opened.
 statement ok
-BEGIN;
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 DECLARE dup CURSOR FOR SELECT 0;
 
 statement ok
@@ -1098,7 +1098,7 @@ FETCH 3 FROM foo;
 # within the exception handler itself.
 statement ok
 ABORT;
-BEGIN;
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 DECLARE dup CURSOR FOR SELECT 0;
 
 statement ok

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/schema_change_in_txn b/pkg/ccl/logictestccl/testdata/logic_test/schema_change_in_txn
@@ -12,7 +12,7 @@ skip_on_retry
 subtest index_resolution_does_not_lead_to_new_version
 
 statement ok
-BEGIN;
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 CREATE DATABASE db;
 CREATE TABLE db.t(i INT PRIMARY KEY, j INT, k INT);
 CREATE INDEX idx_i ON db.t (i);

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/udf_plpgsql b/pkg/ccl/logictestccl/testdata/logic_test/udf_plpgsql
@@ -2350,7 +2350,7 @@ SELECT f();
 subtest upsert_into
 
 statement ok
-BEGIN;
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
 
 query II rowsort
 SELECT * FROM xy;

diff --git a/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant-multiregion/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/5node/generated_test.go b/pkg/ccl/logictestccl/tests/5node/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/cockroach-go-testserver-23.1/generated_test.go b/pkg/ccl/logictestccl/tests/cockroach-go-testserver-23.1/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/fakedist-disk/generated_test.go b/pkg/ccl/logictestccl/tests/fakedist-disk/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/fakedist-vec-off/generated_test.go b/pkg/ccl/logictestccl/tests/fakedist-vec-off/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/fakedist/generated_test.go b/pkg/ccl/logictestccl/tests/fakedist/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/local-mixed-23.1/generated_test.go b/pkg/ccl/logictestccl/tests/local-mixed-23.1/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/local-mixed-23.2/generated_test.go b/pkg/ccl/logictestccl/tests/local-mixed-23.2/generated_test.go
diff --git a/pkg/ccl/logictestccl/tests/local-read-committed/BUILD.bazel b/pkg/ccl/logictestccl/tests/local-read-committed/BUILD.bazel
@@ -0,0 +1,34 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "local-read-committed_test",
+    size = "enormous",
+    srcs = ["generated_test.go"],
+    data = [
+        "//c-deps:libgeos",  # keep
+        "//pkg/ccl/logictestccl:testdata",  # keep
+    ],
+    exec_properties = select({
+        "//build/toolchains:is_heavy": {"test.Pool": "heavy"},
+        "//conditions:default": {"test.Pool": "large"},
+    }),
+    shard_count = 18,
+    tags = [
+        "ccl_test",
+        "cpu:1",
+    ],
+    deps = [
+        "//pkg/base",
+        "//pkg/build/bazel",
+        "//pkg/ccl",
+        "//pkg/security/securityassets",
+        "//pkg/security/securitytest",
+        "//pkg/server",
+        "//pkg/sql/logictest",
+        "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
+        "//pkg/testutils/testcluster",
+        "//pkg/util/leaktest",
+        "//pkg/util/randutil",
+    ],
+)