sqlstats: rename statsProvider field to persistedSQLStats

dhartunian · dhartunian · commit d02c5afb977c · 2025-07-30T15:55:13.000-04:00
Epic: None
Release note: None
diff --git a/pkg/sql/conn_executor.go b/pkg/sql/conn_executor.go
@@ -3838,7 +3838,7 @@ func (ex *connExecutor) initEvalCtx(ctx context.Context, evalCtx *extendedEvalCo
 		TxnModesSetter:       ex,
 		jobs:                 ex.extraTxnState.jobs,
 		validateDbZoneConfig: &ex.extraTxnState.validateDbZoneConfig,
-		statsProvider:        ex.server.persistedSQLStats,
+		persistedSQLStats:    ex.server.persistedSQLStats,
 		localSQLStats:        ex.server.localSqlStats,
 		indexUsageStats:      ex.indexUsageStats,
 		statementPreparer:    ex,
diff --git a/pkg/sql/crdb_internal.go b/pkg/sql/crdb_internal.go
@@ -6934,7 +6934,7 @@ CREATE TABLE crdb_internal.cluster_statement_statistics (
 			return nil, nil, err
 		}
 
-		s := p.extendedEvalCtx.statsProvider
+		s := p.extendedEvalCtx.persistedSQLStats
 		curAggTs := s.ComputeAggregatedTs()
 		aggInterval := s.GetAggregationInterval()
 
@@ -7360,7 +7360,7 @@ CREATE TABLE crdb_internal.cluster_transaction_statistics (
 			return nil, nil, err
 		}
 
-		s := p.extendedEvalCtx.statsProvider
+		s := p.extendedEvalCtx.persistedSQLStats
 		curAggTs := s.ComputeAggregatedTs()
 		aggInterval := s.GetAggregationInterval()
 
diff --git a/pkg/sql/planner.go b/pkg/sql/planner.go
@@ -100,7 +100,7 @@ type extendedEvalContext struct {
 	// jobs refers to jobs in extraTxnState.
 	jobs *txnJobsCollection
 
-	statsProvider *persistedsqlstats.PersistedSQLStats
+	persistedSQLStats *persistedsqlstats.PersistedSQLStats
 
 	localSQLStats *sslocal.SQLStats
 
@@ -554,12 +554,12 @@ func internalExtendedEvalCtx(
 			StmtDiagnosticsRequestInserter: execCfg.StmtDiagnosticsRecorder.InsertRequest,
 			RangeStatsFetcher:              execCfg.RangeStatsFetcher,
 		},
-		Tracing:            &SessionTracing{},
-		Descs:              tables,
-		indexUsageStats:    indexUsageStats,
-		statsProvider:      sqlStatsProvider,
-		localSQLStats: localSqlStatsProvider,
-		jobs:               newTxnJobsCollection(),
+		Tracing:           &SessionTracing{},
+		Descs:             tables,
+		indexUsageStats:   indexUsageStats,
+		persistedSQLStats: sqlStatsProvider,
+		localSQLStats:     localSqlStatsProvider,
+		jobs:              newTxnJobsCollection(),
 	}
 	ret.copyFromExecCfg(execCfg)
 	return ret

Original file line number	Diff line number	Diff line change
`@@ -6934,7 +6934,7 @@ CREATE TABLE crdb_internal.cluster_statement_statistics (`
`6934`	`6934`	`return nil, nil, err`
`6935`	`6935`	`}`
`6936`	`6936`
`6937`		`- s := p.extendedEvalCtx.statsProvider`
	`6937`	`+ s := p.extendedEvalCtx.persistedSQLStats`
`6938`	`6938`	`curAggTs := s.ComputeAggregatedTs()`
`6939`	`6939`	`aggInterval := s.GetAggregationInterval()`
`6940`	`6940`
`@@ -7360,7 +7360,7 @@ CREATE TABLE crdb_internal.cluster_transaction_statistics (`
`7360`	`7360`	`return nil, nil, err`
`7361`	`7361`	`}`
`7362`	`7362`
`7363`		`- s := p.extendedEvalCtx.statsProvider`
	`7363`	`+ s := p.extendedEvalCtx.persistedSQLStats`
`7364`	`7364`	`curAggTs := s.ComputeAggregatedTs()`
`7365`	`7365`	`aggInterval := s.GetAggregationInterval()`
`7366`	`7366`