@@ -336,8 +336,8 @@ type Server struct {
336
336
337
337
cfg * ExecutorConfig
338
338
339
- // sqlStats provides the mechanisms for writing sql stats to system tables.
340
- sqlStats * persistedsqlstats.PersistedSQLStats
339
+ // persistedSQLStats provides the mechanisms for writing sql stats to system tables.
340
+ persistedSQLStats * persistedsqlstats.PersistedSQLStats
341
341
342
342
// localSqlStats tracks per-application statistics for all applications on each
343
343
// node. Newly collected statistics flow into localSqlStats.
@@ -438,7 +438,7 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
438
438
metrics := makeMetrics (false /* internal */ , & cfg .Settings .SV )
439
439
serverMetrics := makeServerMetrics (cfg )
440
440
insightsProvider := insights .New (cfg .Settings , serverMetrics .InsightsMetrics )
441
- reportedSQLStats := sslocal .New (
441
+ reportedSQLStats := sslocal .NewSQLStats (
442
442
cfg .Settings ,
443
443
sqlstats .MaxMemReportedSQLStatsStmtFingerprints ,
444
444
sqlstats .MaxMemReportedSQLStatsTxnFingerprints ,
@@ -448,7 +448,7 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
448
448
nil , /* reportedProvider */
449
449
cfg .SQLStatsTestingKnobs ,
450
450
)
451
- memSQLStats := sslocal .New (
451
+ localSQLStats := sslocal .NewSQLStats (
452
452
cfg .Settings ,
453
453
sqlstats .MaxMemSQLStatsStmtFingerprints ,
454
454
sqlstats .MaxMemSQLStatsTxnFingerprints ,
@@ -471,7 +471,7 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
471
471
InternalMetrics : makeMetrics (true /* internal */ , & cfg .Settings .SV ),
472
472
ServerMetrics : serverMetrics ,
473
473
pool : pool ,
474
- localSqlStats : memSQLStats ,
474
+ localSqlStats : localSQLStats ,
475
475
reportedStats : reportedSQLStats ,
476
476
sqlStatsIngester : sqlStatsIngester ,
477
477
insights : insightsProvider ,
@@ -508,9 +508,9 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
508
508
FlushedFingerprintCount : serverMetrics .StatsMetrics .SQLStatsFlushFingerprintCount ,
509
509
FlushesFailed : serverMetrics .StatsMetrics .SQLStatsFlushesFailed ,
510
510
FlushLatency : serverMetrics .StatsMetrics .SQLStatsFlushLatency ,
511
- }, memSQLStats )
511
+ }, localSQLStats )
512
512
513
- s .sqlStats = persistedSQLStats
513
+ s .persistedSQLStats = persistedSQLStats
514
514
schemaTelemetryIEMonitor := MakeInternalExecutorMemMonitor (MemoryMetrics {}, s .GetExecutorConfig ().Settings )
515
515
schemaTelemetryIEMonitor .StartNoReserved (context .Background (), s .GetBytesMonitor ())
516
516
s .schemaTelemetryController = schematelemetrycontroller .NewController (
@@ -684,7 +684,7 @@ func (s *Server) Start(ctx context.Context, stopper *stop.Stopper) {
684
684
ctx = multitenant .WithTenantCostControlExemption (ctx )
685
685
686
686
s .sqlStatsIngester .Start (ctx , stopper )
687
- s .sqlStats .Start (ctx , stopper )
687
+ s .persistedSQLStats .Start (ctx , stopper )
688
688
689
689
s .schemaTelemetryController .Start (ctx , stopper )
690
690
@@ -716,7 +716,7 @@ func (s *Server) GetInsightsReader() *insights.LockingStore {
716
716
717
717
// GetSQLStatsProvider returns the provider for the sqlstats subsystem.
718
718
func (s * Server ) GetSQLStatsProvider () * persistedsqlstats.PersistedSQLStats {
719
- return s .sqlStats
719
+ return s .persistedSQLStats
720
720
}
721
721
722
722
// GetLocalSQLStatsProvider returns the in-memory provider for the sqlstats subsystem.
@@ -3817,7 +3817,7 @@ func (ex *connExecutor) initEvalCtx(ctx context.Context, evalCtx *extendedEvalCo
3817
3817
SessionDataStack : ex .sessionDataStack ,
3818
3818
ReCache : ex .server .reCache ,
3819
3819
ToCharFormatCache : ex .server .toCharFormatCache ,
3820
- SQLStatsController : ex .server .sqlStats ,
3820
+ SQLStatsController : ex .server .persistedSQLStats ,
3821
3821
SchemaTelemetryController : ex .server .schemaTelemetryController ,
3822
3822
IndexUsageStatsController : ex .server .indexUsageStatsController ,
3823
3823
ConsistencyChecker : p .execCfg .ConsistencyChecker ,
@@ -3838,8 +3838,8 @@ func (ex *connExecutor) initEvalCtx(ctx context.Context, evalCtx *extendedEvalCo
3838
3838
TxnModesSetter : ex ,
3839
3839
jobs : ex .extraTxnState .jobs ,
3840
3840
validateDbZoneConfig : & ex .extraTxnState .validateDbZoneConfig ,
3841
- statsProvider : ex .server .sqlStats ,
3842
- localStatsProvider : ex .server .localSqlStats ,
3841
+ persistedSQLStats : ex .server .persistedSQLStats ,
3842
+ localSQLStats : ex .server .localSqlStats ,
3843
3843
indexUsageStats : ex .indexUsageStats ,
3844
3844
statementPreparer : ex ,
3845
3845
}
0 commit comments