Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbdbd3d9

Browse files
committed
pgstat: stats collector references in comments.
Soon the stats collector will be no more, with statistics instead gettingstored in shared memory. There are a lot of references to the stats collectorin comments. This commit replaces most of these references with "cumulativestatistics system", with the remaining ones getting replaced as part ofsubsequent commits.This is done separately from the - quite large - shared memory statisticspatch to make review easier.Author: Andres Freund <andres@anarazel.de>Reviewed-By: Justin Pryzby <pryzby@telsasoft.com>Reviewed-By: Thomas Munro <thomas.munro@gmail.com>Reviewed-By: Kyotaro Horiguchi <horikyota.ntt@gmail.com>Discussion:https://postgr.es/m/20220303021600.hs34ghqcw6zcokdh@alap3.anarazel.deDiscussion:https://postgr.es/m/20220308205351.2xcn6k4x5yivcxyd@alap3.anarazel.de
1 parentab62a64 commitbdbd3d9

31 files changed

+95
-107
lines changed

‎contrib/test_decoding/t/001_repl_stats.pl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ sub test_slot_stats
8888
# Test to remove one of the replication slots and adjust
8989
# max_replication_slots accordingly to the number of slots. This leads
9090
# to a mismatch between the number of slots present in the stats file and the
91-
# number of stats present in the shared memory, simulating the scenario for
92-
# drop slot message lost by the statistics collector process. We verify
91+
# number of stats present in shared memory. We verify
9392
# replication statistics data is fine after restart.
9493

9594
$node->stop;

‎src/backend/access/heap/heapam_handler.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,8 +1089,8 @@ heapam_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin,
10891089
* our own. In this case we should count and sample the row,
10901090
* to accommodate users who load a table and analyze it in one
10911091
* transaction. (pgstat_report_analyze has to adjust the
1092-
* numbers wesend to the statscollector to make this come
1093-
* out right.)
1092+
* numbers wereport to thecumulativestatssystem to make
1093+
*this comeout right.)
10941094
*/
10951095
if (TransactionIdIsCurrentTransactionId(HeapTupleHeaderGetXmin(targtuple->t_data)))
10961096
{

‎src/backend/access/heap/vacuumlazy.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,9 +609,9 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
609609
&frozenxid_updated,&minmulti_updated, false);
610610

611611
/*
612-
* Report results to the statscollector, too.
612+
* Report results to thecumulativestatssystem, too.
613613
*
614-
* Deliberately avoid telling the statscollector about LP_DEAD items that
614+
* Deliberately avoid telling the statssystem about LP_DEAD items that
615615
* remain in the table due to VACUUM bypassing index and heap vacuuming.
616616
* ANALYZE will consider the remaining LP_DEAD items to be dead "tuples".
617617
* It seems like a good idea to err on the side of not vacuuming again too
@@ -2228,10 +2228,10 @@ lazy_vacuum(LVRelState *vacrel)
22282228
* dead_items space is not CPU cache resident.
22292229
*
22302230
* We don't take any special steps to remember the LP_DEAD items (such
2231-
* as counting them in our finalreport to the statscollector) when
2231+
* as counting them in our finalupdate to the statssystem) when
22322232
* the optimization is applied. Though the accounting used in
22332233
* analyze.c's acquire_sample_rows() will recognize the same LP_DEAD
2234-
* items as dead rows in its own statscollectorreport, that's okay.
2234+
* items as dead rows in its own stats report, that's okay.
22352235
* The discrepancy should be negligible. If this optimization is ever
22362236
* expanded to cover more cases then this may need to be reconsidered.
22372237
*/

‎src/backend/commands/analyze.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ do_analyze_rel(Relation onerel, VacuumParams *params,
680680
}
681681

682682
/*
683-
* Now report ANALYZE to the statscollector. For regular tables, we do
683+
* Now report ANALYZE to thecumulativestatssystem. For regular tables, we do
684684
* it only if not doing inherited stats. For partitioned tables, we only
685685
* do it for inherited stats. (We're never called for not-inherited stats
686686
* on partitioned tables anyway.)

‎src/backend/commands/dbcommands.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1665,7 +1665,7 @@ dropdb(const char *dbname, bool missing_ok, bool force)
16651665
DropDatabaseBuffers(db_id);
16661666

16671667
/*
1668-
* Tell the statscollector to forget it immediately, too.
1668+
* Tell thecumulativestatssystem to forget it immediately, too.
16691669
*/
16701670
pgstat_drop_database(db_id);
16711671

‎src/backend/commands/matview.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,10 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
338338
refresh_by_heap_swap(matviewOid,OIDNewHeap,relpersistence);
339339

340340
/*
341-
* Inform statscollector about our activity: basically, we truncated
342-
* the matview and inserted some new data. (The concurrent code path
343-
* above doesn't need to worry about this because the inserts and
344-
* deletes it issues get counted by lower-level code.)
341+
* Informcumulativestatssystem about our activity: basically, we
342+
*truncatedthe matview and inserted some new data. (The concurrent
343+
*code pathabove doesn't need to worry about this because the inserts
344+
*anddeletes it issues get counted by lower-level code.)
345345
*/
346346
pgstat_count_truncate(matviewRel);
347347
if (!stmt->skipData)

‎src/backend/commands/subscriptioncmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
14091409
* slot stays dropped even if the transaction rolls back. So we cannot
14101410
* run DROP SUBSCRIPTION inside a transaction block if dropping the
14111411
* replication slot. Also, in this case, we report a message for dropping
1412-
* the subscription to the statscollector.
1412+
* the subscription to thecumulativestatssystem.
14131413
*
14141414
* XXX The command name should really be something like "DROP SUBSCRIPTION
14151415
* of a subscription that is associated with a replication slot", but we
@@ -1583,7 +1583,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
15831583
PG_END_TRY();
15841584

15851585
/*
1586-
*Send a message for dropping thissubscriptionto the stats collector.
1586+
*Tell the cumulative stats system that thesubscriptionis getting dropped.
15871587
* We can safely report dropping the subscription statistics here if the
15881588
* subscription is associated with a replication slot since we cannot run
15891589
* DROP SUBSCRIPTION inside a transaction block. Subscription statistics

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ vacuum(List *relations, VacuumParams *params,
352352
errmsg("PROCESS_TOAST required with VACUUM FULL")));
353353

354354
/*
355-
* Send info about dead objects to thestatistics collector, unless we are
356-
* in autovacuum --- autovacuum.c does this for itself.
355+
* Send info about dead objects to thecumulative stats system, unless
356+
*we arein autovacuum --- autovacuum.c does this for itself.
357357
*/
358358
if ((params->options&VACOPT_VACUUM)&& !IsAutoVacuumWorkerProcess())
359359
pgstat_vacuum_stat();

‎src/backend/postmaster/autovacuum.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ AutoVacWorkerMain(int argc, char *argv[])
16891689
chardbname[NAMEDATALEN];
16901690

16911691
/*
1692-
* Report autovac startup to the statscollector. We deliberately do
1692+
* Report autovac startup to thecumulativestatssystem. We deliberately do
16931693
* this before InitPostgres, so that the last_autovac_time will get
16941694
* updated even if the connection attempt fails. This is to prevent
16951695
* autovac from getting "stuck" repeatedly selecting an unopenable
@@ -1996,9 +1996,9 @@ do_autovacuum(void)
19961996
StartTransactionCommand();
19971997

19981998
/*
1999-
* Clean up any dead statisticscollectorentries for this DB. We always
2000-
*want to dothis exactly once per DB-processing cycle, even if we find
2001-
*nothingworth vacuuming in the database.
1999+
* Clean up any dead statistics entries for this DB. We always want to do
2000+
* this exactly once per DB-processing cycle, even if we find nothing
2001+
* worth vacuuming in the database.
20022002
*/
20032003
pgstat_vacuum_stat();
20042004

@@ -3041,7 +3041,7 @@ recheck_relation_needs_vacanalyze(Oid relid,
30413041
*
30423042
* For analyze, the analysis done is that the number of tuples inserted,
30433043
* deleted and updated since the last analyze exceeds a threshold calculated
3044-
* in the same fashion as above. Note that thecollector actually stores
3044+
* in the same fashion as above. Note that thecumulative stats system stores
30453045
* the number of tuples (both live and dead) that there were as of the last
30463046
* analyze. This is asymmetric to the VACUUM case.
30473047
*
@@ -3051,8 +3051,8 @@ recheck_relation_needs_vacanalyze(Oid relid,
30513051
*
30523052
* A table whose autovacuum_enabled option is false is
30533053
* automatically skipped (unless we have to vacuum it due to freeze_max_age).
3054-
* Thus autovacuum can be disabled for specific tables. Also, when thestats
3055-
*collector does not have data about a table, it will be skipped.
3054+
* Thus autovacuum can be disabled for specific tables. Also, when thecumulative
3055+
*stats system does not have data about a table, it will be skipped.
30563056
*
30573057
* A table whose vac_base_thresh value is < 0 takes the base value from the
30583058
* autovacuum_vacuum_threshold GUC variable. Similarly, a vac_scale_factor

‎src/backend/postmaster/bgwriter.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,7 @@ BackgroundWriterMain(void)
240240
*/
241241
can_hibernate=BgBufferSync(&wb_context);
242242

243-
/*
244-
* Send off activity statistics to the stats collector
245-
*/
243+
/* Report pending statistics to the cumulative stats system */
246244
pgstat_send_bgwriter();
247245

248246
if (FirstCallSinceLastCheckpoint())

‎src/backend/postmaster/checkpointer.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,8 @@ CheckpointerMain(void)
492492
/* Check for archive_timeout and switch xlog files if necessary. */
493493
CheckArchiveTimeout();
494494

495-
/*
496-
* Send off activity statistics to the stats collector.
497-
*/
495+
/* Report pending statistics to the cumulative stats system */
498496
pgstat_send_checkpointer();
499-
500-
/* Send WAL statistics to the stats collector. */
501497
pgstat_send_wal(true);
502498

503499
/*
@@ -570,8 +566,8 @@ HandleCheckpointerInterrupts(void)
570566
* Close down the database.
571567
*
572568
* Since ShutdownXLOG() creates restartpoint or checkpoint, and
573-
* updates the statistics, increment the checkpoint request andsend
574-
*the statistics to the stats collector.
569+
* updates the statistics, increment the checkpoint request andflush
570+
*out pending statistic.
575571
*/
576572
PendingCheckpointerStats.m_requested_checkpoints++;
577573
ShutdownXLOG(0,0);
@@ -718,9 +714,7 @@ CheckpointWriteDelay(int flags, double progress)
718714

719715
CheckArchiveTimeout();
720716

721-
/*
722-
* Report interim activity statistics.
723-
*/
717+
/* Report interim statistics to the cumulative stats system */
724718
pgstat_send_checkpointer();
725719

726720
/*

‎src/backend/postmaster/pgarch.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,8 @@ pgarch_ArchiverCopyLoop(void)
477477
pgarch_archiveDone(xlog);
478478

479479
/*
480-
* Tell thecollectorabout the WAL file that we successfully
481-
* archived
480+
* Tell thecumulative stats systemabout the WAL file that we
481+
*successfullyarchived
482482
*/
483483
pgstat_send_archiver(xlog, false);
484484

@@ -487,8 +487,8 @@ pgarch_ArchiverCopyLoop(void)
487487
else
488488
{
489489
/*
490-
* Tell thecollectorabout the WAL file that we failed to
491-
* archive
490+
* Tell thecumulative stats systemabout the WAL file that we
491+
*failed toarchive
492492
*/
493493
pgstat_send_archiver(xlog, true);
494494

‎src/backend/postmaster/pgstat.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -693,20 +693,20 @@ allow_immediate_pgstat_restart(void)
693693
/*
694694
* Shut down a single backend's statistics reporting at process exit.
695695
*
696-
* Flush any remaining statistics counts out to the collector.
697-
*Without this, operationstriggered during backend exit (such as
698-
*temp table deletions) won't becounted.
696+
* Flushoutany remaining statistics counts. Without this, operations
697+
* triggered during backend exit (such as temp table deletions) won't be
698+
* counted.
699699
*/
700700
staticvoid
701701
pgstat_shutdown_hook(intcode,Datumarg)
702702
{
703703
Assert(!pgstat_is_shutdown);
704704

705705
/*
706-
* If we got as far as discovering our own database ID, we canreport what
707-
* we didto the collector. Otherwise, we'd besending an invalid
708-
*databaseID, so forget it. (This means that accesses to pg_database
709-
*duringfailed backend starts might never get counted.)
706+
* If we got as far as discovering our own database ID, we canflush out
707+
*whatwe didso far. Otherwise, we'd bereporting an invalid database
708+
* ID, so forget it. (This means that accesses to pg_database during
709+
* failed backend starts might never get counted.)
710710
*/
711711
if (OidIsValid(MyDatabaseId))
712712
pgstat_report_stat(true);
@@ -1065,7 +1065,7 @@ pgstat_collect_oids(Oid catalogid, AttrNumber anum_oid)
10651065
}
10661066

10671067
/*
1068-
*Tell the statistics collector to reset counters for our database.
1068+
*Reset counters for our database.
10691069
*
10701070
* Permission checking for this function is managed through the normal
10711071
* GRANT system.
@@ -1084,7 +1084,7 @@ pgstat_reset_counters(void)
10841084
}
10851085

10861086
/*
1087-
*Tell the statistics collector to reset a single counter.
1087+
*Reset a single counter.
10881088
*
10891089
* Permission checking for this function is managed through the normal
10901090
* GRANT system.
@@ -1106,7 +1106,7 @@ pgstat_reset_single_counter(Oid objoid, PgStat_Single_Reset_Type type)
11061106
}
11071107

11081108
/*
1109-
*Tell the statistics collector to reset cluster-wide shared counters.
1109+
*Reset cluster-wide shared counters.
11101110
*
11111111
* Permission checking for this function is managed through the normal
11121112
* GRANT system.
@@ -1198,8 +1198,8 @@ pgstat_clear_snapshot(void)
11981198
/*
11991199
* Support function for the SQL-callable pgstat* functions. Returns
12001200
* the collected statistics for one database or NULL. NULL doesn't mean
1201-
* that the database doesn't exist,it is just not yet known by the
1202-
*collector, so thecaller is better off to report ZERO instead.
1201+
* that the database doesn't exist,just that there are no statistics, so the
1202+
* caller is better off to report ZERO instead.
12031203
*/
12041204
PgStat_StatDBEntry*
12051205
pgstat_fetch_stat_dbentry(Oiddbid)
@@ -1233,8 +1233,8 @@ pgstat_fetch_global(void)
12331233
/*
12341234
* Support function for the SQL-callable pgstat* functions. Returns
12351235
* the collected statistics for one table or NULL. NULL doesn't mean
1236-
* that the table doesn't exist,it is just not yet known by the
1237-
*collector, so thecaller is better off to report ZERO instead.
1236+
* that the table doesn't exist,just that there are no statistics, so the
1237+
* caller is better off to report ZERO instead.
12381238
*/
12391239
PgStat_StatTabEntry*
12401240
pgstat_fetch_stat_tabentry(Oidrelid)

‎src/backend/postmaster/walwriter.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ WalWriterMain(void)
257257
elseif (left_till_hibernate>0)
258258
left_till_hibernate--;
259259

260-
/*Send WAL statistics to the statscollector */
260+
/*report pending statistics to thecumulativestatssystem */
261261
pgstat_send_wal(false);
262262

263263
/*
@@ -295,12 +295,11 @@ HandleWalWriterInterrupts(void)
295295
if (ShutdownRequestPending)
296296
{
297297
/*
298-
* Force to send remaining WAL statistics to the stats collector at
299-
* process exit.
298+
* Force reporting remaining WAL statistics at process exit.
300299
*
301300
* Since pgstat_send_wal is invoked with 'force' is false in main loop
302-
* to avoid overloadingtothe statscollector, there may exist unsent
303-
* stats counters for the WAL writer.
301+
* to avoid overloading thecumulativestatssystem, there may exist
302+
*unreportedstats counters for the WAL writer.
304303
*/
305304
pgstat_send_wal(true);
306305

‎src/backend/replication/basebackup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,8 +1505,8 @@ is_checksummed_file(const char *fullpath, const char *filename)
15051505
*
15061506
* If 'missing_ok' is true, will not throw an error if the file is not found.
15071507
*
1508-
* If dboid is anything other than InvalidOid then any checksum failures detected
1509-
* will get reported to the statscollector.
1508+
* If dboid is anything other than InvalidOid then any checksum failures
1509+
*detectedwill get reported to thecumulativestatssystem.
15101510
*
15111511
* Returns true if the file was successfully sent, false if 'missing_ok',
15121512
* and the file did not exist.

‎src/backend/tcop/postgres.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2937,7 +2937,7 @@ die(SIGNAL_ARGS)
29372937
ProcDiePending= true;
29382938
}
29392939

2940-
/* for thestatistics collector */
2940+
/* for thecumulative stats system */
29412941
pgStatSessionEndCause=DISCONNECT_KILLED;
29422942

29432943
/* If we're still here, waken anything waiting on the process latch */
@@ -4368,8 +4368,8 @@ PostgresMain(const char *dbname, const char *username)
43684368
*
43694369
* Note: this includes fflush()'ing the last of the prior output.
43704370
*
4371-
* This is also a good time tosend collected statistics to the
4372-
*collector, and to update the PS stats display. We avoid doing
4371+
* This is also a good time toflush out collected statistics to the
4372+
*cumulative stats system, and to update the PS stats display. We avoid doing
43734373
* those every time through the message loop because it'd slow down
43744374
* processing of batched messages, and because we don't want to report
43754375
* uncommitted updates (that confuses autovacuum). The notification
@@ -4710,7 +4710,7 @@ PostgresMain(const char *dbname, const char *username)
47104710
*/
47114711
caseEOF:
47124712

4713-
/* for the statisticscollector */
4713+
/* for thecumulativestatisticssystem */
47144714
pgStatSessionEndCause=DISCONNECT_CLIENT_EOF;
47154715

47164716
/* FALLTHROUGH */

‎src/backend/utils/activity/pgstat_archiver.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222

2323

2424
/*
25-
* Tell the collector about the WAL file that we successfully
26-
* archived or failed to archive.
25+
* Report archiver statistics
2726
*/
2827
void
2928
pgstat_send_archiver(constchar*xlog,boolfailed)

‎src/backend/utils/activity/pgstat_bgwriter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ PgStat_MsgBgWriter PendingBgWriterStats;
2929

3030

3131
/*
32-
*Send bgwriter statistics to the collector
32+
*Report bgwriter statistics
3333
*/
3434
void
3535
pgstat_send_bgwriter(void)

‎src/backend/utils/activity/pgstat_checkpointer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ PgStat_MsgCheckpointer PendingCheckpointerStats;
2929

3030

3131
/*
32-
*Send checkpointer statistics to the collector
32+
*Report checkpointer statistics
3333
*/
3434
void
3535
pgstat_send_checkpointer(void)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp