From e158acf06a1193b1a271d021e9c640970da774b8 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Tue, 4 Oct 2022 01:43:31 +0100 Subject: [PATCH] upgrades: remove unused struct field Release note: None --- pkg/upgrade/tenant_upgrade.go | 1 - pkg/upgrade/upgradejob/upgrade_job.go | 1 - 2 files changed, 2 deletions(-) diff --git a/pkg/upgrade/tenant_upgrade.go b/pkg/upgrade/tenant_upgrade.go index ad9045314032..773809d63f72 100644 --- a/pkg/upgrade/tenant_upgrade.go +++ b/pkg/upgrade/tenant_upgrade.go @@ -35,7 +35,6 @@ type TenantDeps struct { DB *kv.DB Codec keys.SQLCodec Settings *cluster.Settings - CollectionFactory *descs.CollectionFactory InternalExecutorFactory descs.TxnManager LeaseManager *lease.Manager JobRegistry *jobs.Registry diff --git a/pkg/upgrade/upgradejob/upgrade_job.go b/pkg/upgrade/upgradejob/upgrade_job.go index bbf8291a06f1..844d4ecbcfe9 100644 --- a/pkg/upgrade/upgradejob/upgrade_job.go +++ b/pkg/upgrade/upgradejob/upgrade_job.go @@ -92,7 +92,6 @@ func (r resumer) Resume(ctx context.Context, execCtxI interface{}) error { DB: execCtx.ExecCfg().DB, Codec: execCtx.ExecCfg().Codec, Settings: execCtx.ExecCfg().Settings, - CollectionFactory: execCtx.ExecCfg().CollectionFactory, InternalExecutorFactory: execCtx.ExecCfg().InternalExecutorFactory, LeaseManager: execCtx.ExecCfg().LeaseManager, InternalExecutor: execCtx.ExecCfg().InternalExecutor,