Skip to content

Commit 46ef42d

Browse files
committed
upgrade: remove unused SQLStats testing knobs
Release note: None
1 parent 3f64b0e commit 46ef42d

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

pkg/server/server_sql.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,6 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) {
12701270
var c upgrade.Cluster
12711271
var systemDeps upgrade.SystemDeps
12721272
keyVisKnobs, _ := cfg.TestingKnobs.KeyVisualizer.(*keyvisualizer.TestingKnobs)
1273-
sqlStatsKnobs, _ := cfg.TestingKnobs.SQLStatsKnobs.(*sqlstats.TestingKnobs)
12741273
upgradeKnobs, _ := cfg.TestingKnobs.UpgradeManager.(*upgradebase.TestingKnobs)
12751274
if codec.ForSystemTenant() {
12761275
c = upgradecluster.New(upgradecluster.ClusterConfig{
@@ -1296,7 +1295,6 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*SQLServer, error) {
12961295
JobRegistry: jobRegistry,
12971296
Stopper: cfg.stopper,
12981297
KeyVisKnobs: keyVisKnobs,
1299-
SQLStatsKnobs: sqlStatsKnobs,
13001298
TenantInfoAccessor: cfg.tenantConnect,
13011299
TestingKnobs: upgradeKnobs,
13021300
}

pkg/upgrade/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ go_library(
2828
"//pkg/sql/catalog/resolver",
2929
"//pkg/sql/isql",
3030
"//pkg/sql/sessiondata",
31-
"//pkg/sql/sqlstats",
3231
"//pkg/upgrade/upgradebase",
3332
"//pkg/util/retry",
3433
"//pkg/util/stop",

pkg/upgrade/system_upgrade.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/server/serverpb"
1919
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
2020
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
21-
"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
2221
"github.com/cockroachdb/cockroach/pkg/upgrade/upgradebase"
2322
"github.com/cockroachdb/cockroach/pkg/util/retry"
2423
"github.com/cockroachdb/cockroach/pkg/util/stop"
@@ -121,7 +120,6 @@ type SystemDeps struct {
121120
JobRegistry *jobs.Registry
122121
Stopper *stop.Stopper
123122
KeyVisKnobs *keyvisualizer.TestingKnobs
124-
SQLStatsKnobs *sqlstats.TestingKnobs
125123
TenantInfoAccessor mtinfo.ReadFromTenantInfoAccessor
126124
TestingKnobs *upgradebase.TestingKnobs
127125
}

0 commit comments

Comments
 (0)