Skip to content

Commit ce7309e

Browse files
craig[bot]dhartunian
andcommitted
Merge #151069
151069: sqlstats: rename constructors and fields for legibility r=dhartunian a=dhartunian rename sslocal.New to NewSQLStats rename sqlStats field to persistedSQLStats rename localStatsProvider to localSQLStats rename statsProvider field to persistedSQLStats Epic: None Release note: None Co-authored-by: David Hartunian <[email protected]>
2 parents 2a7b3c3 + d02c5af commit ce7309e

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

pkg/sql/conn_executor.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ type Server struct {
336336

337337
cfg *ExecutorConfig
338338

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
341341

342342
// localSqlStats tracks per-application statistics for all applications on each
343343
// node. Newly collected statistics flow into localSqlStats.
@@ -438,7 +438,7 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
438438
metrics := makeMetrics(false /* internal */, &cfg.Settings.SV)
439439
serverMetrics := makeServerMetrics(cfg)
440440
insightsProvider := insights.New(cfg.Settings, serverMetrics.InsightsMetrics)
441-
reportedSQLStats := sslocal.New(
441+
reportedSQLStats := sslocal.NewSQLStats(
442442
cfg.Settings,
443443
sqlstats.MaxMemReportedSQLStatsStmtFingerprints,
444444
sqlstats.MaxMemReportedSQLStatsTxnFingerprints,
@@ -448,7 +448,7 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
448448
nil, /* reportedProvider */
449449
cfg.SQLStatsTestingKnobs,
450450
)
451-
memSQLStats := sslocal.New(
451+
localSQLStats := sslocal.NewSQLStats(
452452
cfg.Settings,
453453
sqlstats.MaxMemSQLStatsStmtFingerprints,
454454
sqlstats.MaxMemSQLStatsTxnFingerprints,
@@ -471,7 +471,7 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
471471
InternalMetrics: makeMetrics(true /* internal */, &cfg.Settings.SV),
472472
ServerMetrics: serverMetrics,
473473
pool: pool,
474-
localSqlStats: memSQLStats,
474+
localSqlStats: localSQLStats,
475475
reportedStats: reportedSQLStats,
476476
sqlStatsIngester: sqlStatsIngester,
477477
insights: insightsProvider,
@@ -508,9 +508,9 @@ func NewServer(cfg *ExecutorConfig, pool *mon.BytesMonitor) *Server {
508508
FlushedFingerprintCount: serverMetrics.StatsMetrics.SQLStatsFlushFingerprintCount,
509509
FlushesFailed: serverMetrics.StatsMetrics.SQLStatsFlushesFailed,
510510
FlushLatency: serverMetrics.StatsMetrics.SQLStatsFlushLatency,
511-
}, memSQLStats)
511+
}, localSQLStats)
512512

513-
s.sqlStats = persistedSQLStats
513+
s.persistedSQLStats = persistedSQLStats
514514
schemaTelemetryIEMonitor := MakeInternalExecutorMemMonitor(MemoryMetrics{}, s.GetExecutorConfig().Settings)
515515
schemaTelemetryIEMonitor.StartNoReserved(context.Background(), s.GetBytesMonitor())
516516
s.schemaTelemetryController = schematelemetrycontroller.NewController(
@@ -684,7 +684,7 @@ func (s *Server) Start(ctx context.Context, stopper *stop.Stopper) {
684684
ctx = multitenant.WithTenantCostControlExemption(ctx)
685685

686686
s.sqlStatsIngester.Start(ctx, stopper)
687-
s.sqlStats.Start(ctx, stopper)
687+
s.persistedSQLStats.Start(ctx, stopper)
688688

689689
s.schemaTelemetryController.Start(ctx, stopper)
690690

@@ -716,7 +716,7 @@ func (s *Server) GetInsightsReader() *insights.LockingStore {
716716

717717
// GetSQLStatsProvider returns the provider for the sqlstats subsystem.
718718
func (s *Server) GetSQLStatsProvider() *persistedsqlstats.PersistedSQLStats {
719-
return s.sqlStats
719+
return s.persistedSQLStats
720720
}
721721

722722
// GetLocalSQLStatsProvider returns the in-memory provider for the sqlstats subsystem.
@@ -3817,7 +3817,7 @@ func (ex *connExecutor) initEvalCtx(ctx context.Context, evalCtx *extendedEvalCo
38173817
SessionDataStack: ex.sessionDataStack,
38183818
ReCache: ex.server.reCache,
38193819
ToCharFormatCache: ex.server.toCharFormatCache,
3820-
SQLStatsController: ex.server.sqlStats,
3820+
SQLStatsController: ex.server.persistedSQLStats,
38213821
SchemaTelemetryController: ex.server.schemaTelemetryController,
38223822
IndexUsageStatsController: ex.server.indexUsageStatsController,
38233823
ConsistencyChecker: p.execCfg.ConsistencyChecker,
@@ -3838,8 +3838,8 @@ func (ex *connExecutor) initEvalCtx(ctx context.Context, evalCtx *extendedEvalCo
38383838
TxnModesSetter: ex,
38393839
jobs: ex.extraTxnState.jobs,
38403840
validateDbZoneConfig: &ex.extraTxnState.validateDbZoneConfig,
3841-
statsProvider: ex.server.sqlStats,
3842-
localStatsProvider: ex.server.localSqlStats,
3841+
persistedSQLStats: ex.server.persistedSQLStats,
3842+
localSQLStats: ex.server.localSqlStats,
38433843
indexUsageStats: ex.indexUsageStats,
38443844
statementPreparer: ex,
38453845
}

pkg/sql/crdb_internal.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@ CREATE TABLE crdb_internal.node_statement_statistics (
14931493
}
14941494

14951495
var alloc tree.DatumAlloc
1496-
localSqlStats := p.extendedEvalCtx.localStatsProvider
1496+
localSqlStats := p.extendedEvalCtx.localSQLStats
14971497
nodeID, _ := p.execCfg.NodeInfo.NodeID.OptionalNodeID() // zero if not available
14981498

14991499
statementVisitor := func(_ context.Context, stats *appstatspb.CollectedStatementStatistics) error {
@@ -1716,7 +1716,7 @@ CREATE TABLE crdb_internal.node_transaction_statistics (
17161716
return noViewActivityOrViewActivityRedactedRoleError(p.User())
17171717
}
17181718

1719-
localMemSqlStats := p.extendedEvalCtx.localStatsProvider
1719+
localMemSqlStats := p.extendedEvalCtx.localSQLStats
17201720
nodeID, _ := p.execCfg.NodeInfo.NodeID.OptionalNodeID() // zero if not available
17211721

17221722
var alloc tree.DatumAlloc
@@ -1818,7 +1818,7 @@ CREATE TABLE crdb_internal.node_txn_stats (
18181818
return err
18191819
}
18201820

1821-
localMemSqlStats := p.extendedEvalCtx.localStatsProvider
1821+
localMemSqlStats := p.extendedEvalCtx.localSQLStats
18221822
nodeID, _ := p.execCfg.NodeInfo.NodeID.OptionalNodeID() // zero if not available
18231823

18241824
appTxnStatsVisitor := func(appName string, stats *appstatspb.TxnStats) error {
@@ -6934,7 +6934,7 @@ CREATE TABLE crdb_internal.cluster_statement_statistics (
69346934
return nil, nil, err
69356935
}
69366936

6937-
s := p.extendedEvalCtx.statsProvider
6937+
s := p.extendedEvalCtx.persistedSQLStats
69386938
curAggTs := s.ComputeAggregatedTs()
69396939
aggInterval := s.GetAggregationInterval()
69406940

@@ -7360,7 +7360,7 @@ CREATE TABLE crdb_internal.cluster_transaction_statistics (
73607360
return nil, nil, err
73617361
}
73627362

7363-
s := p.extendedEvalCtx.statsProvider
7363+
s := p.extendedEvalCtx.persistedSQLStats
73647364
curAggTs := s.ComputeAggregatedTs()
73657365
aggInterval := s.GetAggregationInterval()
73667366

pkg/sql/planner.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ type extendedEvalContext struct {
100100
// jobs refers to jobs in extraTxnState.
101101
jobs *txnJobsCollection
102102

103-
statsProvider *persistedsqlstats.PersistedSQLStats
103+
persistedSQLStats *persistedsqlstats.PersistedSQLStats
104104

105-
localStatsProvider *sslocal.SQLStats
105+
localSQLStats *sslocal.SQLStats
106106

107107
indexUsageStats *idxusage.LocalIndexUsageStats
108108

@@ -522,7 +522,7 @@ func internalExtendedEvalCtx(
522522
if ief.server != nil {
523523
indexUsageStats = ief.server.indexUsageStats
524524
schemaTelemetryController = ief.server.schemaTelemetryController
525-
sqlStatsProvider = ief.server.sqlStats
525+
sqlStatsProvider = ief.server.persistedSQLStats
526526
localSqlStatsProvider = ief.server.localSqlStats
527527
} else {
528528
// If the indexUsageStats is nil from the sql.Server, we create a dummy
@@ -554,12 +554,12 @@ func internalExtendedEvalCtx(
554554
StmtDiagnosticsRequestInserter: execCfg.StmtDiagnosticsRecorder.InsertRequest,
555555
RangeStatsFetcher: execCfg.RangeStatsFetcher,
556556
},
557-
Tracing: &SessionTracing{},
558-
Descs: tables,
559-
indexUsageStats: indexUsageStats,
560-
statsProvider: sqlStatsProvider,
561-
localStatsProvider: localSqlStatsProvider,
562-
jobs: newTxnJobsCollection(),
557+
Tracing: &SessionTracing{},
558+
Descs: tables,
559+
indexUsageStats: indexUsageStats,
560+
persistedSQLStats: sqlStatsProvider,
561+
localSQLStats: localSqlStatsProvider,
562+
jobs: newTxnJobsCollection(),
563563
}
564564
ret.copyFromExecCfg(execCfg)
565565
return ret

pkg/sql/sql_activity_update_job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (j *sqlActivityUpdateJob) Resume(ctx context.Context, execCtxI interface{})
9595
execCtx := execCtxI.(JobExecContext)
9696
stopper := execCtx.ExecCfg().DistSQLSrv.Stopper
9797
settings := execCtx.ExecCfg().Settings
98-
statsFlush := execCtx.ExecCfg().InternalDB.server.sqlStats
98+
statsFlush := execCtx.ExecCfg().InternalDB.server.persistedSQLStats
9999
metrics := execCtx.ExecCfg().JobRegistry.MetricsStruct().JobSpecificMetrics[jobspb.TypeAutoUpdateSQLActivity].(ActivityUpdaterMetrics)
100100

101101
flushDoneSignal := make(chan struct{})

pkg/sql/sqlstats/sslocal/sql_stats_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func TestExplicitTxnFingerprintAccounting(t *testing.T) {
452452
Settings: st,
453453
})
454454

455-
sqlStats := sslocal.New(
455+
sqlStats := sslocal.NewSQLStats(
456456
st,
457457
sqlstats.MaxMemSQLStatsStmtFingerprints,
458458
sqlstats.MaxMemSQLStatsTxnFingerprints,
@@ -583,7 +583,7 @@ func TestAssociatingStmtStatsWithTxnFingerprint(t *testing.T) {
583583
require.NoError(t, err)
584584

585585
// Construct the SQL Stats machinery.
586-
sqlStats := sslocal.New(
586+
sqlStats := sslocal.NewSQLStats(
587587
st,
588588
sqlstats.MaxMemSQLStatsStmtFingerprints,
589589
sqlstats.MaxMemSQLStatsTxnFingerprints,
@@ -2071,7 +2071,7 @@ func createNewSqlStats() *sslocal.SQLStats {
20712071
})
20722072
sqlstats.MaxMemSQLStatsStmtFingerprints.Override(context.Background(), &st.SV, 100000)
20732073
sqlstats.MaxMemSQLStatsTxnFingerprints.Override(context.Background(), &st.SV, 100000)
2074-
sqlStats := sslocal.New(
2074+
sqlStats := sslocal.NewSQLStats(
20752075
st,
20762076
sqlstats.MaxMemSQLStatsStmtFingerprints,
20772077
sqlstats.MaxMemSQLStatsTxnFingerprints,

pkg/sql/sqlstats/sslocal/sslocal_provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"github.com/cockroachdb/errors"
2424
)
2525

26-
// New returns an instance of SQLStats.
27-
func New(
26+
// NewSQLStats returns an instance of SQLStats.
27+
func NewSQLStats(
2828
settings *cluster.Settings,
2929
maxStmtFingerprints *settings.IntSetting,
3030
maxTxnFingerprints *settings.IntSetting,

0 commit comments

Comments
 (0)