From 4082a28676aa465b7e0668b481bfe4a8399691e1 Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Tue, 1 Nov 2022 18:25:24 -0400 Subject: [PATCH] logictest: only run create_as_non_metamorphic under local This test is very expensive because it was writing 100Mib of data. It now writes more like 5. Nevertheless, let's not run it in so many places. I did verify that it still tests what it was intended to test. Fixes #91080 Release note: None --- pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go | 7 ------- .../testdata/logic_test/create_as_non_metamorphic | 6 +++--- pkg/sql/logictest/tests/fakedist-disk/generated_test.go | 7 ------- pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go | 7 ------- pkg/sql/logictest/tests/fakedist/generated_test.go | 7 ------- .../tests/local-legacy-schema-changer/generated_test.go | 7 ------- pkg/sql/logictest/tests/local-vec-off/generated_test.go | 7 ------- 7 files changed, 3 insertions(+), 45 deletions(-) diff --git a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go index a3cc7825b798..8a4beb7c39e8 100644 --- a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go +++ b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go @@ -463,13 +463,6 @@ func TestTenantLogic_create_as( runLogicTest(t, "create_as") } -func TestTenantLogic_create_as_non_metamorphic( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "create_as_non_metamorphic") -} - func TestTenantLogic_create_index( t *testing.T, ) { diff --git a/pkg/sql/logictest/testdata/logic_test/create_as_non_metamorphic b/pkg/sql/logictest/testdata/logic_test/create_as_non_metamorphic index a2d1a06ef397..98f706a1e8ee 100644 --- a/pkg/sql/logictest/testdata/logic_test/create_as_non_metamorphic +++ b/pkg/sql/logictest/testdata/logic_test/create_as_non_metamorphic @@ -1,15 +1,15 @@ -# LogicTest: !metamorphic-batch-sizes +# LogicTest: !metamorphic-batch-sizes local # Disabled to allow us to validate create as with large batch sizes. # Regression test for #81554, where tried to do gigantic batches for CTAS in # explicit transactions. Use a fixed command size, so that an error is decoupled # fom the default size. statement ok -SET CLUSTER SETTING kv.raft.command.max_size='5m' +SET CLUSTER SETTING kv.raft.command.max_size='4.01MiB' statement ok BEGIN; -CREATE TABLE source_tbl_huge AS SELECT 1::CHAR(256) FROM generate_series(1, 500000); +CREATE TABLE source_tbl_huge AS SELECT 1::CHAR(256) FROM generate_series(1, 50000); COMMIT; statement ok diff --git a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go index 7d189f363980..f54590b16c63 100644 --- a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go +++ b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go @@ -436,13 +436,6 @@ func TestLogic_create_as( runLogicTest(t, "create_as") } -func TestLogic_create_as_non_metamorphic( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "create_as_non_metamorphic") -} - func TestLogic_create_index( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go index 48afc0084fd8..4e41d13f6a09 100644 --- a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go +++ b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go @@ -436,13 +436,6 @@ func TestLogic_create_as( runLogicTest(t, "create_as") } -func TestLogic_create_as_non_metamorphic( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "create_as_non_metamorphic") -} - func TestLogic_create_index( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/fakedist/generated_test.go b/pkg/sql/logictest/tests/fakedist/generated_test.go index 945b1a05a5d4..d3d21669f940 100644 --- a/pkg/sql/logictest/tests/fakedist/generated_test.go +++ b/pkg/sql/logictest/tests/fakedist/generated_test.go @@ -436,13 +436,6 @@ func TestLogic_create_as( runLogicTest(t, "create_as") } -func TestLogic_create_as_non_metamorphic( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "create_as_non_metamorphic") -} - func TestLogic_create_index( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go index 69ca0b7d1d79..41227eca724f 100644 --- a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go +++ b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go @@ -436,13 +436,6 @@ func TestLogic_create_as( runLogicTest(t, "create_as") } -func TestLogic_create_as_non_metamorphic( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "create_as_non_metamorphic") -} - func TestLogic_create_index( t *testing.T, ) { diff --git a/pkg/sql/logictest/tests/local-vec-off/generated_test.go b/pkg/sql/logictest/tests/local-vec-off/generated_test.go index c593154895c1..ba4c9b7505a7 100644 --- a/pkg/sql/logictest/tests/local-vec-off/generated_test.go +++ b/pkg/sql/logictest/tests/local-vec-off/generated_test.go @@ -436,13 +436,6 @@ func TestLogic_create_as( runLogicTest(t, "create_as") } -func TestLogic_create_as_non_metamorphic( - t *testing.T, -) { - defer leaktest.AfterTest(t)() - runLogicTest(t, "create_as_non_metamorphic") -} - func TestLogic_create_index( t *testing.T, ) {