From 0d79f778563e72c8a10e923e78af5c0489278947 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Wed, 5 Nov 2025 18:26:17 -0800 Subject: [PATCH 1/3] upgrade: remove unused SQLStats testing knobs Release note: None --- pkg/server/server_sql.go | 2 -- pkg/upgrade/BUILD.bazel | 1 - pkg/upgrade/system_upgrade.go | 2 -- 3 files changed, 5 deletions(-) diff --git a/pkg/server/server_sql.go b/pkg/server/server_sql.go index 11cb4cc2cdbd..03eae1e0a64a 100644 --- a/pkg/server/server_sql.go +++ b/pkg/server/server_sql.go @@ -1270,7 +1270,6 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) { var c upgrade.Cluster var systemDeps upgrade.SystemDeps keyVisKnobs, _ := cfg.TestingKnobs.KeyVisualizer.(*keyvisualizer.TestingKnobs) - sqlStatsKnobs, _ := cfg.TestingKnobs.SQLStatsKnobs.(*sqlstats.TestingKnobs) upgradeKnobs, _ := cfg.TestingKnobs.UpgradeManager.(*upgradebase.TestingKnobs) if codec.ForSystemTenant() { c = upgradecluster.New(upgradecluster.ClusterConfig{ @@ -1296,7 +1295,6 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) { JobRegistry: jobRegistry, Stopper: cfg.stopper, KeyVisKnobs: keyVisKnobs, - SQLStatsKnobs: sqlStatsKnobs, TenantInfoAccessor: cfg.tenantConnect, TestingKnobs: upgradeKnobs, } diff --git a/pkg/upgrade/BUILD.bazel b/pkg/upgrade/BUILD.bazel index 658a52b50f0e..00b6987d239e 100644 --- a/pkg/upgrade/BUILD.bazel +++ b/pkg/upgrade/BUILD.bazel @@ -28,7 +28,6 @@ go_library( "//pkg/sql/catalog/resolver", "//pkg/sql/isql", "//pkg/sql/sessiondata", - "//pkg/sql/sqlstats", "//pkg/upgrade/upgradebase", "//pkg/util/retry", "//pkg/util/stop", diff --git a/pkg/upgrade/system_upgrade.go b/pkg/upgrade/system_upgrade.go index d26ff2724b33..eeaf3345eca7 100644 --- a/pkg/upgrade/system_upgrade.go +++ b/pkg/upgrade/system_upgrade.go @@ -18,7 +18,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/server/serverpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descs" - "github.com/cockroachdb/cockroach/pkg/sql/sqlstats" "github.com/cockroachdb/cockroach/pkg/upgrade/upgradebase" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/stop" @@ -121,7 +120,6 @@ type SystemDeps struct { JobRegistry *jobs.Registry Stopper *stop.Stopper KeyVisKnobs *keyvisualizer.TestingKnobs - SQLStatsKnobs *sqlstats.TestingKnobs TenantInfoAccessor mtinfo.ReadFromTenantInfoAccessor TestingKnobs *upgradebase.TestingKnobs } From 1682cf0d5be4a5084029909ed31d43877fe26080 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Wed, 5 Nov 2025 19:09:32 -0800 Subject: [PATCH 2/3] sql: do not set sqlstats knobs This was added in 2fad67917535582aaa0b4a204f95c7860f93f5ac because we called CreateTestServerParams in other tests. That is no longer the case as of 5adea0194b37e11fd2a45571186a17cf74e84df6, so I don't think we need that. Release note: None --- pkg/sql/server_params_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/sql/server_params_test.go b/pkg/sql/server_params_test.go index 73b4f3d6d4c8..6e74ffc4d14b 100644 --- a/pkg/sql/server_params_test.go +++ b/pkg/sql/server_params_test.go @@ -9,7 +9,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase" - "github.com/cockroachdb/cockroach/pkg/sql/sqlstats" "github.com/cockroachdb/cockroach/pkg/sql/tests" ) @@ -21,7 +20,6 @@ import ( func createTestServerParamsAllowTenants() (base.TestServerArgs, *tests.CommandFilters) { var cmdFilters tests.CommandFilters params := base.TestServerArgs{} - params.Knobs.SQLStatsKnobs = sqlstats.CreateTestingKnobs() params.Knobs.Store = &kvserver.StoreTestingKnobs{ EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ TestingEvalFilter: cmdFilters.RunFilters, From dfa7124b25b24282a525298daa0b1f9ffdb9308a Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Wed, 5 Nov 2025 18:28:22 -0800 Subject: [PATCH 3/3] sql: remove createTestServerParamsAllowTenants This commit removes `createTestServerParamsAllowTenants`. Previously, this method returned two arguments, but the second one was only used only in a handful of spots - we now inline the necessary code to create CommandFilters in each spot. In all other spots the helper method no longer (given the change in the previous commit) provided any value, so we replaced all its usages with directly constructing the TestServerArgs. Additionally some stale comments are removed. Release note: None --- pkg/sql/BUILD.bazel | 1 - pkg/sql/as_of_test.go | 12 +- pkg/sql/comment_on_column_test.go | 4 +- pkg/sql/conn_executor_test.go | 7 +- pkg/sql/crdb_internal_test.go | 12 +- pkg/sql/create_test.go | 4 +- pkg/sql/delete_preserving_index_test.go | 13 +- pkg/sql/descriptor_mutation_test.go | 23 +-- pkg/sql/drop_test.go | 37 ++-- pkg/sql/err_count_test.go | 7 +- pkg/sql/explain_test.go | 3 +- pkg/sql/grant_revoke_test.go | 8 +- pkg/sql/grant_role_test.go | 5 +- pkg/sql/index_mutation_test.go | 3 +- pkg/sql/indexbackfiller_test.go | 2 +- pkg/sql/internal_test.go | 23 +-- .../jobs_profiler_execution_details_test.go | 6 +- pkg/sql/materialized_view_test.go | 11 +- pkg/sql/metric_test.go | 22 ++- pkg/sql/mutation_test.go | 5 +- pkg/sql/mvcc_backfiller_test.go | 16 +- pkg/sql/privileged_accessor_test.go | 4 +- pkg/sql/run_control_test.go | 3 +- pkg/sql/schema_changer_test.go | 184 +++++++++--------- pkg/sql/server_params_test.go | 29 --- .../show_create_all_tables_builtin_test.go | 4 +- pkg/sql/show_test.go | 12 +- pkg/sql/sort_test.go | 4 +- pkg/sql/split_test.go | 4 +- pkg/sql/table_ref_test.go | 4 +- pkg/sql/txn_restart_test.go | 54 +++-- pkg/sql/type_change_test.go | 17 +- pkg/sql/unsplit_range_test.go | 2 +- pkg/sql/unsplit_test.go | 2 +- pkg/sql/zone_config_test.go | 7 +- pkg/sql/zone_test.go | 10 +- 36 files changed, 273 insertions(+), 291 deletions(-) delete mode 100644 pkg/sql/server_params_test.go diff --git a/pkg/sql/BUILD.bazel b/pkg/sql/BUILD.bazel index 345ac4338c76..e24a8dd7f142 100644 --- a/pkg/sql/BUILD.bazel +++ b/pkg/sql/BUILD.bazel @@ -730,7 +730,6 @@ go_test( "schema_changer_test.go", "schema_resolver_test.go", "sequence_test.go", - "server_params_test.go", "session_migration_test.go", "set_zone_config_test.go", "show_cluster_setting_test.go", diff --git a/pkg/sql/as_of_test.go b/pkg/sql/as_of_test.go index afeb1be01416..aa1207ac06ed 100644 --- a/pkg/sql/as_of_test.go +++ b/pkg/sql/as_of_test.go @@ -15,9 +15,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" "github.com/cockroachdb/cockroach/pkg/kv/kvpb" + "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" + "github.com/cockroachdb/cockroach/pkg/sql/tests" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" @@ -30,7 +32,7 @@ func TestAsOfTime(t *testing.T) { defer log.Scope(t).Close(t) ctx, cancel := context.WithCancel(context.Background()) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.GCJob = &sql.GCJobTestingKnobs{RunBeforeResume: func(_ jobspb.JobID) error { <-ctx.Done() return nil @@ -263,7 +265,13 @@ func TestAsOfRetry(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, cmdFilters := createTestServerParamsAllowTenants() + var cmdFilters tests.CommandFilters + params := base.TestServerArgs{} + params.Knobs.Store = &kvserver.StoreTestingKnobs{ + EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ + TestingEvalFilter: cmdFilters.RunFilters, + }, + } s, sqlDB, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) diff --git a/pkg/sql/comment_on_column_test.go b/pkg/sql/comment_on_column_test.go index ba6f7d794154..47454b6d8810 100644 --- a/pkg/sql/comment_on_column_test.go +++ b/pkg/sql/comment_on_column_test.go @@ -11,6 +11,7 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -225,8 +226,7 @@ func runCommentOnTestsDeclarativeOnly(t *testing.T, testFunc func(db *gosql.DB)) } func runOneCommentOnTest(t *testing.T, setupQuery string, testFunc func(db *gosql.DB)) { - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) _, err := db.Exec(setupQuery) require.NoError(t, err) diff --git a/pkg/sql/conn_executor_test.go b/pkg/sql/conn_executor_test.go index ae0ac842014d..04000a229ba4 100644 --- a/pkg/sql/conn_executor_test.go +++ b/pkg/sql/conn_executor_test.go @@ -75,9 +75,10 @@ import ( func TestSessionFinishRollsBackTxn(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + aborter := NewTxnAborter() defer aborter.Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.SQLExecutor = aborter.executorKnobs() srv, mainDB, _ := serverutils.StartServer(t, params) defer srv.Stopper().Stop(context.Background()) @@ -369,7 +370,7 @@ func TestHalloweenProblemAvoidance(t *testing.T) { defer mutations.ResetMaxBatchSizeForTests() numRows := smallerKvBatchSize + smallerInsertBatchSize + 10 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Insecure = true params.Knobs.DistSQL = &execinfra.TestingKnobs{ TableReaderBatchBytesLimit: 10, @@ -440,7 +441,7 @@ func TestAppNameStatisticsInitialization(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Insecure = true s := serverutils.StartServerOnly(t, params) diff --git a/pkg/sql/crdb_internal_test.go b/pkg/sql/crdb_internal_test.go index 0d3aceb18588..8b78838c84c5 100644 --- a/pkg/sql/crdb_internal_test.go +++ b/pkg/sql/crdb_internal_test.go @@ -83,9 +83,7 @@ func TestGetAllNamesInternal(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - - s, _ /* sqlDB */, kvDB := serverutils.StartServer(t, params) + s, _ /* sqlDB */, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) err := kvDB.Txn(ctx, func(ctx context.Context, txn *kv.Txn) error { @@ -169,8 +167,7 @@ func TestGossipAlertsTable(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s := serverutils.StartServerOnly(t, params) + s := serverutils.StartServerOnly(t, base.TestServerArgs{}) defer s.Stop(context.Background()) ctx := context.Background() @@ -210,8 +207,7 @@ func TestOldBitColumnMetadata(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) // The descriptor changes made must have an immediate effect @@ -428,7 +424,7 @@ func TestInvalidObjects(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ Store: &kvserver.StoreTestingKnobs{ DisableMergeQueue: true, diff --git a/pkg/sql/create_test.go b/pkg/sql/create_test.go index 7bee381b657a..86cba730f9b7 100644 --- a/pkg/sql/create_test.go +++ b/pkg/sql/create_test.go @@ -244,8 +244,8 @@ func TestParallelCreateConflictingTables(t *testing.T) { func TestTableReadErrorsBeforeTableCreation(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` diff --git a/pkg/sql/delete_preserving_index_test.go b/pkg/sql/delete_preserving_index_test.go index 65d22f28bf30..a9330056272d 100644 --- a/pkg/sql/delete_preserving_index_test.go +++ b/pkg/sql/delete_preserving_index_test.go @@ -57,7 +57,8 @@ import ( func TestDeletePreservingIndexEncoding(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs mergeFinished := make(chan struct{}) completeSchemaChange := make(chan struct{}) errorChan := make(chan error, 1) @@ -246,8 +247,7 @@ func TestDeletePreservingIndexEncodingUsesNormalDeletesInDeleteOnly(t *testing.T defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) // The descriptor changes made must have an immediate effect @@ -311,8 +311,7 @@ func TestDeletePreservingIndexEncodingWithEmptyValues(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) // The descriptor changes made must have an immediate effect @@ -515,8 +514,6 @@ func TestMergeProcessor(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - type TestCase struct { name string setupSQL string @@ -611,7 +608,7 @@ func TestMergeProcessor(t *testing.T) { } run := func(t *testing.T, test TestCase) { - server, tdb, kvDB := serverutils.StartServer(t, params) + server, tdb, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) defer lease.TestingDisableTableLeases()() diff --git a/pkg/sql/descriptor_mutation_test.go b/pkg/sql/descriptor_mutation_test.go index fcef171d17a6..677d18fa99da 100644 --- a/pkg/sql/descriptor_mutation_test.go +++ b/pkg/sql/descriptor_mutation_test.go @@ -165,9 +165,7 @@ func TestUpsertWithColumnMutationAndNotNullDefault(t *testing.T) { // no job associated with the added mutations, those mutations stay on the // table descriptor but don't do anything, which is what we want. - // Disable external processing of mutations. - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) ctx := context.Background() defer server.Stopper().Stop(ctx) // The descriptor changes made must have an immediate effect @@ -227,8 +225,7 @@ func TestOperationsWithColumnMutation(t *testing.T) { // Disable external processing of mutations. ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(ctx) sqlRunner := sqlutils.MakeSQLRunner(sqlDB) @@ -494,9 +491,7 @@ func TestOperationsWithIndexMutation(t *testing.T) { // no job associated with the added mutations, those mutations stay on the // table descriptor but don't do anything, which is what we want. - // Disable external processing of mutations. - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) sqlRunner := sqlutils.MakeSQLRunner(sqlDB) // The descriptor changes made must have an immediate effect. @@ -661,8 +656,7 @@ func TestOperationsWithColumnAndIndexMutation(t *testing.T) { // no job associated with the added mutations, those mutations stay on the // table descriptor but don't do anything, which is what we want. - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) ctx := context.Background() defer server.Stopper().Stop(ctx) sqlRunner := sqlutils.MakeSQLRunner(sqlDB) @@ -876,8 +870,9 @@ func TestOperationsWithColumnAndIndexMutation(t *testing.T) { func TestSchemaChangeCommandsWithPendingMutations(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + // Disable external processing of mutations. - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ SchemaChangeJobNoOp: func() bool { @@ -1099,9 +1094,10 @@ CREATE TABLE t.test (a STRING PRIMARY KEY, b STRING, c STRING, INDEX foo (c)); func TestTableMutationQueue(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + // Disable synchronous and asynchronous schema change processing so that // the mutations get queued up. - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ SchemaChangeJobNoOp: func() bool { @@ -1218,8 +1214,7 @@ func TestAddingFKs(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` diff --git a/pkg/sql/drop_test.go b/pkg/sql/drop_test.go index 12b164422cb6..5206d2546d4b 100644 --- a/pkg/sql/drop_test.go +++ b/pkg/sql/drop_test.go @@ -101,7 +101,8 @@ func descExists(sqlDB *gosql.DB, exists bool, id descpb.ID) error { func TestDropDatabase(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs ctx, cancel := context.WithCancel(context.Background()) params.Knobs.GCJob = &sql.GCJobTestingKnobs{ RunBeforeResume: func(jobID jobspb.JobID) error { @@ -262,7 +263,8 @@ CREATE DATABASE t; func TestDropDatabaseDeleteData(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs params.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(156127) // Speed up mvcc queue scan. params.ScanMaxIdleTime = time.Millisecond @@ -446,7 +448,7 @@ func TestDropIndex(t *testing.T) { defer log.Scope(t).Close(t) const chunkSize = 200 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ BackfillChunkSize: chunkSize, @@ -561,7 +563,7 @@ func TestDropIndexWithZoneConfigOSS(t *testing.T) { const chunkSize = 200 const numRows = 2*chunkSize + 1 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{BackfillChunkSize: chunkSize}, } @@ -626,7 +628,7 @@ func TestDropTable(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs ctx, cancel := context.WithCancel(context.Background()) params.Knobs.GCJob = &sql.GCJobTestingKnobs{ RunBeforeResume: func(jobID jobspb.JobID) error { @@ -729,7 +731,8 @@ func TestDropTable(t *testing.T) { func TestDropTableDeleteData(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs // Speed up mvcc queue scan. params.ScanMaxIdleTime = time.Millisecond @@ -890,8 +893,7 @@ func TestDropTableWhileUpgradingFormat(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.ScanMaxIdleTime = time.Millisecond srv, sqlDBRaw, kvDB := serverutils.StartServer(t, params) defer srv.Stopper().Stop(ctx) @@ -970,8 +972,8 @@ func TestDropTableWhileUpgradingFormat(t *testing.T) { func TestDropTableInTxn(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -1010,7 +1012,8 @@ CREATE TABLE t.kv (k CHAR PRIMARY KEY, v CHAR); func TestDropAndCreateTable(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs params.UseDatabase = "test" s, db, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) @@ -1054,7 +1057,7 @@ func TestCommandsWhileTableBeingDropped(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Block schema changers so that the table we're about to DROP is not // actually dropped; it will be left in the "deleted" state. params.Knobs = base.TestingKnobs{ @@ -1249,8 +1252,7 @@ func TestDropIndexOnHashShardedIndexWithStoredShardColumn(t *testing.T) { // Start a test server and connect to it with notice handler (so we can get and check notices from running queries). ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - srv := serverutils.StartServerOnly(t, params) + srv := serverutils.StartServerOnly(t, base.TestServerArgs{}) defer srv.Stopper().Stop(ctx) s := srv.ApplicationLayer() @@ -1333,8 +1335,8 @@ func TestDropIndexOnHashShardedIndexWithStoredShardColumn(t *testing.T) { func TestDropDatabaseWithForeignKeys(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - srv, sqlDB, kvDB := serverutils.StartServer(t, params) + + srv, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer srv.Stopper().Stop(context.Background()) s := srv.ApplicationLayer() @@ -1393,9 +1395,8 @@ ORDER BY func TestDropPhysicalTableGC(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) _, err := sqlDB.Exec(`CREATE DATABASE test;`) require.NoError(t, err) diff --git a/pkg/sql/err_count_test.go b/pkg/sql/err_count_test.go index 1bf33a651f1c..c671a8504f1b 100644 --- a/pkg/sql/err_count_test.go +++ b/pkg/sql/err_count_test.go @@ -10,6 +10,7 @@ import ( gosql "database/sql" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/server/telemetry" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" @@ -25,8 +26,7 @@ func TestErrorCounts(t *testing.T) { telemetry.GetFeatureCounts(telemetry.Raw, telemetry.ResetCounts) - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) count1 := telemetry.GetRawFeatureCounts()["errorcodes."+pgcode.Syntax.String()] @@ -69,8 +69,7 @@ func TestTransactionRetryErrorCounts(t *testing.T) { // in pgwire (pgwire.convertToErrWithPGCode). Make sure we're // reporting errors at a level that allows this code to be recorded. - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := db.Exec("CREATE TABLE accounts (id INT8 PRIMARY KEY, balance INT8)"); err != nil { diff --git a/pkg/sql/explain_test.go b/pkg/sql/explain_test.go index 9ce16422643c..f74e48baac9e 100644 --- a/pkg/sql/explain_test.go +++ b/pkg/sql/explain_test.go @@ -540,8 +540,7 @@ func TestExplainRedact(t *testing.T) { rng, seed := randutil.NewTestRand() t.Log("seed:", seed) - params, _ := createTestServerParamsAllowTenants() - srv, sqlDB, _ := serverutils.StartServer(t, params) + srv, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer srv.Stopper().Stop(ctx) conn, err := sqlDB.Conn(ctx) diff --git a/pkg/sql/grant_revoke_test.go b/pkg/sql/grant_revoke_test.go index 71a872367bf7..1797dd0fbdd5 100644 --- a/pkg/sql/grant_revoke_test.go +++ b/pkg/sql/grant_revoke_test.go @@ -28,8 +28,8 @@ import ( func TestNoOpGrant(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) tdb := sqlutils.MakeSQLRunner(sqlDB) @@ -149,8 +149,8 @@ func TestNoOpGrant(t *testing.T) { func TestNoOpRevoke(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) tdb := sqlutils.MakeSQLRunner(sqlDB) diff --git a/pkg/sql/grant_role_test.go b/pkg/sql/grant_role_test.go index 697dd9b9c2de..d843e0c1fdb5 100644 --- a/pkg/sql/grant_role_test.go +++ b/pkg/sql/grant_role_test.go @@ -9,6 +9,7 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" @@ -23,8 +24,8 @@ import ( func TestNoOpGrantRole(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) tdb := sqlutils.MakeSQLRunner(sqlDB) diff --git a/pkg/sql/index_mutation_test.go b/pkg/sql/index_mutation_test.go index b748b1945bb9..e276e1807d76 100644 --- a/pkg/sql/index_mutation_test.go +++ b/pkg/sql/index_mutation_test.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/jobs" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" "github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils" @@ -34,7 +35,7 @@ func TestIndexMutationKVOps(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Decrease the adopt loop interval so that retries happen quickly. params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() params.Knobs.SQLEvalContext = &eval.TestingKnobs{ diff --git a/pkg/sql/indexbackfiller_test.go b/pkg/sql/indexbackfiller_test.go index e62e283d1f7a..b74bdfd9d58f 100644 --- a/pkg/sql/indexbackfiller_test.go +++ b/pkg/sql/indexbackfiller_test.go @@ -62,7 +62,7 @@ func TestIndexBackfiller(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs moveToTDelete := make(chan bool) moveToTWrite := make(chan bool) diff --git a/pkg/sql/internal_test.go b/pkg/sql/internal_test.go index 55c89feaf4ce..2f4743ba72d6 100644 --- a/pkg/sql/internal_test.go +++ b/pkg/sql/internal_test.go @@ -43,8 +43,7 @@ func TestInternalExecutor(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) ie := s.InternalExecutor().(*sql.InternalExecutor) @@ -126,8 +125,7 @@ func TestInternalFullTableScan(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) _, err := db.Exec("CREATE DATABASE db; SET DATABASE = db;") @@ -177,8 +175,7 @@ func TestInternalStmtFingerprintLimit(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) _, err := db.Exec("SET CLUSTER SETTING sql.metrics.max_mem_txn_fingerprints = 0;") @@ -201,8 +198,7 @@ func TestSessionBoundInternalExecutor(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) if _, err := db.Exec("create database foo"); err != nil { @@ -248,7 +244,7 @@ func TestInternalExecAppNameInitialization(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Insecure = true // sem will be fired every time pg_sleep(1337666) is called. @@ -430,8 +426,7 @@ func TestInternalExecutorPushDetectionInTxn(t *testing.T) { tt.serializable, tt.pushed, tt.refreshable) t.Run(name, func(t *testing.T) { ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, _, db := serverutils.StartServer(t, params) + s, _, db := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) // Setup a txn. @@ -618,8 +613,7 @@ func TestInternalExecutorEncountersRetry(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - srv, db, kvDB := serverutils.StartServer(t, params) + srv, db, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer srv.Stopper().Stop(ctx) s := srv.ApplicationLayer() @@ -719,8 +713,7 @@ func TestInternalExecutorSyntheticDesc(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, db, kvDB := serverutils.StartServer(t, params) + s, db, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) if _, err := db.Exec("CREATE DATABASE test; CREATE TABLE test.t (c) AS SELECT 1"); err != nil { diff --git a/pkg/sql/jobs_profiler_execution_details_test.go b/pkg/sql/jobs_profiler_execution_details_test.go index 9a2b72c5ff1d..a193644bc46c 100644 --- a/pkg/sql/jobs_profiler_execution_details_test.go +++ b/pkg/sql/jobs_profiler_execution_details_test.go @@ -115,7 +115,7 @@ func TestShowJobsWithExecutionDetails(t *testing.T) { ctx, cancel := context.WithTimeout(ctx, time.Minute*2) defer cancel() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() defer jobs.ResetConstructors()() s, sqlDB, _ := serverutils.StartServer(t, params) @@ -159,7 +159,7 @@ func TestReadWriteProfilerExecutionDetails(t *testing.T) { ctx, cancel := context.WithTimeout(ctx, time.Minute*2) defer cancel() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() defer jobs.ResetConstructors()() s, sqlDB, _ := serverutils.StartServer(t, params) @@ -333,7 +333,7 @@ func TestListProfilerExecutionDetails(t *testing.T) { ctx, cancel := context.WithTimeout(ctx, time.Minute*2) defer cancel() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() defer jobs.ResetConstructors()() s, sqlDB, _ := serverutils.StartServer(t, params) diff --git a/pkg/sql/materialized_view_test.go b/pkg/sql/materialized_view_test.go index b728aa6ca53f..54a19582e5bc 100644 --- a/pkg/sql/materialized_view_test.go +++ b/pkg/sql/materialized_view_test.go @@ -30,9 +30,7 @@ func TestMaterializedViewClearedAfterRefresh(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) // Disable strict GC TTL enforcement because we're going to shove a zero-value @@ -97,7 +95,7 @@ func TestMaterializedViewRefreshVisibility(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs waitForCommit, waitToProceed, refreshDone := make(chan struct{}), make(chan struct{}), make(chan struct{}) params.Knobs = base.TestingKnobs{ @@ -145,7 +143,7 @@ func TestMaterializedViewCleansUpOnRefreshFailure(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Protects shouldError var mu syncutil.Mutex @@ -211,8 +209,7 @@ func TestDropMaterializedView(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, sqlRaw, kvDB := serverutils.StartServer(t, params) + s, sqlRaw, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) // Disable strict GC TTL enforcement because we're going to shove a zero-value diff --git a/pkg/sql/metric_test.go b/pkg/sql/metric_test.go index 4bcd101bda44..5de718f10b9f 100644 --- a/pkg/sql/metric_test.go +++ b/pkg/sql/metric_test.go @@ -14,9 +14,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/kv/kvpb" + "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/catalog/lease" + "github.com/cockroachdb/cockroach/pkg/sql/tests" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" @@ -59,7 +61,7 @@ func TestQueryCounts(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLLeaseManager: &lease.ManagerTestingKnobs{ // Disable SELECT called for delete orphaned leases to keep @@ -212,8 +214,7 @@ func TestStatementMetrics(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - srv, sqlDB, _ := serverutils.StartServer(t, params) + srv, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer srv.Stopper().Stop(context.Background()) runner := sqlutils.MakeSQLRunner(sqlDB) s := srv.ApplicationLayer() @@ -344,7 +345,13 @@ func TestAbortCountConflictingWrites(t *testing.T) { defer log.Scope(t).Close(t) testutils.RunTrueAndFalse(t, "retry loop", func(t *testing.T, retry bool) { - params, cmdFilters := createTestServerParamsAllowTenants() + var cmdFilters tests.CommandFilters + params := base.TestServerArgs{} + params.Knobs.Store = &kvserver.StoreTestingKnobs{ + EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ + TestingEvalFilter: cmdFilters.RunFilters, + }, + } s, sqlDB, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) @@ -455,8 +462,8 @@ func TestAbortCountConflictingWrites(t *testing.T) { func TestAbortCountErrorDuringTransaction(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) accum := initializeQueryCounter(s) @@ -490,8 +497,7 @@ func TestSavepointMetrics(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) accum := initializeQueryCounter(s) diff --git a/pkg/sql/mutation_test.go b/pkg/sql/mutation_test.go index aa3415b91b09..491b7fd7b79e 100644 --- a/pkg/sql/mutation_test.go +++ b/pkg/sql/mutation_test.go @@ -32,8 +32,7 @@ func TestConstraintValidationBeforeBuffering(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := db.Exec(` @@ -141,7 +140,7 @@ func TestReadCommittedImplicitPartitionUpsert(t *testing.T) { } ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // If test is in Ready state, transition to ReadDone and wait for conflict. params.Knobs = base.TestingKnobs{ SQLExecutor: &sql.ExecutorTestingKnobs{ diff --git a/pkg/sql/mvcc_backfiller_test.go b/pkg/sql/mvcc_backfiller_test.go index 64eb57d9250f..8b55278ac1c1 100644 --- a/pkg/sql/mvcc_backfiller_test.go +++ b/pkg/sql/mvcc_backfiller_test.go @@ -61,7 +61,7 @@ func TestIndexBackfillMergeRetry(t *testing.T) { skip.UnderDuress(t, "this test fails under duress") - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs writesPopulated := false var writesFn func() error @@ -182,7 +182,7 @@ func TestIndexBackfillFractionTracking(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs const ( rowCount = 2000 @@ -299,7 +299,7 @@ func TestRaceWithIndexBackfillMerge(t *testing.T) { maxValue = 200 } - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs initMergeNotification := func() chan struct{} { mu.Lock() defer mu.Unlock() @@ -496,7 +496,7 @@ func TestInvertedIndexMergeEveryStateWrite(t *testing.T) { var initialRows = 10000 rowIdx := 0 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var writeMore func() error params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -565,7 +565,7 @@ func TestIndexBackfillMergeTxnRetry(t *testing.T) { additionalRowsForMerge = 10 ) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ // Ensure that the temp index has work to do. @@ -759,7 +759,7 @@ func TestIndexMergeEveryChunkWrite(t *testing.T) { rowIdx := 0 mergeSerializeCh := make(chan struct{}, 1) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var writeMore func() error params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ @@ -813,7 +813,7 @@ func TestIndexOverwritesChunksDuringMerge(t *testing.T) { chunkSize := 10 const maxAutoRetries = 10 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var writeMore func(sampleData bool) error retryTracker := struct { limitedPerKey map[string]int @@ -966,7 +966,7 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v int);` // Wait for the beginning of the Merge step of the schema change. // Write data to the temp index and split it at the hazardous // points. - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLDeclarativeSchemaChanger: &scexec.TestingKnobs{ BeforeStage: func(p scplan.Plan, stageIdx int) error { diff --git a/pkg/sql/privileged_accessor_test.go b/pkg/sql/privileged_accessor_test.go index 78ddd34743a1..288b8f6d0c46 100644 --- a/pkg/sql/privileged_accessor_test.go +++ b/pkg/sql/privileged_accessor_test.go @@ -9,6 +9,7 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" @@ -25,8 +26,7 @@ func TestLookupNamespaceID(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) err := kvDB.Txn(ctx, func(ctx context.Context, txn *kv.Txn) error { diff --git a/pkg/sql/run_control_test.go b/pkg/sql/run_control_test.go index 63fae3821306..07ef4670af7b 100644 --- a/pkg/sql/run_control_test.go +++ b/pkg/sql/run_control_test.go @@ -415,8 +415,7 @@ func TestCancelWithSubquery(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, conn, _ := serverutils.StartServer(t, params) + s, conn, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) _, err := conn.Exec("CANCEL SESSION (SELECT session_id FROM [SHOW session_id]);") diff --git a/pkg/sql/schema_changer_test.go b/pkg/sql/schema_changer_test.go index 75aac1ff4302..272c6857d40c 100644 --- a/pkg/sql/schema_changer_test.go +++ b/pkg/sql/schema_changer_test.go @@ -89,9 +89,7 @@ func TestSchemaChangeProcess(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - - srv, sqlDB, kvDB := serverutils.StartServer(t, params) + srv, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer srv.Stopper().Stop(context.Background()) s := srv.ApplicationLayer() @@ -221,10 +219,8 @@ INSERT INTO t.test VALUES ('a', 'b'), ('c', 'd'); func TestAsyncSchemaChanger(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - // Disable synchronous schema change execution so the asynchronous schema - // changer executes all schema changes. - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -447,7 +443,7 @@ func TestRollbackOfAddingTable(t *testing.T) { var mu syncutil.Mutex shouldError := true - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeQueryBackfill: func() error { @@ -530,7 +526,7 @@ func TestUniqueViolationsAreCaught(t *testing.T) { readyToMerge := make(chan struct{}) startMerge := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -592,7 +588,7 @@ func TestRaceWithBackfill(t *testing.T) { maxValue = 200 } - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs initBackfillNotification := func() chan struct{} { mu.Lock() defer mu.Unlock() @@ -781,7 +777,7 @@ func TestDropWhileBackfill(t *testing.T) { maxValue = 200 } ctx, cancel := context.WithCancel(context.Background()) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs notifyBackfill := func() { mu.Lock() defer mu.Unlock() @@ -929,7 +925,7 @@ func TestBackfillErrors(t *testing.T) { defer log.Scope(t).Close(t) const numNodes, chunkSize, maxValue = 5, 100, 4000 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs blockGC := make(chan struct{}) params.Knobs = base.TestingKnobs{ @@ -1039,9 +1035,10 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v INT); func TestAbortSchemaChangeBackfill(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + var backfillNotification, commandsDone chan struct{} var dontAbortBackfill uint32 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs const maxValue = 100 backfillCount := int64(0) retriedBackfill := int64(0) @@ -1321,9 +1318,8 @@ func dropIndexSchemaChange( func TestDropColumn(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -1391,7 +1387,7 @@ func TestSchemaChangeRetry(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs currChunk := 0 seenSpan := roachpb.Span{} @@ -1485,7 +1481,7 @@ func TestSchemaChangeRetryOnVersionChange(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var upTableVersion func() const maxValue = 2000 currChunk := 0 @@ -1638,8 +1634,9 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v INT); func TestSchemaChangeFailureAfterCheckpointing(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + defer gcjob.SetSmallMaxGCIntervalForTest()() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs const chunkSize = 200 attempts := 0 // attempt 1: write two chunks of the column. @@ -1746,8 +1743,8 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v INT); func TestParseSentinelValueWithNewColumnInSentinelFamily(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -1855,7 +1852,8 @@ CREATE TABLE t.test ( func TestAddColumnDuringColumnDrop(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs backfillNotification := make(chan struct{}) continueBackfillNotification := make(chan struct{}) params.Knobs = base.TestingKnobs{ @@ -1930,8 +1928,9 @@ ALTER TABLE t.test ADD column v INT DEFAULT 0; func TestSchemaUniqueColumnDropFailure(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + waitUntilRevert := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs const chunkSize = 200 attempts := 0 // DROP UNIQUE COLUMN is executed in two steps: drop index and drop column. @@ -2038,8 +2037,8 @@ ALTER TABLE t.test DROP column v`) func TestDropIndexNoRevert(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, _ := serverutils.StartServer(t, params) + + server, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) _, err := sqlDB.Exec(` @@ -2078,7 +2077,6 @@ INSERT INTO t VALUES (1, 1, 1), (2, 2, 1); func TestOldRevertedDropIndexesAreIgnored(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() var ( server serverutils.TestServerInterface @@ -2086,6 +2084,7 @@ func TestOldRevertedDropIndexesAreIgnored(t *testing.T) { kvDB *kv.DB ) var codec keys.SQLCodec + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeResume: func(jobspb.JobID) error { @@ -2142,7 +2141,7 @@ func TestVisibilityDuringPrimaryKeyChange(t *testing.T) { ctx := context.Background() swapNotification := make(chan struct{}) waitBeforeContinuing := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforePrimaryKeySwap: func() { @@ -2256,7 +2255,7 @@ func TestPrimaryKeyChangeWithPrecedingIndexCreation(t *testing.T) { <-continueNotification } } - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ BackfillChunkSize: chunkSize, @@ -2360,7 +2359,7 @@ func TestSchemaChangeWhileExecutingPrimaryKeyChange(t *testing.T) { backfillNotification := make(chan struct{}) waitBeforeContinuing := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(_ roachpb.Span) error { @@ -2436,7 +2435,7 @@ func TestPrimaryKeyChangeWithOperations(t *testing.T) { var mu syncutil.Mutex backfillNotification := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs initBackfillNotification := func() chan struct{} { mu.Lock() defer mu.Unlock() @@ -2701,7 +2700,7 @@ func TestPrimaryKeyChangeKVOps(t *testing.T) { waitBeforeContinuing := make(chan struct{}) var doOnce sync.Once - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(_ roachpb.Span) error { @@ -2939,7 +2938,7 @@ func TestPrimaryKeyChangeWithCancel(t *testing.T) { ctx := context.Background() var db *gosql.DB shouldCancel := true - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ BackfillChunkSize: chunkSize, @@ -3024,7 +3023,7 @@ func TestPrimaryKeyDropIndexNotCancelable(t *testing.T) { var shouldAttemptCancel atomic.Bool shouldAttemptCancel.Store(true) hasAttemptedCancel := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ GCJob: &sql.GCJobTestingKnobs{ RunBeforeResume: func(jobID jobspb.JobID) error { @@ -3079,7 +3078,7 @@ func TestMultiplePrimaryKeyChanges(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{}, // Decrease the adopt loop interval so that retries happen quickly. @@ -3124,7 +3123,7 @@ func TestGrantRevokeWhileIndexBackfill(t *testing.T) { backfillCompleteNotification := make(chan bool) continueSchemaChangeNotification := make(chan bool) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(sp roachpb.Span) error { @@ -3225,7 +3224,7 @@ func TestCRUDWhileColumnBackfill(t *testing.T) { backfillCompleteNotification := make(chan bool) continueSchemaChangeNotification := make(chan bool) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(sp roachpb.Span) error { @@ -3474,7 +3473,7 @@ func TestBackfillCompletesOnChunkBoundary(t *testing.T) { // a chunk boundary. const maxValue = 3*chunkSize - 1 ctx, cancel := context.WithCancel(context.Background()) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ BackfillChunkSize: chunkSize, @@ -3564,8 +3563,8 @@ func TestBackfillCompletesOnChunkBoundary(t *testing.T) { func TestSchemaChangeInTxn(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -3675,8 +3674,8 @@ INSERT INTO t.kv VALUES ('a', 'b'); func TestSecondaryIndexWithOldStoringEncoding(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - server, sqlDB, kvDB := serverutils.StartServer(t, params) + + server, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer server.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -3793,11 +3792,11 @@ CREATE TABLE d.t ( func TestSchemaChangeEvalContext(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + const numNodes = 3 const chunkSize = 200 const maxValue = 5000 - params, _ := createTestServerParamsAllowTenants() - // Disable asynchronous schema change execution. + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ BackfillChunkSize: chunkSize, @@ -3873,8 +3872,9 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v INT); func TestTruncateInternals(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + const maxValue = 2000 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Disable schema changes. blockGC := make(chan struct{}) params.Knobs = base.TestingKnobs{ @@ -3969,7 +3969,7 @@ func TestTruncateCompletion(t *testing.T) { const maxValue = 2000 defer gcjob.SetSmallMaxGCIntervalForTest()() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Decrease the adopt loop interval so that retries happen quickly. params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() @@ -4104,8 +4104,8 @@ func TestTruncateCompletion(t *testing.T) { func TestSchemaChangeErrorOnCommit(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) sqlRunner := sqlutils.MakeSQLRunner(sqlDB) @@ -4162,7 +4162,7 @@ func TestIndexBackfillAfterGC(t *testing.T) { return nil } - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(sp roachpb.Span) error { @@ -4235,7 +4235,7 @@ func TestAddComputedColumn(t *testing.T) { var db *gosql.DB done := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(sp roachpb.Span) error { @@ -4273,7 +4273,7 @@ func TestNoBackfillForVirtualColumn(t *testing.T) { defer log.Scope(t).Close(t) sawBackfill := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ DistSQL: &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(sp roachpb.Span) error { @@ -4306,8 +4306,8 @@ func TestNoBackfillForVirtualColumn(t *testing.T) { func TestSchemaChangeAfterCreateInTxn(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) codec := s.ApplicationLayer().Codec() @@ -4445,7 +4445,7 @@ func TestCancelSchemaChange(t *testing.T) { ) var sqlDB *sqlutils.SQLRunner - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs doCancel := false params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -4625,7 +4625,7 @@ func TestCancelSchemaChangeContext(t *testing.T) { notifyBackfill := make(chan struct{}) cancelSessionDone := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeBackfill: func() error { @@ -4705,7 +4705,7 @@ func TestSchemaChangeGRPCError(t *testing.T) { defer log.Scope(t).Close(t) const maxValue = 100 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs seenNodeUnavailable := false params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -4762,7 +4762,7 @@ func TestBlockedSchemaChange(t *testing.T) { notifyBackfill := make(chan struct{}) tableRenameDone := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeBackfill: func() error { @@ -4830,7 +4830,8 @@ func TestBlockedSchemaChange(t *testing.T) { func TestIndexBackfillValidation(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs const maxValue = 1000 backfillCount := int64(0) var db *kv.DB @@ -4902,7 +4903,8 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v INT); func TestInvertedIndexBackfillValidation(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs const maxValue = 1000 backfillCount := int64(0) var db *kv.DB @@ -4976,7 +4978,8 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v JSON); func TestMultipleIndexBackfills(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs const maxValue = 1000 params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -5095,7 +5098,6 @@ func TestCreateStatsAfterSchemaChange(t *testing.T) { func TestTableValidityWhileAddingFK(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() publishWriteNotification := make(chan struct{}) continuePublishWriteNotification := make(chan struct{}) @@ -5103,6 +5105,7 @@ func TestTableValidityWhileAddingFK(t *testing.T) { backfillNotification := make(chan struct{}) continueBackfillNotification := make(chan struct{}) + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforePublishWriteAndDelete: func() { @@ -5180,7 +5183,6 @@ SET use_declarative_schema_changer = off; func TestTableValidityWhileAddingUniqueConstraint(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() publishWriteNotification := make(chan struct{}) continuePublishWriteNotification := make(chan struct{}) @@ -5188,6 +5190,7 @@ func TestTableValidityWhileAddingUniqueConstraint(t *testing.T) { backfillNotification := make(chan struct{}) continueBackfillNotification := make(chan struct{}) + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforePublishWriteAndDelete: func() { @@ -5263,7 +5266,6 @@ SET use_declarative_schema_changer = off; func TestWritesWithChecksBeforeDefaultColumnBackfill(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() publishWriteNotification := make(chan struct{}) continuePublishWriteNotification := make(chan struct{}) @@ -5271,6 +5273,7 @@ func TestWritesWithChecksBeforeDefaultColumnBackfill(t *testing.T) { backfillNotification := make(chan struct{}) continueBackfillNotification := make(chan struct{}) + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforePublishWriteAndDelete: func() { @@ -5360,7 +5363,6 @@ SET use_declarative_schema_changer = off; func TestWritesWithChecksBeforeComputedColumnBackfill(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() publishWriteNotification := make(chan struct{}) continuePublishWriteNotification := make(chan struct{}) @@ -5368,6 +5370,7 @@ func TestWritesWithChecksBeforeComputedColumnBackfill(t *testing.T) { backfillNotification := make(chan struct{}) continueBackfillNotification := make(chan struct{}) + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforePublishWriteAndDelete: func() { @@ -5461,7 +5464,7 @@ func TestIntentRaceWithIndexBackfill(t *testing.T) { const numNodes = 1 var maxValue = 2000 - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ BackfillChunkSize: 100, @@ -5595,7 +5598,8 @@ CREATE TABLE t.test (k INT PRIMARY KEY, v INT); func TestSchemaChangeJobRunningStatusValidation(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + + var params base.TestServerArgs var runBeforeConstraintValidation func() error params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -5643,7 +5647,7 @@ func TestFKReferencesAddedOnlyOnceOnRetry(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var runBeforeConstraintValidation func() error errorReturned := false params.Knobs = base.TestingKnobs{ @@ -5707,7 +5711,7 @@ func TestMultipleRevert(t *testing.T) { ranCancelCommand := false shouldRetryAfterReversingMutations := true - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var db *gosql.DB params.Knobs = base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), @@ -5834,7 +5838,7 @@ SELECT usage_count t.Run("error-before-backfill", func(t *testing.T) { onFailOrCancelStarted := false injectedError := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeOnFailOrCancel: func(_ jobspb.JobID) error { @@ -5861,7 +5865,7 @@ SELECT usage_count t.Run("error-before-reversing-mutations", func(t *testing.T) { onFailOrCancelStarted := false injectedError := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeOnFailOrCancel: func(_ jobspb.JobID) error { @@ -5898,7 +5902,7 @@ func TestDropTableWhileSchemaChangeReverting(t *testing.T) { beforeOnFailOrCancelNotification := make(chan struct{}) // Closed when we're ready to continue with the schema change (rollback). continueNotification := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeOnFailOrCancel: func(_ jobspb.JobID) error { @@ -6000,7 +6004,7 @@ CREATE UNIQUE INDEX i ON t.test(v); t.Run("error-before-backfill", func(t *testing.T) { onFailOrCancelStarted := false injectedError := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeOnFailOrCancel: func(_ jobspb.JobID) error { @@ -6029,7 +6033,7 @@ CREATE UNIQUE INDEX i ON t.test(v); t.Run("error-before-reversing-mutations", func(t *testing.T) { onFailOrCancelStarted := false injectedError := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeOnFailOrCancel: func(_ jobspb.JobID) error { @@ -6063,8 +6067,7 @@ func TestPartialIndexBackfill(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, kvDB := serverutils.StartServer(t, params) + s, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(ctx) if _, err := sqlDB.Exec(` @@ -6102,7 +6105,7 @@ func TestAddingTableResolution(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ // Don't run the schema change to take the table out of the adding state. SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -6137,7 +6140,7 @@ func TestFailureToMarkCanceledReversalLeadsToCanceledStatus(t *testing.T) { ctx := context.Background() canProceed := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs jobCancellationsToFail := struct { syncutil.Mutex jobs map[jobspb.JobID]struct{} @@ -6236,7 +6239,7 @@ func TestCancelMultipleQueued(t *testing.T) { ctx := context.Background() canProceed := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeBackfill: func() error { @@ -6345,7 +6348,7 @@ func TestRollbackForeignKeyAddition(t *testing.T) { beforeBackfillNotification := make(chan struct{}) // Closed when we're ready to continue with the schema change. continueNotification := make(chan struct{}) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeBackfill: func() error { @@ -6498,7 +6501,7 @@ func TestRevertingJobsOnDatabasesAndSchemas(t *testing.T) { t.Run("failed due to injected error", func(t *testing.T) { var injectedError bool var s serverutils.TestServerInterface - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeResume: func(jobID jobspb.JobID) error { @@ -6583,7 +6586,7 @@ func TestRevertingJobsOnDatabasesAndSchemas(t *testing.T) { } var s serverutils.TestServerInterface - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeResume: func(jobID jobspb.JobID) error { @@ -6651,7 +6654,7 @@ func TestCheckConstraintDropAndColumn(t *testing.T) { delayNotify := make(chan struct{}) routineResults := make(chan error) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs var s serverutils.TestServerInterface params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -6827,7 +6830,7 @@ func TestShardColumnConstraintSkipValidation(t *testing.T) { ctx := context.Background() constraintsToValidate := make(chan []catalog.Constraint, 1) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeConstraintValidation: func(constraints []catalog.Constraint) error { @@ -6884,7 +6887,7 @@ func TestHashShardedIndexRangePreSplit(t *testing.T) { var runBeforePreSplitting func(tbl *tabledesc.Mutable, kvDB *kv.DB, codec keys.SQLCodec) error var runAfterPreSplitting func(tbl *tabledesc.Mutable, kvDB *kv.DB, codec keys.SQLCodec) error - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ RunBeforeHashShardedIndexRangePreSplit: func(tbl *tabledesc.Mutable, kvDB *kv.DB, codec keys.SQLCodec) error { @@ -7133,7 +7136,7 @@ ALTER TABLE t.test SET (ttl_expire_after = '10 hours'); knobs := &sql.SchemaChangerTestingKnobs{} - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.SQLSchemaChanger = knobs s, sqlDB, kvDB := serverutils.StartServer(t, params) defer s.Stopper().Stop(ctx) @@ -7251,7 +7254,7 @@ CREATE TABLE t.test (x INT) WITH (ttl_expire_after = '10 minutes');`, for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs childJobStartNotification := make(chan struct{}) waitBeforeContinuing := make(chan struct{}) var doOnce sync.Once @@ -7326,7 +7329,7 @@ func TestPauseBeforeRandomDescTxn(t *testing.T) { count int32 // accessed atomically shouldCount int32 // accessed atomically ) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -7355,7 +7358,7 @@ func TestPauseBeforeRandomDescTxn(t *testing.T) { jobID jobspb.JobID ) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -7447,7 +7450,7 @@ func TestOperationAtRandomStateTransition(t *testing.T) { count int32 // accessed atomically shouldCount int32 // accessed atomically ) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -7479,7 +7482,7 @@ func TestOperationAtRandomStateTransition(t *testing.T) { kvDB *kv.DB ) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs = base.TestingKnobs{ JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{ @@ -7713,7 +7716,7 @@ func TestColumnBackfillProcessingDoesNotHoldLockOnJobsTable(t *testing.T) { ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs chCh := make(chan chan error) params.Knobs.DistSQL = &execinfra.TestingKnobs{ RunBeforeBackfillChunk: func(sp roachpb.Span) error { @@ -7770,8 +7773,9 @@ SELECT fraction_completed > 0 func TestLegacySchemaChangerWaitsForOtherSchemaChanges(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() s, sqlDB, _ := serverutils.StartServer(t, params) diff --git a/pkg/sql/server_params_test.go b/pkg/sql/server_params_test.go deleted file mode 100644 index 6e74ffc4d14b..000000000000 --- a/pkg/sql/server_params_test.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2023 The Cockroach Authors. -// -// Use of this software is governed by the CockroachDB Software License -// included in the /LICENSE file. - -package sql_test - -import ( - "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverbase" - "github.com/cockroachdb/cockroach/pkg/sql/tests" -) - -// createTestServerParamsAllowTenants creates a set of params suitable for SQL tests. It -// enables some EndTxn sanity checking and installs a flexible -// TestingEvalFilter. -// TODO(andrei): this function is not used consistently by SQL tests. -// TODO(ssd,shubham): Rename this to `createTestServerParams` -func createTestServerParamsAllowTenants() (base.TestServerArgs, *tests.CommandFilters) { - var cmdFilters tests.CommandFilters - params := base.TestServerArgs{} - params.Knobs.Store = &kvserver.StoreTestingKnobs{ - EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ - TestingEvalFilter: cmdFilters.RunFilters, - }, - } - return params, &cmdFilters -} diff --git a/pkg/sql/show_create_all_tables_builtin_test.go b/pkg/sql/show_create_all_tables_builtin_test.go index c6b4ccaa432c..9dd6a651b6db 100644 --- a/pkg/sql/show_create_all_tables_builtin_test.go +++ b/pkg/sql/show_create_all_tables_builtin_test.go @@ -9,6 +9,7 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" @@ -23,8 +24,7 @@ func TestRecreateTables(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) sqlRunner := sqlutils.MakeSQLRunner(sqlDB) diff --git a/pkg/sql/show_test.go b/pkg/sql/show_test.go index 27609b86e41d..6e9db0fe7a19 100644 --- a/pkg/sql/show_test.go +++ b/pkg/sql/show_test.go @@ -292,8 +292,7 @@ func TestShowCreateView(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -389,8 +388,7 @@ func TestShowCreateSequence(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` @@ -969,7 +967,7 @@ func TestShowSessionPrivileges(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Insecure = true srv, rawSQLDBroot, _ := serverutils.StartServer(t, params) defer srv.Stopper().Stop(context.Background()) @@ -1044,7 +1042,7 @@ func TestShowRedactedActiveStatements(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Insecure = true ctx, cancel := context.WithCancel(context.Background()) srv, rawSQLDBroot, _ := serverutils.StartServer(t, params) @@ -1197,7 +1195,7 @@ func TestShowRedactedSessions(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Insecure = true ctx, cancel := context.WithCancel(context.Background()) srv, rawSQLDBroot, _ := serverutils.StartServer(t, params) diff --git a/pkg/sql/sort_test.go b/pkg/sql/sort_test.go index 946b6aabd026..2e876d00689b 100644 --- a/pkg/sql/sort_test.go +++ b/pkg/sql/sort_test.go @@ -9,6 +9,7 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -18,8 +19,7 @@ func TestOrderByRandom(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) seenOne := false diff --git a/pkg/sql/split_test.go b/pkg/sql/split_test.go index a9e2c8837b45..ebaad1729bbb 100644 --- a/pkg/sql/split_test.go +++ b/pkg/sql/split_test.go @@ -11,6 +11,7 @@ import ( "strings" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" @@ -22,8 +23,7 @@ func TestSplitAt(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) r := sqlutils.MakeSQLRunner(db) diff --git a/pkg/sql/table_ref_test.go b/pkg/sql/table_ref_test.go index 15c6ea1f5673..a96ab9e802ca 100644 --- a/pkg/sql/table_ref_test.go +++ b/pkg/sql/table_ref_test.go @@ -11,6 +11,7 @@ import ( "regexp" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" "github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" @@ -22,8 +23,7 @@ func TestTableRefs(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, db, kvDB := serverutils.StartServer(t, params) + s, db, kvDB := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) // Populate the test database. diff --git a/pkg/sql/txn_restart_test.go b/pkg/sql/txn_restart_test.go index 61f3f5edee01..7717f09792ef 100644 --- a/pkg/sql/txn_restart_test.go +++ b/pkg/sql/txn_restart_test.go @@ -463,7 +463,13 @@ func TestTxnAutoRetry(t *testing.T) { aborter := NewTxnAborter() defer aborter.Close(t) - params, cmdFilters := createTestServerParamsAllowTenants() + var cmdFilters tests.CommandFilters + params := base.TestServerArgs{} + params.Knobs.Store = &kvserver.StoreTestingKnobs{ + EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ + TestingEvalFilter: cmdFilters.RunFilters, + }, + } params.Knobs.SQLExecutor = aborter.executorKnobs() srv, sqlDB, _ := serverutils.StartServer(t, params) defer srv.Stopper().Stop(context.Background()) @@ -657,7 +663,7 @@ func TestAbortedTxnOnlyRetriedOnce(t *testing.T) { aborter := NewTxnAborter() defer aborter.Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.SQLExecutor = aborter.executorKnobs() srv, sqlDB, _ := serverutils.StartServer(t, params) defer srv.Stopper().Stop(context.Background()) @@ -877,7 +883,13 @@ func TestTxnUserRestart(t *testing.T) { t.Run(fmt.Sprintf("err=%s,stgy=%d", tc.expectedErr, rs), func(t *testing.T) { aborter := NewTxnAborter() defer aborter.Close(t) - params, cmdFilters := createTestServerParamsAllowTenants() + var cmdFilters tests.CommandFilters + params := base.TestServerArgs{} + params.Knobs.Store = &kvserver.StoreTestingKnobs{ + EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ + TestingEvalFilter: cmdFilters.RunFilters, + }, + } params.Knobs.SQLExecutor = aborter.executorKnobs() srv, sqlDB, _ := serverutils.StartServer(t, params) defer srv.Stopper().Stop(context.Background()) @@ -963,8 +975,7 @@ func TestCommitWaitState(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) if _, err := sqlDB.Exec(` CREATE DATABASE t; CREATE TABLE t.test (k INT PRIMARY KEY, v TEXT); @@ -999,7 +1010,7 @@ func TestErrorOnCommitFinalizesTxn(t *testing.T) { aborter := NewTxnAborter() defer aborter.Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.SQLExecutor = aborter.executorKnobs() s, sqlDB, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) @@ -1088,7 +1099,7 @@ func TestRollbackInRestartWait(t *testing.T) { aborter := NewTxnAborter() defer aborter.Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.SQLExecutor = aborter.executorKnobs() s, sqlDB, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) @@ -1150,8 +1161,7 @@ func TestUnexpectedStatementInRestartWait(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) tx, err := sqlDB.Begin() @@ -1201,7 +1211,13 @@ func TestNonRetryableError(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, cmdFilters := createTestServerParamsAllowTenants() + var cmdFilters tests.CommandFilters + params := base.TestServerArgs{} + params.Knobs.Store = &kvserver.StoreTestingKnobs{ + EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ + TestingEvalFilter: cmdFilters.RunFilters, + }, + } s, sqlDB, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) @@ -1294,7 +1310,7 @@ func TestReacquireLeaseOnRestart(t *testing.T) { DisableMaxOffsetCheck: true, } - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.Store = storeTestingKnobs params.Knobs.KVClient = clientTestingKnobs params.DefaultTestTenant = base.TestDoesNotWorkWithExternalProcessMode(156333) @@ -1346,7 +1362,7 @@ func TestFlushUncommittedDescriptorCacheOnRestart(t *testing.T) { }, } - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.Store = testingKnobs s, sqlDB, _ := serverutils.StartServer(t, params) defer s.Stopper().Stop(context.Background()) @@ -1556,8 +1572,7 @@ func TestRollbackToSavepointFromUnusualStates(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) checkState := func(tx *gosql.Tx, ts time.Time) { @@ -1619,8 +1634,7 @@ func TestTxnAutoRetriesDisabledAfterResultsHaveBeenSentToClient(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, sqlDB, _ := serverutils.StartServer(t, params) + s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) defer sqlDB.Close() @@ -1708,7 +1722,13 @@ func TestTxnAutoRetryReasonAvailable(t *testing.T) { const numRetries = 3 retryCount := 0 - params, cmdFilters := createTestServerParamsAllowTenants() + var cmdFilters tests.CommandFilters + params := base.TestServerArgs{} + params.Knobs.Store = &kvserver.StoreTestingKnobs{ + EvalKnobs: kvserverbase.BatchEvalTestingKnobs{ + TestingEvalFilter: cmdFilters.RunFilters, + }, + } params.Knobs.SQLExecutor = &sql.ExecutorTestingKnobs{ BeforeRestart: func(ctx context.Context, reason error) { retryCount++ diff --git a/pkg/sql/type_change_test.go b/pkg/sql/type_change_test.go index 47da3f4ecfa6..4fe32d891504 100644 --- a/pkg/sql/type_change_test.go +++ b/pkg/sql/type_change_test.go @@ -12,6 +12,7 @@ import ( "sync/atomic" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/ccl" "github.com/cockroachdb/cockroach/pkg/jobs" "github.com/cockroachdb/cockroach/pkg/sql" @@ -36,7 +37,7 @@ func TestTypeSchemaChangeRetriesTransparently(t *testing.T) { // Protects errorReturned. var mu syncutil.Mutex errorReturned := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.Knobs.SQLTypeSchemaChanger = &sql.TypeSchemaChangerTestingKnobs{ RunBeforeExec: func() error { mu.Lock() @@ -81,7 +82,7 @@ func TestFailedTypeSchemaChangeRetriesTransparently(t *testing.T) { var mu syncutil.Mutex // Ensures just the first try to cleanup returns a retryable error. errReturned := false - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs cleanupSuccessfullyFinished := make(chan struct{}) params.Knobs.SQLTypeSchemaChanger = &sql.TypeSchemaChangerTestingKnobs{ RunBeforeExec: func() error { @@ -141,7 +142,7 @@ func TestFailedTypeSchemaChangeIgnoresDrops(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs startDrop := make(chan struct{}) dropFinished := make(chan struct{}) cancelled := atomic.Bool{} @@ -201,7 +202,7 @@ func TestAddDropValuesInTransaction(t *testing.T) { ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Decrease the adopt loop interval so that retries happen quickly. params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() @@ -346,7 +347,7 @@ func TestEnumMemberTransitionIsolation(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Protects blocker. var mu syncutil.Mutex blocker := make(chan struct{}) @@ -492,14 +493,12 @@ func TestTypeChangeJobCancelSemantics(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - - params, _ := createTestServerParamsAllowTenants() - // Wait groups for synchronizing various parts of the test. typeSchemaChangeStarted := make(chan struct{}) blockTypeSchemaChange := make(chan struct{}) finishedSchemaChange := make(chan struct{}) + var params base.TestServerArgs params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() params.Knobs.SQLTypeSchemaChanger = &sql.TypeSchemaChangerTestingKnobs{ RunBeforeEnumMemberPromotion: func(ctx context.Context) error { @@ -583,7 +582,7 @@ func TestAddDropEnumValues(t *testing.T) { defer ccl.TestingEnableEnterprise()() ctx := context.Background() - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // Decrease the adopt loop interval so that retries happen quickly. params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() diff --git a/pkg/sql/unsplit_range_test.go b/pkg/sql/unsplit_range_test.go index 5ed9c0e4cab2..287c16adb5f6 100644 --- a/pkg/sql/unsplit_range_test.go +++ b/pkg/sql/unsplit_range_test.go @@ -276,7 +276,7 @@ func TestUnsplitRanges(t *testing.T) { ctx := context.Background() run := func(t *testing.T, tc testCase) { - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs params.DefaultTestTenant = base.TestDoesNotWorkWithExternalProcessMode(142388) params.Knobs.JobsTestingKnobs = jobs.NewTestingKnobsWithShortIntervals() params.Knobs.GCJob = &sql.GCJobTestingKnobs{ diff --git a/pkg/sql/unsplit_test.go b/pkg/sql/unsplit_test.go index 0304b2488f8c..d5f66ca048e4 100644 --- a/pkg/sql/unsplit_test.go +++ b/pkg/sql/unsplit_test.go @@ -26,7 +26,7 @@ func TestUnsplitAt(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // TODO(jeffreyxiao): Disable the merge queue due to a race condition. The // merge queue might issue an AdminMerge and before the actual merge happens, // the LHS of the merge is manually split and is later merged even though a diff --git a/pkg/sql/zone_config_test.go b/pkg/sql/zone_config_test.go index 920c43e82da2..c08fd90fc37e 100644 --- a/pkg/sql/zone_config_test.go +++ b/pkg/sql/zone_config_test.go @@ -86,13 +86,14 @@ func forceNewConfig(t testing.TB, s serverutils.TestServerInterface) *config.Sys func TestGetZoneConfig(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() + defaultZoneConfig := zonepb.DefaultSystemZoneConfig() defaultZoneConfig.NumReplicas = proto.Int32(1) defaultZoneConfig.RangeMinBytes = proto.Int64(1 << 20) defaultZoneConfig.RangeMaxBytes = proto.Int64(100 << 20) defaultZoneConfig.GC = &zonepb.GCPolicy{TTLSeconds: 60} require.NoError(t, defaultZoneConfig.Validate()) + var params base.TestServerArgs params.Knobs.Server = &server.TestingKnobs{ DefaultZoneConfigOverride: &defaultZoneConfig, DefaultSystemZoneConfigOverride: &defaultZoneConfig, @@ -323,7 +324,6 @@ func TestGetZoneConfig(t *testing.T) { func TestCascadingZoneConfig(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() defaultZoneConfig := zonepb.DefaultZoneConfig() defaultZoneConfig.NumReplicas = proto.Int32(1) @@ -331,6 +331,7 @@ func TestCascadingZoneConfig(t *testing.T) { defaultZoneConfig.RangeMaxBytes = proto.Int64(100 << 20) defaultZoneConfig.GC = &zonepb.GCPolicy{TTLSeconds: 60} require.NoError(t, defaultZoneConfig.Validate()) + var params base.TestServerArgs params.Knobs.Server = &server.TestingKnobs{ DefaultZoneConfigOverride: &defaultZoneConfig, DefaultSystemZoneConfigOverride: &defaultZoneConfig, @@ -649,7 +650,7 @@ func BenchmarkGetZoneConfig(b *testing.B) { defer leaktest.AfterTest(b)() defer log.Scope(b).Close(b) - params, _ := createTestServerParamsAllowTenants() + var params base.TestServerArgs // GetZoneConfigForKey is exclusive to the system tenant. params.DefaultTestTenant = base.TestIsSpecificToStorageLayerAndNeedsASystemTenant s, sqlDB, _ := serverutils.StartServer(b, params) diff --git a/pkg/sql/zone_test.go b/pkg/sql/zone_test.go index aaf240636380..3de910ee9f1c 100644 --- a/pkg/sql/zone_test.go +++ b/pkg/sql/zone_test.go @@ -10,6 +10,7 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/sql/catalog/systemschema" @@ -26,8 +27,7 @@ func TestValidSetShowZones(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) sqlDB := sqlutils.MakeSQLRunner(db) @@ -260,8 +260,7 @@ func TestZoneInheritField(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) sqlDB := sqlutils.MakeSQLRunner(db) @@ -307,8 +306,7 @@ func TestInvalidSetShowZones(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - params, _ := createTestServerParamsAllowTenants() - s, db, _ := serverutils.StartServer(t, params) + s, db, _ := serverutils.StartServer(t, base.TestServerArgs{}) defer s.Stopper().Stop(context.Background()) for i, tc := range []struct {