Skip to content

Commit 755f098

Browse files
yuzefovichyuzefovich
committed
sql: rename createTestServerParamsAllowTenants
We no longer need to mention anything about the tenants here. Release note: None
1 parent 7e5258b commit 755f098

35 files changed

+190
-191
lines changed

‎pkg/sql/as_of_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestAsOfTime(t *testing.T) {
3030
defer log.Scope(t).Close(t)
3131

3232
ctx, cancel := context.WithCancel(context.Background())
33-
params, _ := createTestServerParamsAllowTenants()
33+
params, _ := createTestServerParams()
3434
params.Knobs.GCJob = &sql.GCJobTestingKnobs{RunBeforeResume: func(_ jobspb.JobID) error {
3535
<-ctx.Done()
3636
return nil
@@ -263,7 +263,7 @@ func TestAsOfRetry(t *testing.T) {
263263
defer leaktest.AfterTest(t)()
264264
defer log.Scope(t).Close(t)
265265

266-
params, cmdFilters := createTestServerParamsAllowTenants()
266+
params, cmdFilters := createTestServerParams()
267267
s, sqlDB, _ := serverutils.StartServer(t, params)
268268
defer s.Stopper().Stop(context.Background())
269269

‎pkg/sql/comment_on_column_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ func runCommentOnTestsDeclarativeOnly(t *testing.T, testFunc func(db *gosql.DB))
225225
}
226226

227227
func runOneCommentOnTest(t *testing.T, setupQuery string, testFunc func(db *gosql.DB)) {
228-
params, _ := createTestServerParamsAllowTenants()
228+
params, _ := createTestServerParams()
229229
s, db, _ := serverutils.StartServer(t, params)
230230
defer s.Stopper().Stop(context.Background())
231231
_, err := db.Exec(setupQuery)

‎pkg/sql/conn_executor_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestSessionFinishRollsBackTxn(t *testing.T) {
7777
defer log.Scope(t).Close(t)
7878
aborter := NewTxnAborter()
7979
defer aborter.Close(t)
80-
params, _ := createTestServerParamsAllowTenants()
80+
params, _ := createTestServerParams()
8181
params.Knobs.SQLExecutor = aborter.executorKnobs()
8282
srv, mainDB, _ := serverutils.StartServer(t, params)
8383
defer srv.Stopper().Stop(context.Background())
@@ -369,7 +369,7 @@ func TestHalloweenProblemAvoidance(t *testing.T) {
369369
defer mutations.ResetMaxBatchSizeForTests()
370370
numRows := smallerKvBatchSize + smallerInsertBatchSize + 10
371371

372-
params, _ := createTestServerParamsAllowTenants()
372+
params, _ := createTestServerParams()
373373
params.Insecure = true
374374
params.Knobs.DistSQL = &execinfra.TestingKnobs{
375375
TableReaderBatchBytesLimit: 10,
@@ -440,7 +440,7 @@ func TestAppNameStatisticsInitialization(t *testing.T) {
440440
defer leaktest.AfterTest(t)()
441441
defer log.Scope(t).Close(t)
442442

443-
params, _ := createTestServerParamsAllowTenants()
443+
params, _ := createTestServerParams()
444444
params.Insecure = true
445445

446446
s := serverutils.StartServerOnly(t, params)

‎pkg/sql/crdb_internal_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestGetAllNamesInternal(t *testing.T) {
8383
defer log.Scope(t).Close(t)
8484

8585
ctx := context.Background()
86-
params, _ := createTestServerParamsAllowTenants()
86+
params, _ := createTestServerParams()
8787

8888
s, _ /* sqlDB */, kvDB := serverutils.StartServer(t, params)
8989
defer s.Stopper().Stop(ctx)
@@ -169,7 +169,7 @@ func TestGossipAlertsTable(t *testing.T) {
169169
defer leaktest.AfterTest(t)()
170170
defer log.Scope(t).Close(t)
171171

172-
params, _ := createTestServerParamsAllowTenants()
172+
params, _ := createTestServerParams()
173173
s := serverutils.StartServerOnly(t, params)
174174
defer s.Stop(context.Background())
175175
ctx := context.Background()
@@ -210,7 +210,7 @@ func TestOldBitColumnMetadata(t *testing.T) {
210210
defer log.Scope(t).Close(t)
211211

212212
ctx := context.Background()
213-
params, _ := createTestServerParamsAllowTenants()
213+
params, _ := createTestServerParams()
214214
s, sqlDB, kvDB := serverutils.StartServer(t, params)
215215
defer s.Stopper().Stop(ctx)
216216

@@ -428,7 +428,7 @@ func TestInvalidObjects(t *testing.T) {
428428
defer log.Scope(t).Close(t)
429429

430430
ctx := context.Background()
431-
params, _ := createTestServerParamsAllowTenants()
431+
params, _ := createTestServerParams()
432432
params.Knobs = base.TestingKnobs{
433433
Store: &kvserver.StoreTestingKnobs{
434434
DisableMergeQueue: true,

‎pkg/sql/create_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func TestParallelCreateConflictingTables(t *testing.T) {
244244
func TestTableReadErrorsBeforeTableCreation(t *testing.T) {
245245
defer leaktest.AfterTest(t)()
246246
defer log.Scope(t).Close(t)
247-
params, _ := createTestServerParamsAllowTenants()
247+
params, _ := createTestServerParams()
248248
s, sqlDB, _ := serverutils.StartServer(t, params)
249249
defer s.Stopper().Stop(context.Background())
250250

‎pkg/sql/delete_preserving_index_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import (
5757
func TestDeletePreservingIndexEncoding(t *testing.T) {
5858
defer leaktest.AfterTest(t)()
5959
defer log.Scope(t).Close(t)
60-
params, _ := createTestServerParamsAllowTenants()
60+
params, _ := createTestServerParams()
6161
mergeFinished := make(chan struct{})
6262
completeSchemaChange := make(chan struct{})
6363
errorChan := make(chan error, 1)
@@ -246,7 +246,7 @@ func TestDeletePreservingIndexEncodingUsesNormalDeletesInDeleteOnly(t *testing.T
246246
defer leaktest.AfterTest(t)()
247247
defer log.Scope(t).Close(t)
248248

249-
params, _ := createTestServerParamsAllowTenants()
249+
params, _ := createTestServerParams()
250250
server, sqlDB, kvDB := serverutils.StartServer(t, params)
251251
defer server.Stopper().Stop(context.Background())
252252

@@ -311,7 +311,7 @@ func TestDeletePreservingIndexEncodingWithEmptyValues(t *testing.T) {
311311
defer leaktest.AfterTest(t)()
312312
defer log.Scope(t).Close(t)
313313

314-
params, _ := createTestServerParamsAllowTenants()
314+
params, _ := createTestServerParams()
315315
server, sqlDB, kvDB := serverutils.StartServer(t, params)
316316
defer server.Stopper().Stop(context.Background())
317317

@@ -515,7 +515,7 @@ func TestMergeProcessor(t *testing.T) {
515515
defer log.Scope(t).Close(t)
516516
ctx := context.Background()
517517

518-
params, _ := createTestServerParamsAllowTenants()
518+
params, _ := createTestServerParams()
519519

520520
type TestCase struct {
521521
name string

‎pkg/sql/descriptor_mutation_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func TestUpsertWithColumnMutationAndNotNullDefault(t *testing.T) {
166166
// table descriptor but don't do anything, which is what we want.
167167

168168
// Disable external processing of mutations.
169-
params, _ := createTestServerParamsAllowTenants()
169+
params, _ := createTestServerParams()
170170
server, sqlDB, kvDB := serverutils.StartServer(t, params)
171171
ctx := context.Background()
172172
defer server.Stopper().Stop(ctx)
@@ -227,7 +227,7 @@ func TestOperationsWithColumnMutation(t *testing.T) {
227227

228228
// Disable external processing of mutations.
229229
ctx := context.Background()
230-
params, _ := createTestServerParamsAllowTenants()
230+
params, _ := createTestServerParams()
231231
server, sqlDB, kvDB := serverutils.StartServer(t, params)
232232
defer server.Stopper().Stop(ctx)
233233
sqlRunner := sqlutils.MakeSQLRunner(sqlDB)
@@ -495,7 +495,7 @@ func TestOperationsWithIndexMutation(t *testing.T) {
495495
// table descriptor but don't do anything, which is what we want.
496496

497497
// Disable external processing of mutations.
498-
params, _ := createTestServerParamsAllowTenants()
498+
params, _ := createTestServerParams()
499499
server, sqlDB, kvDB := serverutils.StartServer(t, params)
500500
defer server.Stopper().Stop(context.Background())
501501
sqlRunner := sqlutils.MakeSQLRunner(sqlDB)
@@ -661,7 +661,7 @@ func TestOperationsWithColumnAndIndexMutation(t *testing.T) {
661661
// no job associated with the added mutations, those mutations stay on the
662662
// table descriptor but don't do anything, which is what we want.
663663

664-
params, _ := createTestServerParamsAllowTenants()
664+
params, _ := createTestServerParams()
665665
server, sqlDB, kvDB := serverutils.StartServer(t, params)
666666
ctx := context.Background()
667667
defer server.Stopper().Stop(ctx)
@@ -877,7 +877,7 @@ func TestSchemaChangeCommandsWithPendingMutations(t *testing.T) {
877877
defer leaktest.AfterTest(t)()
878878
defer log.Scope(t).Close(t)
879879
// Disable external processing of mutations.
880-
params, _ := createTestServerParamsAllowTenants()
880+
params, _ := createTestServerParams()
881881
params.Knobs = base.TestingKnobs{
882882
SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{
883883
SchemaChangeJobNoOp: func() bool {
@@ -1101,7 +1101,7 @@ func TestTableMutationQueue(t *testing.T) {
11011101
defer log.Scope(t).Close(t)
11021102
// Disable synchronous and asynchronous schema change processing so that
11031103
// the mutations get queued up.
1104-
params, _ := createTestServerParamsAllowTenants()
1104+
params, _ := createTestServerParams()
11051105
params.Knobs = base.TestingKnobs{
11061106
SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{
11071107
SchemaChangeJobNoOp: func() bool {
@@ -1218,7 +1218,7 @@ func TestAddingFKs(t *testing.T) {
12181218
defer leaktest.AfterTest(t)()
12191219
defer log.Scope(t).Close(t)
12201220

1221-
params, _ := createTestServerParamsAllowTenants()
1221+
params, _ := createTestServerParams()
12221222
s, sqlDB, kvDB := serverutils.StartServer(t, params)
12231223
defer s.Stopper().Stop(context.Background())
12241224

‎pkg/sql/drop_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func descExists(sqlDB *gosql.DB, exists bool, id descpb.ID) error {
101101
func TestDropDatabase(t *testing.T) {
102102
defer leaktest.AfterTest(t)()
103103
defer log.Scope(t).Close(t)
104-
params, _ := createTestServerParamsAllowTenants()
104+
params, _ := createTestServerParams()
105105
ctx, cancel := context.WithCancel(context.Background())
106106
params.Knobs.GCJob = &sql.GCJobTestingKnobs{
107107
RunBeforeResume: func(jobID jobspb.JobID) error {
@@ -262,7 +262,7 @@ CREATE DATABASE t;
262262
func TestDropDatabaseDeleteData(t *testing.T) {
263263
defer leaktest.AfterTest(t)()
264264
defer log.Scope(t).Close(t)
265-
params, _ := createTestServerParamsAllowTenants()
265+
params, _ := createTestServerParams()
266266
params.DefaultTestTenant = base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(156127)
267267
// Speed up mvcc queue scan.
268268
params.ScanMaxIdleTime = time.Millisecond
@@ -446,7 +446,7 @@ func TestDropIndex(t *testing.T) {
446446
defer log.Scope(t).Close(t)
447447

448448
const chunkSize = 200
449-
params, _ := createTestServerParamsAllowTenants()
449+
params, _ := createTestServerParams()
450450
params.Knobs = base.TestingKnobs{
451451
SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{
452452
BackfillChunkSize: chunkSize,
@@ -561,7 +561,7 @@ func TestDropIndexWithZoneConfigOSS(t *testing.T) {
561561
const chunkSize = 200
562562
const numRows = 2*chunkSize + 1
563563

564-
params, _ := createTestServerParamsAllowTenants()
564+
params, _ := createTestServerParams()
565565
params.Knobs = base.TestingKnobs{
566566
SQLSchemaChanger: &sql.SchemaChangerTestingKnobs{BackfillChunkSize: chunkSize},
567567
}
@@ -626,7 +626,7 @@ func TestDropTable(t *testing.T) {
626626
defer leaktest.AfterTest(t)()
627627
defer log.Scope(t).Close(t)
628628

629-
params, _ := createTestServerParamsAllowTenants()
629+
params, _ := createTestServerParams()
630630
ctx, cancel := context.WithCancel(context.Background())
631631
params.Knobs.GCJob = &sql.GCJobTestingKnobs{
632632
RunBeforeResume: func(jobID jobspb.JobID) error {
@@ -729,7 +729,7 @@ func TestDropTable(t *testing.T) {
729729
func TestDropTableDeleteData(t *testing.T) {
730730
defer leaktest.AfterTest(t)()
731731
defer log.Scope(t).Close(t)
732-
params, _ := createTestServerParamsAllowTenants()
732+
params, _ := createTestServerParams()
733733
// Speed up mvcc queue scan.
734734
params.ScanMaxIdleTime = time.Millisecond
735735

@@ -891,7 +891,7 @@ func TestDropTableWhileUpgradingFormat(t *testing.T) {
891891

892892
ctx := context.Background()
893893

894-
params, _ := createTestServerParamsAllowTenants()
894+
params, _ := createTestServerParams()
895895
params.ScanMaxIdleTime = time.Millisecond
896896
srv, sqlDBRaw, kvDB := serverutils.StartServer(t, params)
897897
defer srv.Stopper().Stop(ctx)
@@ -970,7 +970,7 @@ func TestDropTableWhileUpgradingFormat(t *testing.T) {
970970
func TestDropTableInTxn(t *testing.T) {
971971
defer leaktest.AfterTest(t)()
972972
defer log.Scope(t).Close(t)
973-
params, _ := createTestServerParamsAllowTenants()
973+
params, _ := createTestServerParams()
974974
s, sqlDB, _ := serverutils.StartServer(t, params)
975975
defer s.Stopper().Stop(context.Background())
976976

@@ -1010,7 +1010,7 @@ CREATE TABLE t.kv (k CHAR PRIMARY KEY, v CHAR);
10101010
func TestDropAndCreateTable(t *testing.T) {
10111011
defer leaktest.AfterTest(t)()
10121012
defer log.Scope(t).Close(t)
1013-
params, _ := createTestServerParamsAllowTenants()
1013+
params, _ := createTestServerParams()
10141014
params.UseDatabase = "test"
10151015
s, db, _ := serverutils.StartServer(t, params)
10161016
defer s.Stopper().Stop(context.Background())
@@ -1054,7 +1054,7 @@ func TestCommandsWhileTableBeingDropped(t *testing.T) {
10541054
defer leaktest.AfterTest(t)()
10551055
defer log.Scope(t).Close(t)
10561056

1057-
params, _ := createTestServerParamsAllowTenants()
1057+
params, _ := createTestServerParams()
10581058
// Block schema changers so that the table we're about to DROP is not
10591059
// actually dropped; it will be left in the "deleted" state.
10601060
params.Knobs = base.TestingKnobs{
@@ -1249,7 +1249,7 @@ func TestDropIndexOnHashShardedIndexWithStoredShardColumn(t *testing.T) {
12491249

12501250
// Start a test server and connect to it with notice handler (so we can get and check notices from running queries).
12511251
ctx := context.Background()
1252-
params, _ := createTestServerParamsAllowTenants()
1252+
params, _ := createTestServerParams()
12531253
srv := serverutils.StartServerOnly(t, params)
12541254
defer srv.Stopper().Stop(ctx)
12551255

@@ -1333,7 +1333,7 @@ func TestDropIndexOnHashShardedIndexWithStoredShardColumn(t *testing.T) {
13331333
func TestDropDatabaseWithForeignKeys(t *testing.T) {
13341334
defer leaktest.AfterTest(t)()
13351335
defer log.Scope(t).Close(t)
1336-
params, _ := createTestServerParamsAllowTenants()
1336+
params, _ := createTestServerParams()
13371337
srv, sqlDB, kvDB := serverutils.StartServer(t, params)
13381338
defer srv.Stopper().Stop(context.Background())
13391339

@@ -1393,7 +1393,7 @@ ORDER BY
13931393
func TestDropPhysicalTableGC(t *testing.T) {
13941394
defer leaktest.AfterTest(t)()
13951395
defer log.Scope(t).Close(t)
1396-
params, _ := createTestServerParamsAllowTenants()
1396+
params, _ := createTestServerParams()
13971397

13981398
s, sqlDB, kvDB := serverutils.StartServer(t, params)
13991399
defer s.Stopper().Stop(context.Background())

‎pkg/sql/err_count_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestErrorCounts(t *testing.T) {
2525

2626
telemetry.GetFeatureCounts(telemetry.Raw, telemetry.ResetCounts)
2727

28-
params, _ := createTestServerParamsAllowTenants()
28+
params, _ := createTestServerParams()
2929
s, db, _ := serverutils.StartServer(t, params)
3030
defer s.Stopper().Stop(context.Background())
3131

@@ -69,7 +69,7 @@ func TestTransactionRetryErrorCounts(t *testing.T) {
6969
// in pgwire (pgwire.convertToErrWithPGCode). Make sure we're
7070
// reporting errors at a level that allows this code to be recorded.
7171

72-
params, _ := createTestServerParamsAllowTenants()
72+
params, _ := createTestServerParams()
7373
s, db, _ := serverutils.StartServer(t, params)
7474
defer s.Stopper().Stop(context.Background())
7575

‎pkg/sql/explain_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ func TestExplainRedact(t *testing.T) {
540540
rng, seed := randutil.NewTestRand()
541541
t.Log("seed:", seed)
542542

543-
params, _ := createTestServerParamsAllowTenants()
543+
params, _ := createTestServerParams()
544544
srv, sqlDB, _ := serverutils.StartServer(t, params)
545545
defer srv.Stopper().Stop(ctx)
546546

0 commit comments

Comments
 (0)