Skip to content

Commit 7eae206

Browse files
authored
Merge pull request #154695 from cockroachdb/blathers/backport-release-25.2-154639
release-25.2: sql: skip a big test that ooms on the race detector
2 parents 4834fc8 + 739e816 commit 7eae206

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

pkg/sql/sem/tree/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ go_test(
257257
"//pkg/sql/types",
258258
"//pkg/testutils",
259259
"//pkg/testutils/datapathutils",
260+
"//pkg/testutils/skip",
260261
"//pkg/testutils/sqlutils",
261262
"//pkg/util/duration",
262263
"//pkg/util/json",

pkg/sql/sem/tree/pretty_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
2323
"github.com/cockroachdb/cockroach/pkg/sql/types"
2424
"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
25+
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2526
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
2627
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
2728
"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -192,6 +193,7 @@ func TestPrettyVerify(t *testing.T) {
192193
func TestPrettyBigStatement(t *testing.T) {
193194
defer leaktest.AfterTest(t)()
194195
defer log.Scope(t).Close(t)
196+
skip.UnderRace(t, "excessive memory usage")
195197

196198
// Create a SELECT statement with a 1 million item IN expression. Without
197199
// mitigation, this can cause stack overflows - see #91197.

0 commit comments

Comments
 (0)