From d427a9c659e1a9de51a43b8282933db9d986d77c Mon Sep 17 00:00:00 2001 From: Jeremy Yang Date: Tue, 21 Jan 2025 08:45:07 -0500 Subject: [PATCH 1/3] awsdms: Update replication instance Previously, we were using the dms.c4.large instance class. However that was recently silently deprecated and caused the test failure. This commit upgrades the instances to the new c5 classes. Fixes: #139394 Release note: None --- pkg/cmd/roachtest/tests/awsdms.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/roachtest/tests/awsdms.go b/pkg/cmd/roachtest/tests/awsdms.go index b080a544e666..004bbad95184 100644 --- a/pkg/cmd/roachtest/tests/awsdms.go +++ b/pkg/cmd/roachtest/tests/awsdms.go @@ -583,7 +583,7 @@ func setupDMSReplicationInstance( createReplOut, err := dmsCli.CreateReplicationInstance( ctx, &dms.CreateReplicationInstanceInput{ - ReplicationInstanceClass: proto.String("dms.c4.large"), + ReplicationInstanceClass: proto.String("dms.c5.large"), ReplicationInstanceIdentifier: proto.String(awsdmsRoachtestDMSReplicationInstanceName(t.BuildVersion())), }, ) From 8a322a254052715c513bc82b94f5f001dd594f69 Mon Sep 17 00:00:00 2001 From: Matt Spilchen Date: Thu, 23 Jan 2025 17:29:53 -0400 Subject: [PATCH 2/3] pgx: Continue migration of tests to v5 This commit builds upon the pgx migration initiated in #139611, focusing on tests that could not be converted with a sed script. While the changes remain largely mechanical, several adjustments were required to ensure test compatibility with pgx v5: - Additional packages were updated alongside the migration to `github.com/jackc/pgx/v5`. - Error checks that relied on specific text were adjusted to account for additional context introduced in v5 error wrapping. Returning `pgconn.PgError` directly resolved these issues. - Use the updated method to force use of the simple query protocol. - The native support in v5 for scanning numerics directly into strings eliminated the need for previous conversion methods. Epic: none Release note: none Informs #137595 --- go.sum | 1 - pkg/backup/BUILD.bazel | 2 +- pkg/backup/backup_test.go | 8 +++++-- pkg/ccl/sqlproxyccl/BUILD.bazel | 3 ++- pkg/ccl/sqlproxyccl/proxy_handler_test.go | 4 ++-- pkg/ccl/testccl/authccl/BUILD.bazel | 4 ++-- pkg/ccl/testccl/authccl/auth_test.go | 12 ++++++++-- pkg/sql/BUILD.bazel | 3 +-- pkg/sql/conn_executor_test.go | 4 ++-- pkg/sql/pgrepl/BUILD.bazel | 1 - pkg/sql/pgrepl/main_test.go | 10 ++++----- pkg/sql/pgwire/BUILD.bazel | 1 + pkg/sql/pgwire/auth_test.go | 12 ++++++++-- pkg/sql/session_migration_test.go | 6 ++--- pkg/sql/tests/BUILD.bazel | 5 ++--- pkg/sql/tests/show_commit_timestamp_test.go | 25 ++++++++------------- pkg/testutils/sqlutils/BUILD.bazel | 2 +- pkg/testutils/sqlutils/rows.go | 2 +- 18 files changed, 58 insertions(+), 47 deletions(-) diff --git a/go.sum b/go.sum index bf373fe15119..35892eccccf4 100644 --- a/go.sum +++ b/go.sum @@ -1495,7 +1495,6 @@ github.com/jackc/pgx/v5 v5.4.2/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle/v2 v2.2.0 h1:RdcDk92EJBuBS55nQMMYFXTxwstHug4jkhT5pq8VxPk= github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= diff --git a/pkg/backup/BUILD.bazel b/pkg/backup/BUILD.bazel index a7188f0427e2..deb0aacb6286 100644 --- a/pkg/backup/BUILD.bazel +++ b/pkg/backup/BUILD.bazel @@ -333,7 +333,7 @@ go_test( "@com_github_cockroachdb_pebble//vfs", "@com_github_cockroachdb_redact//:redact", "@com_github_gogo_protobuf//types", - "@com_github_jackc_pgx_v4//:pgx", + "@com_github_jackc_pgx_v5//:pgx", "@com_github_kr_pretty//:pretty", "@com_github_lib_pq//:pq", "@com_github_robfig_cron_v3//:cron", diff --git a/pkg/backup/backup_test.go b/pkg/backup/backup_test.go index 8aa21041d660..80c854c806a5 100644 --- a/pkg/backup/backup_test.go +++ b/pkg/backup/backup_test.go @@ -108,7 +108,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" "github.com/cockroachdb/redact" - pgx "github.com/jackc/pgx/v4" + pgx "github.com/jackc/pgx/v5" "github.com/kr/pretty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -7393,6 +7393,8 @@ func TestClientDisconnect(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.UnderRace(t, "may cause connection delays, leading to a context deadline exceeded error") + const restoreDB = "restoredb" testCases := []struct { @@ -7485,7 +7487,9 @@ func TestClientDisconnect(t *testing.T) { assert.NoError(t, err) defer func() { assert.NoError(t, db.Close(ctx)) }() _, err = db.Exec(ctxToCancel, command) - assert.Equal(t, context.Canceled, errors.Unwrap(err)) + // Check the root cause of the error, as pgx v5 may wrap additional + // errors around a context-canceled error. + assert.Equal(t, context.Canceled, errors.Cause(err)) }(testCase.jobCommand) // Wait for the job to start. diff --git a/pkg/ccl/sqlproxyccl/BUILD.bazel b/pkg/ccl/sqlproxyccl/BUILD.bazel index e1f6e9c1d867..7ff4a46df885 100644 --- a/pkg/ccl/sqlproxyccl/BUILD.bazel +++ b/pkg/ccl/sqlproxyccl/BUILD.bazel @@ -120,7 +120,8 @@ go_test( "@com_github_cockroachdb_logtags//:logtags", "@com_github_jackc_pgconn//:pgconn", "@com_github_jackc_pgproto3_v2//:pgproto3", - "@com_github_jackc_pgx_v4//:pgx", + "@com_github_jackc_pgx_v5//:pgx", + "@com_github_jackc_pgx_v5//pgconn", "@com_github_pires_go_proxyproto//:go-proxyproto", "@com_github_pires_go_proxyproto//tlvparse", "@com_github_stretchr_testify//assert", diff --git a/pkg/ccl/sqlproxyccl/proxy_handler_test.go b/pkg/ccl/sqlproxyccl/proxy_handler_test.go index 736fd0602286..cd9c4bc4dd27 100644 --- a/pkg/ccl/sqlproxyccl/proxy_handler_test.go +++ b/pkg/ccl/sqlproxyccl/proxy_handler_test.go @@ -47,9 +47,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/errors" - "github.com/jackc/pgconn" pgproto3 "github.com/jackc/pgproto3/v2" - pgx "github.com/jackc/pgx/v4" + pgx "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" proxyproto "github.com/pires/go-proxyproto" "github.com/pires/go-proxyproto/tlvparse" "github.com/stretchr/testify/assert" diff --git a/pkg/ccl/testccl/authccl/BUILD.bazel b/pkg/ccl/testccl/authccl/BUILD.bazel index c762ed4e4c36..6c5ad373da76 100644 --- a/pkg/ccl/testccl/authccl/BUILD.bazel +++ b/pkg/ccl/testccl/authccl/BUILD.bazel @@ -35,8 +35,8 @@ go_test( "@com_github_cockroachdb_datadriven//:datadriven", "@com_github_cockroachdb_errors//:errors", "@com_github_cockroachdb_errors//stdstrings", - "@com_github_jackc_pgconn//:pgconn", - "@com_github_jackc_pgx_v4//:pgx", + "@com_github_jackc_pgx_v5//:pgx", + "@com_github_jackc_pgx_v5//pgconn", "@com_github_stretchr_testify//require", ], ) diff --git a/pkg/ccl/testccl/authccl/auth_test.go b/pkg/ccl/testccl/authccl/auth_test.go index cb37eed13ab2..b38e216e0076 100644 --- a/pkg/ccl/testccl/authccl/auth_test.go +++ b/pkg/ccl/testccl/authccl/auth_test.go @@ -45,8 +45,8 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/stdstrings" - "github.com/jackc/pgconn" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" "github.com/stretchr/testify/require" ) @@ -406,6 +406,14 @@ func authCCLRunTest(t *testing.T, insecure bool) { defer func() { _ = dbSQL.Close(ctx) }() } if err != nil { + // If the error is a PgError, return that directly instead of the + // wrapped error. The wrapped error includes additional contextual + // information that complicates checking for the expected error + // string in tests. + pgErr := new(pgconn.PgError) + if errors.As(err, &pgErr) { + return "", pgErr + } return "", err } row := dbSQL.QueryRow(ctx, "SELECT current_catalog") diff --git a/pkg/sql/BUILD.bazel b/pkg/sql/BUILD.bazel index 5cade867b9bd..50cfc1206380 100644 --- a/pkg/sql/BUILD.bazel +++ b/pkg/sql/BUILD.bazel @@ -951,10 +951,9 @@ go_test( "@com_github_cockroachdb_redact//:redact", "@com_github_gogo_protobuf//proto", "@com_github_gogo_protobuf//types", - "@com_github_jackc_pgconn//:pgconn", "@com_github_jackc_pgtype//:pgtype", - "@com_github_jackc_pgx_v4//:pgx", "@com_github_jackc_pgx_v5//:pgx", + "@com_github_jackc_pgx_v5//pgconn", "@com_github_klauspost_compress//zip", "@com_github_lib_pq//:pq", "@com_github_lib_pq//oid", diff --git a/pkg/sql/conn_executor_test.go b/pkg/sql/conn_executor_test.go index d821221badb6..89010fad8b42 100644 --- a/pkg/sql/conn_executor_test.go +++ b/pkg/sql/conn_executor_test.go @@ -55,8 +55,8 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/cockroachdb/redact" - "github.com/jackc/pgconn" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" "github.com/lib/pq" "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/require" diff --git a/pkg/sql/pgrepl/BUILD.bazel b/pkg/sql/pgrepl/BUILD.bazel index 16f17d3cb455..e9f4f873aec7 100644 --- a/pkg/sql/pgrepl/BUILD.bazel +++ b/pkg/sql/pgrepl/BUILD.bazel @@ -22,7 +22,6 @@ go_test( "//pkg/util/log", "@com_github_cockroachdb_datadriven//:datadriven", "@com_github_cockroachdb_errors//:errors", - "@com_github_jackc_pgx_v4//:pgx", "@com_github_jackc_pgx_v5//:pgx", "@com_github_jackc_pgx_v5//pgconn", "@com_github_jackc_pgx_v5//pgproto3", diff --git a/pkg/sql/pgrepl/main_test.go b/pkg/sql/pgrepl/main_test.go index 1e2415607d81..d7244811a3bb 100644 --- a/pkg/sql/pgrepl/main_test.go +++ b/pkg/sql/pgrepl/main_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/datadriven" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/stretchr/testify/require" ) @@ -70,7 +70,7 @@ func TestDataDriven(t *testing.T) { switch d.Cmd { case "simple_query": - rows, err := conn.Query(ctx, d.Input, pgx.QuerySimpleProtocol(true)) + rows, err := conn.Query(ctx, d.Input, pgx.QueryExecModeSimpleProtocol) if expectError { require.Error(t, err) return err.Error() @@ -81,7 +81,7 @@ func TestDataDriven(t *testing.T) { return out case "identify_system": // IDENTIFY_SYSTEM needs some redaction to be deterministic. - rows, err := conn.Query(ctx, "IDENTIFY_SYSTEM", pgx.QuerySimpleProtocol(true)) + rows, err := conn.Query(ctx, "IDENTIFY_SYSTEM", pgx.QueryExecModeSimpleProtocol) require.NoError(t, err) var sb strings.Builder for rows.Next() { @@ -91,13 +91,13 @@ func TestDataDriven(t *testing.T) { if i > 0 { sb.WriteRune('\n') } - switch string(rows.FieldDescriptions()[i].Name) { + switch rows.FieldDescriptions()[i].Name { case "systemid": val = "some_cluster_id" case "xlogpos": val = "some_lsn" } - sb.Write(rows.FieldDescriptions()[i].Name) + sb.WriteString(rows.FieldDescriptions()[i].Name) sb.WriteString(": ") sb.WriteString(fmt.Sprintf("%v", val)) } diff --git a/pkg/sql/pgwire/BUILD.bazel b/pkg/sql/pgwire/BUILD.bazel index 641441106003..a0925835fa23 100644 --- a/pkg/sql/pgwire/BUILD.bazel +++ b/pkg/sql/pgwire/BUILD.bazel @@ -186,6 +186,7 @@ go_test( "@com_github_jackc_pgproto3_v2//:pgproto3", "@com_github_jackc_pgx_v4//:pgx", "@com_github_jackc_pgx_v5//:pgx", + "@com_github_jackc_pgx_v5//pgconn", "@com_github_lib_pq//:pq", "@com_github_lib_pq//oid", "@com_github_stretchr_testify//require", diff --git a/pkg/sql/pgwire/auth_test.go b/pkg/sql/pgwire/auth_test.go index d738cc8cf924..0a6f1214f75e 100644 --- a/pkg/sql/pgwire/auth_test.go +++ b/pkg/sql/pgwire/auth_test.go @@ -42,8 +42,8 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/stdstrings" "github.com/cockroachdb/redact" - "github.com/jackc/pgconn" - pgx "github.com/jackc/pgx/v4" + pgx "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" "github.com/stretchr/testify/require" ) @@ -586,6 +586,14 @@ func hbaRunTest(t *testing.T, insecure bool) { defer func() { _ = dbSQL.Close(ctx) }() } if err != nil { + // If the error is a PgError, return that directly instead of the + // wrapped error. The wrapped error includes additional contextual + // information that complicates checking for the expected error + // string in tests. + pgErr := new(pgconn.PgError) + if errors.As(err, &pgErr) { + return "", pgErr + } return "", err } row := dbSQL.QueryRow(ctx, "SELECT current_catalog") diff --git a/pkg/sql/session_migration_test.go b/pkg/sql/session_migration_test.go index a20433cf7349..d11a8945b89c 100644 --- a/pkg/sql/session_migration_test.go +++ b/pkg/sql/session_migration_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/datadriven" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/stretchr/testify/require" ) @@ -54,7 +54,7 @@ func TestSessionMigration(t *testing.T) { config, err := pgx.ParseConfig(pgURL.String()) require.NoError(t, err) - config.PreferSimpleProtocol = true + config.DefaultQueryExecMode = pgx.QueryExecModeSimpleProtocol conn, err := pgx.ConnectConfig(ctx, config) require.NoError(t, err) @@ -83,7 +83,7 @@ func TestSessionMigration(t *testing.T) { config, err := pgx.ParseConfig(pgURL.String()) require.NoError(t, err) - config.PreferSimpleProtocol = true + config.DefaultQueryExecMode = pgx.QueryExecModeSimpleProtocol conn, err := pgx.ConnectConfig(ctx, config) require.NoError(t, err) diff --git a/pkg/sql/tests/BUILD.bazel b/pkg/sql/tests/BUILD.bazel index 7596fda0b9af..ab8115642c80 100644 --- a/pkg/sql/tests/BUILD.bazel +++ b/pkg/sql/tests/BUILD.bazel @@ -140,14 +140,13 @@ go_test( "//pkg/util/tracing/tracingpb", "//pkg/util/uuid", "@com_github_cockroachdb_cockroach_go_v2//crdb", - "@com_github_cockroachdb_cockroach_go_v2//crdb/crdbpgx", + "@com_github_cockroachdb_cockroach_go_v2//crdb/crdbpgxv5", "@com_github_cockroachdb_datadriven//:datadriven", "@com_github_cockroachdb_errors//:errors", "@com_github_google_btree//:btree", "@com_github_google_pprof//profile", - "@com_github_jackc_pgconn//:pgconn", - "@com_github_jackc_pgx_v4//:pgx", "@com_github_jackc_pgx_v5//:pgx", + "@com_github_jackc_pgx_v5//pgconn", "@com_github_kr_pretty//:pretty", "@com_github_lib_pq//:pq", "@com_github_spf13_pflag//:pflag", diff --git a/pkg/sql/tests/show_commit_timestamp_test.go b/pkg/sql/tests/show_commit_timestamp_test.go index dafcd4900c80..89b247b09792 100644 --- a/pkg/sql/tests/show_commit_timestamp_test.go +++ b/pkg/sql/tests/show_commit_timestamp_test.go @@ -9,11 +9,10 @@ import ( "context" gosql "database/sql" "fmt" - "math/big" "testing" "github.com/cockroachdb/cockroach-go/v2/crdb" - "github.com/cockroachdb/cockroach-go/v2/crdb/crdbpgx" + crdbpgx "github.com/cockroachdb/cockroach-go/v2/crdb/crdbpgxv5" "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/testutils" @@ -22,8 +21,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/errors" - "github.com/jackc/pgconn" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" "github.com/stretchr/testify/require" ) @@ -76,7 +75,7 @@ CREATE TABLE foo (i INT PRIMARY KEY)`) defer cleanup() conf, err := pgx.ParseConfig(pgURL.String()) require.NoError(t, err) - conf.PreferSimpleProtocol = simple + conf.DefaultQueryExecMode = pgx.QueryExecModeSimpleProtocol conn, err := pgx.ConnectConfig(ctx, conf) require.NoError(t, err) defer func() { require.NoError(t, conn.Close(ctx)) }() @@ -111,11 +110,9 @@ CREATE TABLE foo (i INT PRIMARY KEY)`) _, err = res.Exec() require.NoError(t, err) } else { - // Support for scanning numerics into strings was not added until - // a later version of pgx than was in use at the time of writing. - var r big.Rat + var r string require.NoError(t, res.QueryRow().Scan(&r)) - commitTimestamps = append(commitTimestamps, r.FloatString(10)) + commitTimestamps = append(commitTimestamps, r) } } require.NoError(t, res.Close()) @@ -128,7 +125,7 @@ CREATE TABLE foo (i INT PRIMARY KEY)`) defer cleanup() conf, err := pgx.ParseConfig(pgURL.String()) require.NoError(t, err) - conf.PreferSimpleProtocol = simple + conf.DefaultQueryExecMode = pgx.QueryExecModeSimpleProtocol conn, err := pgx.ConnectConfig(ctx, conf) require.NoError(t, err) defer func() { require.NoError(t, conn.Close(ctx)) }() @@ -150,9 +147,7 @@ CREATE TABLE foo (i INT PRIMARY KEY)`) } var ts string { - var tsRat big.Rat - require.NoError(t, conn.QueryRow(ctx, showCommitTimestamp).Scan(&tsRat)) - ts = tsRat.FloatString(10) + require.NoError(t, conn.QueryRow(ctx, showCommitTimestamp).Scan(&ts)) } checkResults(t, []string{ts}, 0) var txTs string @@ -163,11 +158,9 @@ CREATE TABLE foo (i INT PRIMARY KEY)`) if _, err = tx.Exec(ctx, "insert into foo values (3)"); err != nil { return err } - var tsRat big.Rat - if err = tx.QueryRow(ctx, showCommitTimestamp).Scan(&tsRat); err != nil { + if err = tx.QueryRow(ctx, showCommitTimestamp).Scan(&txTs); err != nil { return err } - txTs = tsRat.FloatString(10) return nil })) diff --git a/pkg/testutils/sqlutils/BUILD.bazel b/pkg/testutils/sqlutils/BUILD.bazel index 60226453b704..9a3f9854d236 100644 --- a/pkg/testutils/sqlutils/BUILD.bazel +++ b/pkg/testutils/sqlutils/BUILD.bazel @@ -36,7 +36,7 @@ go_library( "//pkg/util/timeutil", "@com_github_cockroachdb_cockroach_go_v2//crdb", "@com_github_cockroachdb_errors//:errors", - "@com_github_jackc_pgx_v4//:pgx", + "@com_github_jackc_pgx_v5//:pgx", "@com_github_lib_pq//:pq", "@com_github_stretchr_testify//require", ], diff --git a/pkg/testutils/sqlutils/rows.go b/pkg/testutils/sqlutils/rows.go index 2674632ab003..5bc5db3fee53 100644 --- a/pkg/testutils/sqlutils/rows.go +++ b/pkg/testutils/sqlutils/rows.go @@ -11,7 +11,7 @@ import ( "strings" "unicode/utf8" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" ) // RowsToDataDrivenOutput converts a gosql.Rows object into an appropriate From 8fe6d926ee06ea1da6c17ff76153a850ef8edae2 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Fri, 24 Jan 2025 08:41:49 -0800 Subject: [PATCH 3/3] logictest: skip `alter_table` under race We just saw a test run where `alter_table` took more than an hour under race. None of the metamorphic variables seem likely to be the cause of the slowdown, so probably just the sheer number of schema changes in this file are to blame. Release note: None --- pkg/sql/logictest/testdata/logic_test/alter_table | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/sql/logictest/testdata/logic_test/alter_table b/pkg/sql/logictest/testdata/logic_test/alter_table index 2b3d1f5a529a..98010873ae90 100644 --- a/pkg/sql/logictest/testdata/logic_test/alter_table +++ b/pkg/sql/logictest/testdata/logic_test/alter_table @@ -1,3 +1,6 @@ +# We've seen this file take more than an hour under race. +skip under race + statement ok CREATE TABLE other (b INT PRIMARY KEY)