Skip to content

Commit b600ee3

Browse files
committed
execbuilder: only run geospatial in local config
We generally run execbuilder tests in local or 5node configs since the tests are about planning and tracing of expected KV requests, so there is no benefit to running the tests with more diverse configs. Due to some historical reasons, `geospatial` test file has been running in almost all configs, but I don't see a reason why that should be the case. This commit updates the test to run only in `local` config. Release note: None
1 parent c8c2809 commit b600ee3

File tree

21 files changed

+1
-1055
lines changed

21 files changed

+1
-1055
lines changed

pkg/BUILD.bazel

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -538,14 +538,6 @@ ALL_TESTS = [
538538
"//pkg/sql/opt/cycle:cycle_test",
539539
"//pkg/sql/opt/distribution:distribution_test",
540540
"//pkg/sql/opt/exec/execbuilder/tests/5node:5node_test",
541-
"//pkg/sql/opt/exec/execbuilder/tests/fakedist-disk:fakedist-disk_test",
542-
"//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:fakedist-vec-off_test",
543-
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
544-
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
545-
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
546-
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.3:local-mixed-25_3_test",
547-
"//pkg/sql/opt/exec/execbuilder/tests/local-prepared:local-prepared_test",
548-
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
549541
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
550542
"//pkg/sql/opt/exec/execbuilder:execbuilder_test",
551543
"//pkg/sql/opt/exec/explain:explain_test",
@@ -2120,14 +2112,6 @@ GO_TARGETS = [
21202112
"//pkg/sql/opt/distribution:distribution",
21212113
"//pkg/sql/opt/distribution:distribution_test",
21222114
"//pkg/sql/opt/exec/execbuilder/tests/5node:5node_test",
2123-
"//pkg/sql/opt/exec/execbuilder/tests/fakedist-disk:fakedist-disk_test",
2124-
"//pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off:fakedist-vec-off_test",
2125-
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
2126-
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2127-
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.2:local-mixed-25_2_test",
2128-
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-25.3:local-mixed-25_3_test",
2129-
"//pkg/sql/opt/exec/execbuilder/tests/local-prepared:local-prepared_test",
2130-
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
21312115
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
21322116
"//pkg/sql/opt/exec/execbuilder:execbuilder",
21332117
"//pkg/sql/opt/exec/execbuilder:execbuilder_test",

pkg/ccl/logictestccl/tests/local-read-committed/generated_test.go

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/ccl/logictestccl/tests/local-repeatable-read/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ go_test(
88
"//c-deps:libgeos", # keep
99
"//pkg/ccl/logictestccl:testdata", # keep
1010
"//pkg/sql/logictest:testdata", # keep
11-
"//pkg/sql/opt/exec/execbuilder:testdata", # keep
1211
],
1312
exec_properties = {"test.Pool": "large"},
1413
shard_count = 48,
@@ -20,7 +19,6 @@ go_test(
2019
"//pkg/security/securityassets",
2120
"//pkg/security/securitytest",
2221
"//pkg/server",
23-
"//pkg/sql",
2422
"//pkg/sql/logictest",
2523
"//pkg/testutils/serverutils",
2624
"//pkg/testutils/skip",

pkg/ccl/logictestccl/tests/local-repeatable-read/generated_test.go

Lines changed: 0 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/sql/opt/exec/execbuilder/testdata/geospatial

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# This logic test fails in the 3node-tenant configuration because the keys are
2-
# prefixed with the tenant ID if run by a tenant:
3-
# https://github.com/cockroachdb/cockroach/issues/49582
4-
# LogicTest: !3node-tenant-default-configs
1+
# LogicTest: local
52

63
statement ok
74
CREATE TABLE b(

pkg/sql/opt/exec/execbuilder/tests/fakedist-disk/BUILD.bazel

Lines changed: 0 additions & 31 deletions
This file was deleted.

pkg/sql/opt/exec/execbuilder/tests/fakedist-disk/generated_test.go

Lines changed: 0 additions & 93 deletions
This file was deleted.

pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off/BUILD.bazel

Lines changed: 0 additions & 31 deletions
This file was deleted.

pkg/sql/opt/exec/execbuilder/tests/fakedist-vec-off/generated_test.go

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)