server: don't pass full Config to SQL Server

Only pass BothConfig union SQLConfig. This is possible now thanks to the preceding commits. Release note: None
cockroachdb · May 28, 2020 · 807dc36 · 807dc36
1 parent 4f5fd84
commit 807dc36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -543,11 +543,8 @@ func NewServer(cfg Config, stopper *stop.Stopper) (*Server, error) {
 			externalStorageFromURI: externalStorageFromURI,
 			isMeta1Leaseholder:     node.stores.IsMeta1Leaseholder,
 		},
-		// NB: s.cfg has a populated AmbientContext.
-		Config: &cfg,
-		// TODO(tbg): use this once we get rid of Config
-		// SQLConfig:                &cfg.SQLConfig,
-		// BothConfig:               &cfg.BothConfig,
+		SQLConfig:                &cfg.SQLConfig,
+		BothConfig:               &cfg.BothConfig,
 		stopper:                  stopper,
 		clock:                    clock,
 		runtime:                  runtimeSampler,

diff --git a/pkg/server/server_sql.go b/pkg/server/server_sql.go
@@ -129,10 +129,8 @@ type sqlServerOptionalArgs struct {
 type sqlServerArgs struct {
 	sqlServerOptionalArgs
 
-	*Config
-	// TODO(tbg): replace Config with:
-	// *SQLConfig
-	// *BothConfig
+	*SQLConfig
+	*BothConfig
 
 	stopper *stop.Stopper
 
@@ -493,7 +491,7 @@ func newSQLServer(ctx context.Context, cfg sqlServerArgs) (*sqlServer, error) {
 	sqlMemMetrics := sql.MakeMemMetrics("sql", cfg.HistogramWindowInterval())
 	pgServer := pgwire.MakeServer(
 		cfg.AmbientCtx,
-		cfg.Config.Config,
+		cfg.Config,
 		cfg.Settings,
 		sqlMemMetrics,
 		&rootSQLMemoryMonitor,

diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go
@@ -513,9 +513,8 @@ func testSQLServerArgs(ts *TestServer) sqlServerArgs {
 				return nil, errors.New("fake external uri storage")
 			},
 		},
-		Config: &cfg,
-		// SQLConfig:                &cfg.SQLConfig,
-		// BothConfig:               &cfg.BothConfig,
+		SQLConfig:                &cfg.SQLConfig,
+		BothConfig:               &cfg.BothConfig,
 		stopper:                  stopper,
 		clock:                    clock,
 		runtime:                  status.NewRuntimeStatSampler(context.Background(), clock),
@@ -583,7 +582,7 @@ func (ts *TestServer) StartTenant(params base.TestTenantArgs) (pgAddr string, _
 
 	if err := s.start(ctx,
 		args.stopper,
-		args.Config.TestingKnobs,
+		args.TestingKnobs,
 		connManager,
 		pgL,
 		socketFile,