agora inbox for [email protected]  

help / color / mirror / Atom feed

[PATCH v10 1/2] Key PGSTAT_KIND_RELATION by relfile locator
196+ messages / 2 participants
[nested] [flat]

* [PATCH v10 1/2] Key PGSTAT_KIND_RELATION by relfile locator
@ 2025-10-01 09:45 Bertrand Drouvot <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Bertrand Drouvot @ 2025-10-01 09:45 UTC (permalink / raw)

This patch changes the key used for the PGSTAT_KIND_RELATION statistic kind.
Instead of the relation oid, it now relies on:

- dboid (linked to RelFileLocator's dbOid)
- objoid which is the result of a new macro (namely RelFileLocatorToPgStatObjid())
that computes an objoid based on the RelFileLocator's spcOid and the
RelFileLocator's relNumber.

This is possible as, since b14e9ce7d55c, the objoid is now uint64 and spcOid
and relNumber are 32 bits.

That will allow us to add new stats (add writes counters) and ensure that some
counters (n_dead_tup and friends) are replicated.

The patch introduces pgstat_reloid_to_relfilelocator() to 1) avoid calling
RelationIdGetRelation() to get the relfilelocator based on the relation oid
and 2) handle the partitioned table case.

Please note that:

- when running pg_stat_have_stats('relation',...) we now need to be connected
to the database that hosts the relation. As pg_stat_have_stats() is not
documented publicly, then the changes done in 029_stats_restart.pl look
enough.

- this patch does not handle rewrites so some tests are failing. It's only
intent is to ease the review and should not be pushed without being
merged with the following patch that handles the rewrites.

- it can be used to test that stats are incremented correctly and that we're
able to retrieve them as long as rewrites are not involved.
---
 src/backend/postmaster/autovacuum.c          |  17 +-
 src/backend/utils/activity/pgstat_relation.c | 236 ++++++++++++++++---
 src/backend/utils/adt/pgstatfuncs.c          |  22 +-
 src/include/catalog/pg_tablespace.dat        |   4 +
 src/include/catalog/pg_tablespace.h          |   8 +
 src/include/pgstat.h                         |  15 +-
 src/include/utils/pgstat_internal.h          |   1 +
 src/test/recovery/t/029_stats_restart.pl     |  40 ++--
 8 files changed, 271 insertions(+), 72 deletions(-)
   6.1% src/backend/postmaster/
  61.6% src/backend/utils/activity/
   5.1% src/backend/utils/adt/
   3.2% src/include/catalog/
   5.6% src/include/
  18.1% src/test/recovery/t/

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 1bd3924e35e..a11174b25ad 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2014,12 +2014,16 @@ do_autovacuum(void)
 		bool		dovacuum;
 		bool		doanalyze;
 		bool		wraparound;
+		RelFileLocator locator;
 
 		if (classForm->relkind != RELKIND_RELATION &&
 			classForm->relkind != RELKIND_MATVIEW)
 			continue;
 
 		relid = classForm->oid;
+		locator.dbOid = classForm->relisshared ? InvalidOid : MyDatabaseId;
+		locator.spcOid = classForm->reltablespace;
+		locator.relNumber = classForm->relfilenode;
 
 		/*
 		 * Check if it is a temp table (presumably, of some other backend's).
@@ -2048,8 +2052,7 @@ do_autovacuum(void)
 
 		/* Fetch reloptions and the pgstat entry for this table */
 		relopts = extract_autovac_opts(tuple, pg_class_desc);
-		tabentry = pgstat_fetch_stat_tabentry_ext(classForm->relisshared,
-												  relid);
+		tabentry = pgstat_fetch_stat_tabentry_by_locator(locator);
 
 		/* Check if it needs vacuum or analyze */
 		relation_needs_vacanalyze(relid, relopts, classForm, tabentry,
@@ -2114,6 +2117,7 @@ do_autovacuum(void)
 		bool		dovacuum;
 		bool		doanalyze;
 		bool		wraparound;
+		RelFileLocator locator;
 
 		/*
 		 * We cannot safely process other backends' temp tables, so skip 'em.
@@ -2122,6 +2126,9 @@ do_autovacuum(void)
 			continue;
 
 		relid = classForm->oid;
+		locator.dbOid = classForm->relisshared ? InvalidOid : MyDatabaseId;
+		locator.spcOid = classForm->reltablespace;
+		locator.relNumber = classForm->relfilenode;
 
 		/*
 		 * fetch reloptions -- if this toast table does not have them, try the
@@ -2141,8 +2148,7 @@ do_autovacuum(void)
 		}
 
 		/* Fetch the pgstat entry for this table */
-		tabentry = pgstat_fetch_stat_tabentry_ext(classForm->relisshared,
-												  relid);
+		tabentry = pgstat_fetch_stat_tabentry_by_locator(locator);
 
 		relation_needs_vacanalyze(relid, relopts, classForm, tabentry,
 								  effective_multixact_freeze_max_age,
@@ -2939,8 +2945,7 @@ recheck_relation_needs_vacanalyze(Oid relid,
 	PgStat_StatTabEntry *tabentry;
 
 	/* fetch the pgstat table entry */
-	tabentry = pgstat_fetch_stat_tabentry_ext(classForm->relisshared,
-											  relid);
+	tabentry = pgstat_fetch_stat_tabentry_ext(relid);
 
 	relation_needs_vacanalyze(relid, avopts, classForm, tabentry,
 							  effective_multixact_freeze_max_age,
diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c
index 55a10c299db..a267e93f8be 100644
--- a/src/backend/utils/activity/pgstat_relation.c
+++ b/src/backend/utils/activity/pgstat_relation.c
@@ -17,12 +17,17 @@
 
 #include "postgres.h"
 
+#include "access/htup_details.h"
 #include "access/twophase_rmgr.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
+#include "catalog/pg_tablespace.h"
+#include "storage/lmgr.h"
 #include "utils/memutils.h"
 #include "utils/pgstat_internal.h"
 #include "utils/rel.h"
+#include "utils/relmapper.h"
+#include "utils/syscache.h"
 #include "utils/timestamp.h"
 
 
@@ -36,13 +41,12 @@ typedef struct TwoPhasePgStatRecord
 	PgStat_Counter inserted_pre_truncdrop;
 	PgStat_Counter updated_pre_truncdrop;
 	PgStat_Counter deleted_pre_truncdrop;
-	Oid			id;				/* table's OID */
-	bool		shared;			/* is it a shared catalog? */
+	RelFileLocator locator;		/* table's rd_locator */
 	bool		truncdropped;	/* was the relation truncated/dropped? */
 } TwoPhasePgStatRecord;
 
 
-static PgStat_TableStatus *pgstat_prep_relation_pending(Oid rel_id, bool isshared);
+static PgStat_TableStatus *pgstat_prep_relation_pending(RelFileLocator locator);
 static void add_tabstat_xact_level(PgStat_TableStatus *pgstat_info, int nest_level);
 static void ensure_tabstat_xact_level(PgStat_TableStatus *pgstat_info);
 static void save_truncdrop_counters(PgStat_TableXactStatus *trans, bool is_drop);
@@ -60,8 +64,7 @@ pgstat_copy_relation_stats(Relation dst, Relation src)
 	PgStatShared_Relation *dstshstats;
 	PgStat_EntryRef *dst_ref;
 
-	srcstats = pgstat_fetch_stat_tabentry_ext(src->rd_rel->relisshared,
-											  RelationGetRelid(src));
+	srcstats = pgstat_fetch_stat_tabentry_ext(RelationGetRelid(src));
 	if (!srcstats)
 		return;
 
@@ -94,8 +97,10 @@ pgstat_init_relation(Relation rel)
 
 	/*
 	 * We only count stats for relations with storage and partitioned tables
+	 * and we don't count stats generated during a rewrite.
 	 */
-	if (!RELKIND_HAS_STORAGE(relkind) && relkind != RELKIND_PARTITIONED_TABLE)
+	if ((!RELKIND_HAS_STORAGE(relkind) && relkind != RELKIND_PARTITIONED_TABLE) ||
+		OidIsValid(rel->rd_rel->relrewrite))
 	{
 		rel->pgstat_enabled = false;
 		rel->pgstat_info = NULL;
@@ -130,12 +135,37 @@ pgstat_init_relation(Relation rel)
 void
 pgstat_assoc_relation(Relation rel)
 {
+	RelFileLocator locator;
+
 	Assert(rel->pgstat_enabled);
 	Assert(rel->pgstat_info == NULL);
 
+	/*
+	 * Don't associate stats for relations without storage and non partitioned
+	 * tables.
+	 */
+	if (!RELKIND_HAS_STORAGE(rel->rd_rel->relkind) &&
+		rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		return;
+
+	if (rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		locator = rel->rd_locator;
+	else
+	{
+		/*
+		 * Partitioned tables don't have storage, so construct a synthetic
+		 * locator for statistics tracking. Use a reserved pseudo tablespace
+		 * OID that cannot conflict with real tablespaces, and the relation
+		 * OID as relNumber. This ensures no collision with regular relations
+		 * even after OID wraparound.
+		 */
+		locator.dbOid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
+		locator.spcOid = PSEUDO_PARTITION_TABLE_SPCOID;
+		locator.relNumber = rel->rd_id;
+	}
+
 	/* Else find or make the PgStat_TableStatus entry, and update link */
-	rel->pgstat_info = pgstat_prep_relation_pending(RelationGetRelid(rel),
-													rel->rd_rel->relisshared);
+	rel->pgstat_info = pgstat_prep_relation_pending(locator);
 
 	/* don't allow link a stats to multiple relcache entries */
 	Assert(rel->pgstat_info->relation == NULL);
@@ -167,9 +197,13 @@ pgstat_unlink_relation(Relation rel)
 void
 pgstat_create_relation(Relation rel)
 {
+	/* don't track stats for relations without storage */
+	if (!RELKIND_HAS_STORAGE(rel->rd_rel->relkind))
+		return;
+
 	pgstat_create_transactional(PGSTAT_KIND_RELATION,
-								rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId,
-								RelationGetRelid(rel));
+								rel->rd_locator.dbOid,
+								RelFileLocatorToPgStatObjid(rel->rd_locator));
 }
 
 /*
@@ -181,9 +215,13 @@ pgstat_drop_relation(Relation rel)
 	int			nest_level = GetCurrentTransactionNestLevel();
 	PgStat_TableStatus *pgstat_info;
 
+	/* don't track stats for relations without storage */
+	if (!RELKIND_HAS_STORAGE(rel->rd_rel->relkind))
+		return;
+
 	pgstat_drop_transactional(PGSTAT_KIND_RELATION,
-							  rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId,
-							  RelationGetRelid(rel));
+							  rel->rd_locator.dbOid,
+							  RelFileLocatorToPgStatObjid(rel->rd_locator));
 
 	if (!pgstat_should_count_relation(rel))
 		return;
@@ -213,20 +251,23 @@ pgstat_report_vacuum(Relation rel, PgStat_Counter livetuples,
 	PgStat_EntryRef *entry_ref;
 	PgStatShared_Relation *shtabentry;
 	PgStat_StatTabEntry *tabentry;
-	Oid			dboid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
 	TimestampTz ts;
 	PgStat_Counter elapsedtime;
+	RelFileLocator locator;
 
 	if (!pgstat_track_counts)
 		return;
 
+	locator = rel->rd_locator;
+
 	/* Store the data in the table's hash table entry. */
 	ts = GetCurrentTimestamp();
 	elapsedtime = TimestampDifferenceMilliseconds(starttime, ts);
 
 	/* block acquiring lock for the same reason as pgstat_report_autovac() */
-	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION, dboid,
-											RelationGetRelid(rel), false);
+	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION, locator.dbOid,
+											RelFileLocatorToPgStatObjid(locator),
+											false);
 
 	shtabentry = (PgStatShared_Relation *) entry_ref->shared_stats;
 	tabentry = &shtabentry->stats;
@@ -285,9 +326,9 @@ pgstat_report_analyze(Relation rel,
 	PgStat_EntryRef *entry_ref;
 	PgStatShared_Relation *shtabentry;
 	PgStat_StatTabEntry *tabentry;
-	Oid			dboid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
 	TimestampTz ts;
 	PgStat_Counter elapsedtime;
+	RelFileLocator locator;
 
 	if (!pgstat_track_counts)
 		return;
@@ -325,9 +366,25 @@ pgstat_report_analyze(Relation rel,
 	ts = GetCurrentTimestamp();
 	elapsedtime = TimestampDifferenceMilliseconds(starttime, ts);
 
+	if (rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		locator = rel->rd_locator;
+	else
+	{
+		/*
+		 * Partitioned tables don't have storage, so construct a synthetic
+		 * locator for statistics tracking. Use a reserved pseudo tablespace
+		 * OID that cannot conflict with real tablespaces, and the relation
+		 * OID as relNumber. This ensures no collision with regular relations
+		 * even after OID wraparound.
+		 */
+		locator.dbOid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
+		locator.spcOid = PSEUDO_PARTITION_TABLE_SPCOID;
+		locator.relNumber = rel->rd_id;
+	}
 	/* block acquiring lock for the same reason as pgstat_report_autovac() */
-	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION, dboid,
-											RelationGetRelid(rel),
+	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION,
+											locator.dbOid,
+											RelFileLocatorToPgStatObjid(locator),
 											false);
 	/* can't get dropped while accessed */
 	Assert(entry_ref != NULL && entry_ref->shared_stats != NULL);
@@ -468,7 +525,16 @@ pgstat_update_heap_dead_tuples(Relation rel, int delta)
 PgStat_StatTabEntry *
 pgstat_fetch_stat_tabentry(Oid relid)
 {
-	return pgstat_fetch_stat_tabentry_ext(IsSharedRelation(relid), relid);
+	return pgstat_fetch_stat_tabentry_ext(relid);
+}
+
+PgStat_StatTabEntry *
+pgstat_fetch_stat_tabentry_by_locator(RelFileLocator locator)
+{
+	return (PgStat_StatTabEntry *) pgstat_fetch_entry(
+													  PGSTAT_KIND_RELATION,
+													  locator.dbOid,
+													  RelFileLocatorToPgStatObjid(locator));
 }
 
 /*
@@ -476,12 +542,14 @@ pgstat_fetch_stat_tabentry(Oid relid)
  * whether the to-be-accessed table is a shared relation or not.
  */
 PgStat_StatTabEntry *
-pgstat_fetch_stat_tabentry_ext(bool shared, Oid reloid)
+pgstat_fetch_stat_tabentry_ext(Oid reloid)
 {
-	Oid			dboid = (shared ? InvalidOid : MyDatabaseId);
+	RelFileLocator locator;
 
-	return (PgStat_StatTabEntry *)
-		pgstat_fetch_entry(PGSTAT_KIND_RELATION, dboid, reloid);
+	if (!pgstat_reloid_to_relfilelocator(reloid, &locator))
+		return NULL;
+
+	return pgstat_fetch_stat_tabentry_by_locator(locator);
 }
 
 /*
@@ -503,14 +571,17 @@ find_tabstat_entry(Oid rel_id)
 	PgStat_TableXactStatus *trans;
 	PgStat_TableStatus *tabentry = NULL;
 	PgStat_TableStatus *tablestatus = NULL;
+	RelFileLocator locator;
+
+	if (!pgstat_reloid_to_relfilelocator(rel_id, &locator))
+		return NULL;
+
+	entry_ref = pgstat_fetch_pending_entry(PGSTAT_KIND_RELATION,
+										   locator.dbOid,
+										   RelFileLocatorToPgStatObjid(locator));
 
-	entry_ref = pgstat_fetch_pending_entry(PGSTAT_KIND_RELATION, MyDatabaseId, rel_id);
 	if (!entry_ref)
-	{
-		entry_ref = pgstat_fetch_pending_entry(PGSTAT_KIND_RELATION, InvalidOid, rel_id);
-		if (!entry_ref)
-			return tablestatus;
-	}
+		return tablestatus;
 
 	tabentry = (PgStat_TableStatus *) entry_ref->pending;
 	tablestatus = palloc_object(PgStat_TableStatus);
@@ -706,8 +777,12 @@ AtPrepare_PgStat_Relations(PgStat_SubXactStatus *xact_state)
 		record.inserted_pre_truncdrop = trans->inserted_pre_truncdrop;
 		record.updated_pre_truncdrop = trans->updated_pre_truncdrop;
 		record.deleted_pre_truncdrop = trans->deleted_pre_truncdrop;
-		record.id = tabstat->id;
-		record.shared = tabstat->shared;
+
+		if (tabstat->relation != NULL)
+			record.locator = tabstat->relation->rd_locator;
+		else
+			record.locator = tabstat->locator;
+
 		record.truncdropped = trans->truncdropped;
 
 		RegisterTwoPhaseRecord(TWOPHASE_RM_PGSTAT_ID, 0,
@@ -750,7 +825,7 @@ pgstat_twophase_postcommit(FullTransactionId fxid, uint16 info,
 	PgStat_TableStatus *pgstat_info;
 
 	/* Find or create a tabstat entry for the rel */
-	pgstat_info = pgstat_prep_relation_pending(rec->id, rec->shared);
+	pgstat_info = pgstat_prep_relation_pending(rec->locator);
 
 	/* Same math as in AtEOXact_PgStat, commit case */
 	pgstat_info->counts.tuples_inserted += rec->tuples_inserted;
@@ -785,8 +860,8 @@ pgstat_twophase_postabort(FullTransactionId fxid, uint16 info,
 	TwoPhasePgStatRecord *rec = (TwoPhasePgStatRecord *) recdata;
 	PgStat_TableStatus *pgstat_info;
 
-	/* Find or create a tabstat entry for the rel */
-	pgstat_info = pgstat_prep_relation_pending(rec->id, rec->shared);
+	/* Find or create a tabstat entry for the target locator */
+	pgstat_info = pgstat_prep_relation_pending(rec->locator);
 
 	/* Same math as in AtEOXact_PgStat, abort case */
 	if (rec->truncdropped)
@@ -920,17 +995,21 @@ pgstat_relation_reset_timestamp_cb(PgStatShared_Common *header, TimestampTz ts)
  * initialized if not exists.
  */
 static PgStat_TableStatus *
-pgstat_prep_relation_pending(Oid rel_id, bool isshared)
+pgstat_prep_relation_pending(RelFileLocator locator)
 {
 	PgStat_EntryRef *entry_ref;
 	PgStat_TableStatus *pending;
+	uint64		objid;
+
+	objid = RelFileLocatorToPgStatObjid(locator);
 
 	entry_ref = pgstat_prep_pending_entry(PGSTAT_KIND_RELATION,
-										  isshared ? InvalidOid : MyDatabaseId,
-										  rel_id, NULL);
+										  locator.dbOid,
+										  objid, NULL);
+
 	pending = entry_ref->pending;
-	pending->id = rel_id;
-	pending->shared = isshared;
+	pending->id = objid;
+	pending->locator = locator;
 
 	return pending;
 }
@@ -1009,3 +1088,82 @@ restore_truncdrop_counters(PgStat_TableXactStatus *trans)
 		trans->tuples_deleted = trans->deleted_pre_truncdrop;
 	}
 }
+
+/*
+ * Convert a relation OID to its corresponding RelFileLocator for statistics
+ * tracking purposes.
+ *
+ * Returns true on success, false if the relation doesn't need statistics
+ * tracking.
+ *
+ * For partitioned tables, constructs a synthetic locator using the relation
+ * OID as relNumber, since they don't have storage.
+ */
+bool
+pgstat_reloid_to_relfilelocator(Oid reloid, RelFileLocator *locator)
+{
+	HeapTuple	tuple;
+	Form_pg_class relform;
+	bool		result = true;
+
+	/* get the relation's tuple from pg_class */
+	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(reloid));
+
+	if (!HeapTupleIsValid(tuple))
+		return false;
+
+	relform = (Form_pg_class) GETSTRUCT(tuple);
+
+	/* skip relations without storage and non partitioned tables */
+	if (!RELKIND_HAS_STORAGE(relform->relkind) &&
+		relform->relkind != RELKIND_PARTITIONED_TABLE)
+	{
+		ReleaseSysCache(tuple);
+		return false;
+	}
+
+	if (relform->relkind != RELKIND_PARTITIONED_TABLE)
+	{
+		/* build the RelFileLocator */
+		locator->relNumber = relform->relfilenode;
+		locator->spcOid = relform->reltablespace;
+
+		/* handle default tablespace */
+		if (!OidIsValid(locator->spcOid))
+			locator->spcOid = MyDatabaseTableSpace;
+
+		/* handle dbOid for global vs local relations */
+		if (locator->spcOid == GLOBALTABLESPACE_OID)
+			locator->dbOid = InvalidOid;
+		else
+			locator->dbOid = MyDatabaseId;
+
+		/* handle mapped relations */
+		if (!RelFileNumberIsValid(locator->relNumber))
+		{
+			locator->relNumber = RelationMapOidToFilenumber(reloid,
+															relform->relisshared);
+			if (!RelFileNumberIsValid(locator->relNumber))
+			{
+				ReleaseSysCache(tuple);
+				return false;
+			}
+		}
+	}
+	else
+	{
+		/*
+		 * Partitioned tables don't have storage, so construct a synthetic
+		 * locator for statistics tracking. Use a reserved pseudo tablespace
+		 * OID that cannot conflict with real tablespaces, and the relation
+		 * OID as relNumber. This ensures no collision with regular relations
+		 * even after OID wraparound.
+		 */
+		locator->dbOid = (relform->relisshared ? InvalidOid : MyDatabaseId);
+		locator->spcOid = PSEUDO_PARTITION_TABLE_SPCOID;
+		locator->relNumber = relform->oid;
+	}
+
+	ReleaseSysCache(tuple);
+	return result;
+}
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index ef6fffe60b9..60ffb1679ec 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -23,13 +23,13 @@
 #include "common/ip.h"
 #include "funcapi.h"
 #include "miscadmin.h"
-#include "pgstat.h"
 #include "postmaster/bgworker.h"
 #include "replication/logicallauncher.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
+#include "utils/pgstat_internal.h"
 #include "utils/timestamp.h"
 
 #define UINT32_ACCESS_ONCE(var)		 ((uint32)(*((volatile uint32 *)&(var))))
@@ -1949,9 +1949,14 @@ Datum
 pg_stat_reset_single_table_counters(PG_FUNCTION_ARGS)
 {
 	Oid			taboid = PG_GETARG_OID(0);
-	Oid			dboid = (IsSharedRelation(taboid) ? InvalidOid : MyDatabaseId);
+	RelFileLocator locator;
 
-	pgstat_reset(PGSTAT_KIND_RELATION, dboid, taboid);
+	/* Get the stats locator from the relation OID */
+	if (!pgstat_reloid_to_relfilelocator(taboid, &locator))
+		PG_RETURN_VOID();
+
+	pgstat_reset(PGSTAT_KIND_RELATION, locator.dbOid,
+				 RelFileLocatorToPgStatObjid(locator));
 
 	PG_RETURN_VOID();
 }
@@ -2305,5 +2310,16 @@ pg_stat_have_stats(PG_FUNCTION_ARGS)
 	uint64		objid = PG_GETARG_INT64(2);
 	PgStat_Kind kind = pgstat_get_kind_from_str(stats_type);
 
+	/* Convert relation OID to relfilenode objid */
+	if (kind == PGSTAT_KIND_RELATION)
+	{
+		RelFileLocator locator;
+
+		if (!pgstat_reloid_to_relfilelocator(objid, &locator))
+			PG_RETURN_BOOL(false);
+
+		objid = RelFileLocatorToPgStatObjid(locator);
+	}
+
 	PG_RETURN_BOOL(pgstat_have_entry(kind, dboid, objid));
 }
diff --git a/src/include/catalog/pg_tablespace.dat b/src/include/catalog/pg_tablespace.dat
index 1302a3d75cd..9430970fffd 100644
--- a/src/include/catalog/pg_tablespace.dat
+++ b/src/include/catalog/pg_tablespace.dat
@@ -10,6 +10,10 @@
 #
 #----------------------------------------------------------------------
 
+/*
+ * When adding a new one, ensure it does not conflict with
+ * PSEUDO_PARTITION_TABLE_SPCOID.
+ */
 [
 
 { oid => '1663', oid_symbol => 'DEFAULTTABLESPACE_OID',
diff --git a/src/include/catalog/pg_tablespace.h b/src/include/catalog/pg_tablespace.h
index 7816d779d8c..0e2d8051d69 100644
--- a/src/include/catalog/pg_tablespace.h
+++ b/src/include/catalog/pg_tablespace.h
@@ -21,6 +21,14 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_tablespace_d.h"	/* IWYU pragma: export */
 
+/*
+ * Reserved tablespace OID for partitioned table pseudo locators.
+ * This is not an actual tablespace, just a reserved value to distinguish
+ * partitioned table statistics from regular table statistics. Ensures it does
+ * not conflict with the ones in pg_tablespace.dat.
+ */
+#define PSEUDO_PARTITION_TABLE_SPCOID 1665
+
 /* ----------------
  *		pg_tablespace definition.  cpp turns this into
  *		typedef struct FormData_pg_tablespace
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 6714363144a..3102f86aa24 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -17,6 +17,7 @@
 #include "postmaster/pgarch.h"	/* for MAX_XFN_CHARS */
 #include "replication/conflict.h"
 #include "replication/worker_internal.h"
+#include "storage/relfilelocator.h"
 #include "utils/backend_progress.h" /* for backward compatibility */	/* IWYU pragma: export */
 #include "utils/backend_status.h"	/* for backward compatibility */	/* IWYU pragma: export */
 #include "utils/pgstat_kind.h"
@@ -35,6 +36,12 @@
 /* Default directory to store temporary statistics data in */
 #define PG_STAT_TMP_DIR		"pg_stat_tmp"
 
+/*
+ * Build a pgstat key Objid based on a RelFileLocator.
+ */
+#define RelFileLocatorToPgStatObjid(locator) \
+	(((uint64) (locator).spcOid << 32) | (locator).relNumber)
+
 /* Values for track_functions GUC variable --- order is significant! */
 typedef enum TrackFunctionsLevel
 {
@@ -175,11 +182,11 @@ typedef struct PgStat_TableCounts
  */
 typedef struct PgStat_TableStatus
 {
-	Oid			id;				/* table's OID */
-	bool		shared;			/* is it a shared catalog? */
+	uint64		id;				/* hash of relfilelocator for stats key */
 	struct PgStat_TableXactStatus *trans;	/* lowest subxact's counts */
 	PgStat_TableCounts counts;	/* event counts to be sent */
 	Relation	relation;		/* rel that is using this entry */
+	RelFileLocator locator;		/* table's relfilelocator */
 } PgStat_TableStatus;
 
 /* ----------
@@ -735,8 +742,8 @@ extern void pgstat_twophase_postabort(FullTransactionId fxid, uint16 info,
 									  void *recdata, uint32 len);
 
 extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry(Oid relid);
-extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_ext(bool shared,
-														   Oid reloid);
+extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_by_locator(RelFileLocator locator);
+extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_ext(Oid reloid);
 extern PgStat_TableStatus *find_tabstat_entry(Oid rel_id);
 
 
diff --git a/src/include/utils/pgstat_internal.h b/src/include/utils/pgstat_internal.h
index 5c1ce4d3d6a..7b24928b00d 100644
--- a/src/include/utils/pgstat_internal.h
+++ b/src/include/utils/pgstat_internal.h
@@ -764,6 +764,7 @@ extern void PostPrepare_PgStat_Relations(PgStat_SubXactStatus *xact_state);
 extern bool pgstat_relation_flush_cb(PgStat_EntryRef *entry_ref, bool nowait);
 extern void pgstat_relation_delete_pending_cb(PgStat_EntryRef *entry_ref);
 extern void pgstat_relation_reset_timestamp_cb(PgStatShared_Common *header, TimestampTz ts);
+extern bool pgstat_reloid_to_relfilelocator(Oid reloid, RelFileLocator *locator);
 
 
 /*
diff --git a/src/test/recovery/t/029_stats_restart.pl b/src/test/recovery/t/029_stats_restart.pl
index 021e2bf361f..3a9c05eaf10 100644
--- a/src/test/recovery/t/029_stats_restart.pl
+++ b/src/test/recovery/t/029_stats_restart.pl
@@ -55,10 +55,10 @@ trigger_funcrel_stat();
 
 # verify stats objects exist
 $sect = "initial";
-is(have_stats('database', $dboid, 0), 't', "$sect: db stats do exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 't', "$sect: db stats do exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	't', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	't', "$sect: relation stats do exist");
 
 # regular shutdown
@@ -79,10 +79,10 @@ copy($og_stats, $statsfile) or die "Copy failed: $!";
 $node->start;
 
 $sect = "copy";
-is(have_stats('database', $dboid, 0), 't', "$sect: db stats do exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 't', "$sect: db stats do exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	't', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	't', "$sect: relation stats do exist");
 
 $node->stop('immediate');
@@ -96,10 +96,10 @@ $node->start;
 
 # stats should have been discarded
 $sect = "post immediate";
-is(have_stats('database', $dboid, 0), 'f', "$sect: db stats do not exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 'f', "$sect: db stats do not exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	'f', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	'f', "$sect: relation stats do not exist");
 
 # get rid of backup statsfile
@@ -110,10 +110,10 @@ unlink $statsfile or die "cannot unlink $statsfile $!";
 trigger_funcrel_stat();
 
 $sect = "post immediate, new";
-is(have_stats('database', $dboid, 0), 't', "$sect: db stats do exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 't', "$sect: db stats do exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	't', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	't', "$sect: relation stats do exist");
 
 # regular shutdown
@@ -129,10 +129,10 @@ $node->start;
 
 # no stats present due to invalid stats file
 $sect = "invalid_overwrite";
-is(have_stats('database', $dboid, 0), 'f', "$sect: db stats do not exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 'f', "$sect: db stats do not exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	'f', "$sect: function stats do not exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	'f', "$sect: relation stats do not exist");
 
 
@@ -145,10 +145,10 @@ append_file($og_stats, "XYZ");
 $node->start;
 
 $sect = "invalid_append";
-is(have_stats('database', $dboid, 0), 'f', "$sect: db stats do not exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 'f', "$sect: db stats do not exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	'f', "$sect: function stats do not exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	'f', "$sect: relation stats do not exist");
 
 
@@ -307,9 +307,9 @@ sub trigger_funcrel_stat
 
 sub have_stats
 {
-	my ($kind, $dboid, $objid) = @_;
+	my ($db, $kind, $dboid, $objid) = @_;
 
-	return $node->safe_psql($connect_db,
+	return $node->safe_psql($db,
 		"SELECT pg_stat_have_stats('$kind', $dboid, $objid)");
 }
 
-- 
2.34.1


--xJsrX25x3tm7Tn81
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
	filename="v10-0002-handle-relation-statistics-correctly-during-rewr.patch"



^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread

* [PATCH 4/4] Use singular "datachecksum" consistently in process names
@ 2026-05-26 07:56 Kyotaro Horiguchi <[email protected]>
  0 siblings, 0 replies; 196+ messages in thread

From: Kyotaro Horiguchi @ 2026-05-26 07:56 UTC (permalink / raw)

datachecksum_state.c currently refers to processes as both
"datachecksum worker/launcher" and "datachecksums launcher".

Use the singular "datachecksum" form consistently for process names
instead.
---
 src/backend/access/transam/xlog.c           |   4 +-
 src/backend/postmaster/bgworker.c           |   8 +-
 src/backend/postmaster/datachecksum_state.c | 234 ++++++++++----------
 src/backend/postmaster/postmaster.c         |   4 +-
 src/backend/storage/ipc/procsignal.c        |   2 +-
 src/backend/utils/activity/pgstat_backend.c |   4 +-
 src/backend/utils/activity/pgstat_io.c      |   4 +-
 src/backend/utils/init/miscinit.c           |   2 +-
 src/backend/utils/init/postinit.c           |   2 +-
 src/include/miscadmin.h                     |  10 +-
 src/include/postmaster/datachecksum_state.h |  30 +--
 src/include/postmaster/proctypelist.h       |   4 +-
 src/include/storage/subsystemlist.h         |   2 +-
 13 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fecdf0d4b05..16f8278809e 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9178,7 +9178,7 @@ xlog_redo(XLogReaderState *record)
 		SpinLockRelease(&XLogCtl->info_lck);
 
 		if (new_state)
-			EmitAndWaitDataChecksumsBarrier(redo_rec.data_checksum_version);
+			EmitAndWaitDataChecksumBarrier(redo_rec.data_checksum_version);
 	}
 	else if (info == XLOG_LOGICAL_DECODING_STATUS_CHANGE)
 	{
@@ -9256,7 +9256,7 @@ xlog2_redo(XLogReaderState *record)
 		 * change to checksum status. Once the barrier has been passed we can
 		 * initiate the corresponding processing.
 		 */
-		EmitAndWaitDataChecksumsBarrier(state.new_checksum_state);
+		EmitAndWaitDataChecksumBarrier(state.new_checksum_state);
 	}
 }
 
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 2e4acad4f00..68256d90cef 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -160,12 +160,12 @@ static const struct
 		.fn_addr = TableSyncWorkerMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerLauncherMain",
-		.fn_addr = DataChecksumsWorkerLauncherMain
+		.fn_name = "DataChecksumWorkerLauncherMain",
+		.fn_addr = DataChecksumWorkerLauncherMain
 	},
 	{
-		.fn_name = "DataChecksumsWorkerMain",
-		.fn_addr = DataChecksumsWorkerMain
+		.fn_name = "DataChecksumWorkerMain",
+		.fn_addr = DataChecksumWorkerMain
 	}
 };
 
diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c
index 33430147ff2..1715e506cbc 100644
--- a/src/backend/postmaster/datachecksum_state.c
+++ b/src/backend/postmaster/datachecksum_state.c
@@ -26,7 +26,7 @@
  * checksums enabled, then disabled them and updated the page while they were
  * disabled.
  *
- * The DataChecksumsWorker will compile a list of all databases at the start,
+ * The DataChecksumWorker will compile a list of all databases at the start,
  * any databases created concurrently will see the in-progress state and will
  * be checksummed automatically.  All databases from the original list MUST BE
  * successfully processed in order for data checksums to be enabled, the only
@@ -99,10 +99,10 @@
  * state will also be set to "off".
  *
  * Backends transition Bd -> Bi via a procsignalbarrier which is emitted by the
- * DataChecksumsWorkerLauncherMain.  When all backends have acknowledged the
+ * DataChecksumWorkerLauncherMain.  When all backends have acknowledged the
  * barrier then Bd will be empty and the next phase can begin: calculating and
- * writing data checksums with DataChecksumsWorkers.  When the
- * DataChecksumsWorker processes have finished writing checksums on all pages,
+ * writing data checksums with DataChecksumWorkers.  When the
+ * DataChecksumWorker processes have finished writing checksums on all pages,
  * data checksums are enabled cluster-wide via another procsignalbarrier.
  * There are four sets of backends where Bd shall be an empty set:
  *
@@ -155,7 +155,7 @@
  * found on the -hackers threads linked to in the commit message of this
  * feature.
  *
- *   * Launching datachecksumsworker for resuming operation from the startup
+ *   * Launching datachecksumworker for resuming operation from the startup
  *     process: Currently users have to restart processing manually after a
  *     restart since dynamic background worker cannot be started from the
  *     postmaster. Changing the startup process could make restarting the
@@ -280,15 +280,15 @@ static const ChecksumBarrierCondition checksum_barriers[9] =
  * Signaling between backends calling pg_enable/disable_data_checksums, the
  * checksums launcher process, and the checksums worker process.
  *
- * This struct is protected by DataChecksumsWorkerLock
+ * This struct is protected by DataChecksumWorkerLock
  */
-typedef struct DataChecksumsStateStruct
+typedef struct DataChecksumStateStruct
 {
 	/*
 	 * These are set by pg_{enable|disable}_data_checksums, to tell the
 	 * launcher what the target state is.
 	 */
-	DataChecksumsWorkerOperation launch_operation;
+	DataChecksumWorkerOperation launch_operation;
 	int			launch_cost_delay;
 	int			launch_cost_limit;
 
@@ -315,7 +315,7 @@ typedef struct DataChecksumsStateStruct
 	 * without a lock. If multiple workers, or dynamic cost parameters, are
 	 * supported at some point then this would need to be revisited.
 	 */
-	DataChecksumsWorkerOperation operation;
+	DataChecksumWorkerOperation operation;
 	int			cost_delay;
 	int			cost_limit;
 
@@ -329,58 +329,58 @@ typedef struct DataChecksumsStateStruct
 	 */
 
 	/* result, set by worker before exiting */
-	DataChecksumsWorkerResult success;
+	DataChecksumWorkerResult success;
 
 	/*
 	 * Tells the worker process whether it should also process the shared
 	 * catalogs
 	 */
 	bool		process_shared_catalogs;
-} DataChecksumsStateStruct;
+} DataChecksumStateStruct;
 
-/* Shared memory segment for datachecksumsworker */
-static DataChecksumsStateStruct *DataChecksumState;
+/* Shared memory segment for datachecksumworker */
+static DataChecksumStateStruct *DataChecksumState;
 
-typedef struct DataChecksumsWorkerDatabase
+typedef struct DataChecksumWorkerDatabase
 {
 	Oid			dboid;
 	char	   *dbname;
-} DataChecksumsWorkerDatabase;
+} DataChecksumWorkerDatabase;
 
 /* Flag set by the interrupt handler */
 static volatile sig_atomic_t abort_requested = false;
 
 /*
- * Have we set the DataChecksumsStateStruct->launcher_running flag?
+ * Have we set the DataChecksumStateStruct->launcher_running flag?
  * If we have, we need to clear it before exiting!
  */
 static volatile sig_atomic_t launcher_running = false;
 
 /* Are we enabling data checksums, or disabling them? */
-static DataChecksumsWorkerOperation operation;
+static DataChecksumWorkerOperation operation;
 
 /* Prototypes */
-static void DataChecksumsShmemRequest(void *arg);
+static void DataChecksumShmemRequest(void *arg);
 static bool DatabaseExists(Oid dboid);
 static List *BuildDatabaseList(void);
 static List *BuildRelationList(bool temp_relations, bool include_shared);
 static void FreeDatabaseList(List *dblist);
-static DataChecksumsWorkerResult ProcessDatabase(DataChecksumsWorkerDatabase *db);
+static DataChecksumWorkerResult ProcessDatabase(DataChecksumWorkerDatabase *db);
 static bool ProcessAllDatabases(void);
 static bool ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrategy strategy);
 static void launcher_cancel_handler(SIGNAL_ARGS);
 static void WaitForAllTransactionsToFinish(void);
 
-const ShmemCallbacks DataChecksumsShmemCallbacks = {
-	.request_fn = DataChecksumsShmemRequest,
+const ShmemCallbacks DataChecksumShmemCallbacks = {
+	.request_fn = DataChecksumShmemRequest,
 };
 
 #define CHECK_FOR_ABORT_REQUEST() \
 	do {															\
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);			\
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);			\
 		if (DataChecksumState->launch_operation != operation)		\
 			abort_requested = true;									\
-		LWLockRelease(DataChecksumsWorkerLock);						\
+		LWLockRelease(DataChecksumWorkerLock);						\
 	} while (0)
 
 
@@ -389,7 +389,7 @@ const ShmemCallbacks DataChecksumsShmemCallbacks = {
  */
 
 void
-EmitAndWaitDataChecksumsBarrier(uint32 state)
+EmitAndWaitDataChecksumBarrier(uint32 state)
 {
 	uint64		barrier;
 
@@ -421,7 +421,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
 }
 
 /*
- * AbsorbDataChecksumsBarrier
+ * AbsorbDataChecksumBarrier
  *		Generic function for absorbing data checksum state changes
  *
  * All procsignalbarriers regarding data checksum state changes are absorbed
@@ -430,7 +430,7 @@ EmitAndWaitDataChecksumsBarrier(uint32 state)
  * used to look up the relevant entry.
  */
 bool
-AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier)
+AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier)
 {
 	uint32		target_state;
 	int			current = data_checksums;
@@ -516,7 +516,7 @@ disable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				errmsg("must be superuser to change data checksum state"));
 
-	StartDataChecksumsWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
+	StartDataChecksumWorkerLauncher(DISABLE_DATACHECKSUMS, 0, 0);
 	PG_RETURN_VOID();
 }
 
@@ -548,27 +548,27 @@ enable_data_checksums(PG_FUNCTION_ARGS)
 				errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				errmsg("cost limit must be greater than zero"));
 
-	StartDataChecksumsWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
+	StartDataChecksumWorkerLauncher(ENABLE_DATACHECKSUMS, cost_delay, cost_limit);
 
 	PG_RETURN_VOID();
 }
 
 
 /*****************************************************************************
- * Functionality for running the datachecksumsworker and associated launcher
+ * Functionality for running the datachecksum worker and associated launcher
  */
 
 /*
- * StartDataChecksumsWorkerLauncher
- *		Main entry point for datachecksumsworker launcher process
+ * StartDataChecksumWorkerLauncher
+ *		Main entry point for datachecksumworker launcher process
  *
  * The main entrypoint for starting data checksums processing for enabling as
  * well as disabling.
  */
 void
-StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-								 int cost_delay,
-								 int cost_limit)
+StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+								int cost_delay,
+								int cost_limit)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -580,10 +580,10 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		Assert(cost_delay == 0 && cost_limit == 0);
 #endif
 
-	INJECTION_POINT("datachecksumsworker-startup-delay", NULL);
+	INJECTION_POINT("datachecksumworker-startup-delay", NULL);
 
 	/* Store the desired state in shared memory */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	DataChecksumState->launch_operation = op;
 	DataChecksumState->launch_cost_delay = cost_delay;
@@ -592,7 +592,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 	/* Is the launcher already running? If so, what is it doing? */
 	running = DataChecksumState->launcher_running;
 
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * Launch a new launcher process, if it's not running already.
@@ -625,7 +625,7 @@ StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
 		bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 		bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 		snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumsWorkerLauncherMain");
+		snprintf(bgw.bgw_function_name, BGW_MAXLEN, "DataChecksumWorkerLauncherMain");
 		snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum launcher");
 		snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum launcher");
 		bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -715,10 +715,10 @@ ProcessSingleRelationFork(Relation reln, ForkNumber forkNum, BufferAccessStrateg
 		 * abortion will bubble up from here.
 		 */
 		Assert(operation == ENABLE_DATACHECKSUMS);
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
 		if (DataChecksumState->launch_operation == DISABLE_DATACHECKSUMS)
 			abort_requested = true;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (abort_requested)
 			return false;
@@ -795,8 +795,8 @@ ProcessSingleRelationByOid(Oid relationId, BufferAccessStrategy strategy)
  * waiting for it to finish.  We have to do this in a separate worker, since
  * each process can only be connected to one database during its lifetime.
  */
-static DataChecksumsWorkerResult
-ProcessDatabase(DataChecksumsWorkerDatabase *db)
+static DataChecksumWorkerResult
+ProcessDatabase(DataChecksumWorkerDatabase *db)
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
@@ -804,15 +804,15 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 	pid_t		pid;
 	char		activity[NAMEDATALEN + 64];
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_FAILED;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_FAILED;
+	LWLockRelease(DataChecksumWorkerLock);
 
 	memset(&bgw, 0, sizeof(bgw));
 	bgw.bgw_flags = BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
 	bgw.bgw_start_time = BgWorkerStart_RecoveryFinished;
 	snprintf(bgw.bgw_library_name, BGW_MAXLEN, "postgres");
-	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumsWorkerMain");
+	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "%s", "DataChecksumWorkerMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN, "datachecksum worker");
 	snprintf(bgw.bgw_type, BGW_MAXLEN, "datachecksum worker");
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
@@ -830,7 +830,7 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
 					   db->dbname),
 				errhint("The \"%s\" setting might be too low.", "max_worker_processes"));
-		return DATACHECKSUMSWORKER_FAILED;
+		return DATACHECKSUMWORKER_FAILED;
 	}
 
 	status = WaitForBackgroundWorkerStartup(bgw_handle, &pid);
@@ -840,17 +840,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * If the worker managed to start, and stop, before we got to waiting
 		 * for it we can see a STOPPED status here without it being a failure.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-		if (DataChecksumState->success == DATACHECKSUMSWORKER_SUCCESSFUL)
+		LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+		if (DataChecksumState->success == DATACHECKSUMWORKER_SUCCESSFUL)
 		{
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			pgstat_report_activity(STATE_IDLE, NULL);
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			DataChecksumState->worker_pid = InvalidPid;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			return DataChecksumState->success;
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		ereport(WARNING,
 				errmsg("could not start background worker for enabling data checksums in database \"%s\"",
@@ -862,9 +862,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 		 * treat it as not an error, else treat as fatal and error out.
 		 */
 		if (DatabaseExists(db->dboid))
-			return DATACHECKSUMSWORKER_FAILED;
+			return DATACHECKSUMWORKER_FAILED;
 		else
-			return DATACHECKSUMSWORKER_DROPDB;
+			return DATACHECKSUMWORKER_DROPDB;
 	}
 
 	/*
@@ -886,9 +886,9 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 				   db->dbname));
 
 	/* Save the pid of the worker so we can signal it later */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = pid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	snprintf(activity, sizeof(activity) - 1,
 			 "Waiting for worker in database %s (pid %ld)", db->dbname, (long) pid);
@@ -902,17 +902,17 @@ ProcessDatabase(DataChecksumsWorkerDatabase *db)
 					   db->dbname),
 				errhint("Restart the database and restart data checksum processing by calling pg_enable_data_checksums()."));
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_SHARED);
-	if (DataChecksumState->success == DATACHECKSUMSWORKER_ABORTED)
+	LWLockAcquire(DataChecksumWorkerLock, LW_SHARED);
+	if (DataChecksumState->success == DATACHECKSUMWORKER_ABORTED)
 		ereport(LOG,
 				errmsg("data checksums processing was aborted in database \"%s\"",
 					   db->dbname));
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	pgstat_report_activity(STATE_IDLE, NULL);
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->worker_pid = InvalidPid;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	return DataChecksumState->success;
 }
@@ -934,14 +934,14 @@ launcher_exit(int code, Datum arg)
 
 	if (launcher_running)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if (DataChecksumState->worker_pid != InvalidPid)
 		{
 			ereport(LOG,
 					errmsg("data checksums launcher exiting while worker is still running, signalling worker"));
 			kill(DataChecksumState->worker_pid, SIGTERM);
 		}
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	/*
@@ -951,10 +951,10 @@ launcher_exit(int code, Datum arg)
 	if (DataChecksumsInProgressOn())
 		SetDataChecksumsOff();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1044,7 +1044,7 @@ WaitForAllTransactionsToFinish(void)
 }
 
 /*
- * DataChecksumsWorkerLauncherMain
+ * DataChecksumWorkerLauncherMain
  *
  * Main function for launching dynamic background workers for processing data
  * checksums in databases. This function has the bgworker management, with
@@ -1052,11 +1052,11 @@ WaitForAllTransactionsToFinish(void)
  * initiating processing.
  */
 void
-DataChecksumsWorkerLauncherMain(Datum arg)
+DataChecksumWorkerLauncherMain(Datum arg)
 {
 
 	ereport(DEBUG1,
-			errmsg("background worker \"datachecksums launcher\" started"));
+			errmsg("background worker \"datachecksum launcher\" started"));
 
 	pqsignal(SIGTERM, die);
 	pqsignal(SIGINT, launcher_cancel_handler);
@@ -1065,19 +1065,19 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_LAUNCHER;
+	MyBackendType = B_DATACHECKSUMWORKER_LAUNCHER;
 	init_ps_display(NULL);
 
-	INJECTION_POINT("datachecksumsworker-launcher-delay", NULL);
+	INJECTION_POINT("datachecksumworker-launcher-delay", NULL);
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 
 	if (DataChecksumState->launcher_running)
 	{
 		ereport(LOG,
-				errmsg("background worker \"datachecksums launcher\" already running, exiting"));
+				errmsg("background worker \"datachecksum launcher\" already running, exiting"));
 		/* Launcher was already running, let it finish */
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		return;
 	}
 
@@ -1092,7 +1092,7 @@ DataChecksumsWorkerLauncherMain(Datum arg)
 	DataChecksumState->operation = operation;
 	DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 	DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/*
 	 * The target state can change while we are busy enabling/disabling
@@ -1134,13 +1134,13 @@ again:
 			 * If the target state changed during processing then it's not a
 			 * failure, so restart processing instead.
 			 */
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 			if (DataChecksumState->launch_operation != operation)
 			{
-				LWLockRelease(DataChecksumsWorkerLock);
+				LWLockRelease(DataChecksumWorkerLock);
 				goto done;
 			}
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(ERROR,
 					errcode(ERRCODE_INSUFFICIENT_RESOURCES),
 					errmsg("unable to enable data checksums in cluster"));
@@ -1183,14 +1183,14 @@ done:
 	 * while we were running. In that case we will have to start all over
 	 * again.
 	 */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	if (DataChecksumState->launch_operation != operation)
 	{
 		DataChecksumState->operation = DataChecksumState->launch_operation;
 		operation = DataChecksumState->launch_operation;
 		DataChecksumState->cost_delay = DataChecksumState->launch_cost_delay;
 		DataChecksumState->cost_limit = DataChecksumState->launch_cost_limit;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 		goto again;
 	}
 
@@ -1199,7 +1199,7 @@ done:
 
 	launcher_running = false;
 	DataChecksumState->launcher_running = false;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 }
 
 /*
@@ -1217,9 +1217,9 @@ ProcessAllDatabases(void)
 	int			cumulative_total = 0;
 
 	/* Set up so first run processes shared catalogs, not once in every db */
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 	DataChecksumState->process_shared_catalogs = true;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockRelease(DataChecksumWorkerLock);
 
 	/* Get a list of all databases to process */
 	WaitForAllTransactionsToFinish();
@@ -1254,18 +1254,18 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_multi_param(6, index, vals);
 	}
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, DatabaseList)
+	foreach_ptr(DataChecksumWorkerDatabase, db, DatabaseList)
 	{
-		DataChecksumsWorkerResult result;
+		DataChecksumWorkerResult result;
 
 		result = ProcessDatabase(db);
 
 #ifdef USE_INJECTION_POINTS
 		/* Allow a test process to alter the result of the operation */
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fail-db-result"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fail-db-result"))
 		{
-			result = DATACHECKSUMSWORKER_FAILED;
-			INJECTION_POINT_CACHED("datachecksumsworker-fail-db-result",
+			result = DATACHECKSUMWORKER_FAILED;
+			INJECTION_POINT_CACHED("datachecksumworker-fail-db-result",
 								   db->dbname);
 		}
 #endif
@@ -1273,7 +1273,7 @@ ProcessAllDatabases(void)
 		pgstat_progress_update_param(PROGRESS_DATACHECKSUMS_DBS_DONE,
 									 ++cumulative_total);
 
-		if (result == DATACHECKSUMSWORKER_FAILED)
+		if (result == DATACHECKSUMWORKER_FAILED)
 		{
 			/*
 			 * Disable checksums on cluster, because we failed one of the
@@ -1285,7 +1285,7 @@ ProcessAllDatabases(void)
 					errmsg("data checksums failed to get enabled in all databases, aborting"),
 					errhint("The server log might have more information on the cause of the error."));
 		}
-		else if (result == DATACHECKSUMSWORKER_ABORTED || abort_requested)
+		else if (result == DATACHECKSUMWORKER_ABORTED || abort_requested)
 		{
 			/* Abort flag set, so exit the whole process */
 			return false;
@@ -1295,9 +1295,9 @@ ProcessAllDatabases(void)
 		 * When one database has completed, it will have done shared catalogs
 		 * so we don't have to process them again.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		DataChecksumState->process_shared_catalogs = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 	}
 
 	FreeDatabaseList(DatabaseList);
@@ -1308,14 +1308,14 @@ ProcessAllDatabases(void)
 }
 
 /*
- * DataChecksumsShmemRequest
- *		Request datachecksumsworker-related shared memory
+ * DataChecksumShmemRequest
+ *		Request datachecksumworker-related shared memory
  */
 static void
-DataChecksumsShmemRequest(void *arg)
+DataChecksumShmemRequest(void *arg)
 {
-	ShmemRequestStruct(.name = "DataChecksumsWorker Data",
-					   .size = sizeof(DataChecksumsStateStruct),
+	ShmemRequestStruct(.name = "DataChecksumWorker Data",
+					   .size = sizeof(DataChecksumStateStruct),
 					   .ptr = (void **) &DataChecksumState,
 		);
 }
@@ -1370,7 +1370,7 @@ DatabaseExists(Oid dboid)
  * BuildDatabaseList
  *		Compile a list of all currently available databases in the cluster
  *
- * This creates the list of databases for the datachecksumsworker workers to
+ * This creates the list of databases for the datachecksum workers to
  * add checksums to. If the caller wants to ensure that no concurrently
  * running CREATE DATABASE calls exist, this needs to be preceded by a call
  * to WaitForAllTransactionsToFinish().
@@ -1393,11 +1393,11 @@ BuildDatabaseList(void)
 	while (HeapTupleIsValid(tup = heap_getnext(scan, ForwardScanDirection)))
 	{
 		Form_pg_database pgdb = (Form_pg_database) GETSTRUCT(tup);
-		DataChecksumsWorkerDatabase *db;
+		DataChecksumWorkerDatabase *db;
 
 		oldctx = MemoryContextSwitchTo(ctx);
 
-		db = (DataChecksumsWorkerDatabase *) palloc0(sizeof(DataChecksumsWorkerDatabase));
+		db = (DataChecksumWorkerDatabase *) palloc0(sizeof(DataChecksumWorkerDatabase));
 
 		db->dboid = pgdb->oid;
 		db->dbname = pstrdup(NameStr(pgdb->datname));
@@ -1421,7 +1421,7 @@ FreeDatabaseList(List *dblist)
 	if (!dblist)
 		return;
 
-	foreach_ptr(DataChecksumsWorkerDatabase, db, dblist)
+	foreach_ptr(DataChecksumWorkerDatabase, db, dblist)
 	{
 		if (db->dbname != NULL)
 			pfree(db->dbname);
@@ -1496,7 +1496,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
 }
 
 /*
- * DataChecksumsWorkerMain
+ * DataChecksumWorkerMain
  *
  * Main function for enabling checksums in a single database. This is the
  * function set as the bgw_function_name in the dynamic background worker
@@ -1507,7 +1507,7 @@ BuildRelationList(bool temp_relations, bool include_shared)
  * existing temporary relations with data checksums.
  */
 void
-DataChecksumsWorkerMain(Datum arg)
+DataChecksumWorkerMain(Datum arg)
 {
 	Oid			dboid = DatumGetObjectId(arg);
 	List	   *RelationList = NIL;
@@ -1526,7 +1526,7 @@ DataChecksumsWorkerMain(Datum arg)
 
 	BackgroundWorkerUnblockSignals();
 
-	MyBackendType = B_DATACHECKSUMSWORKER_WORKER;
+	MyBackendType = B_DATACHECKSUMWORKER_WORKER;
 	init_ps_display(NULL);
 
 	BackgroundWorkerInitializeConnectionByOid(dboid, InvalidOid,
@@ -1606,7 +1606,7 @@ DataChecksumsWorkerMain(Datum arg)
 		 * to reflect the new values and signal that the access strategy needs
 		 * to be refreshed.
 		 */
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
 		if ((DataChecksumState->launch_cost_delay != DataChecksumState->cost_delay)
 			|| (DataChecksumState->launch_cost_limit != DataChecksumState->cost_limit))
 		{
@@ -1620,7 +1620,7 @@ DataChecksumsWorkerMain(Datum arg)
 		}
 		else
 			costs_updated = false;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockRelease(DataChecksumWorkerLock);
 
 		if (costs_updated)
 		{
@@ -1634,9 +1634,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 	if (aborted || abort_requested)
 	{
-		LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-		DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-		LWLockRelease(DataChecksumsWorkerLock);
+		LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+		DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+		LWLockRelease(DataChecksumWorkerLock);
 		ereport(DEBUG1,
 				errmsg("data checksum processing aborted in database OID %u",
 					   dboid));
@@ -1669,7 +1669,7 @@ DataChecksumsWorkerMain(Datum arg)
 		list_free(CurrentTempTables);
 
 #ifdef USE_INJECTION_POINTS
-		if (IS_INJECTION_POINT_ATTACHED("datachecksumsworker-fake-temptable-wait"))
+		if (IS_INJECTION_POINT_ATTACHED("datachecksumworker-fake-temptable-wait"))
 		{
 			/* Make sure to just cause one retry */
 			if (!retried && numleft == 0)
@@ -1677,7 +1677,7 @@ DataChecksumsWorkerMain(Datum arg)
 				numleft = 1;
 				retried = true;
 
-				INJECTION_POINT_CACHED("datachecksumsworker-fake-temptable-wait", NULL);
+				INJECTION_POINT_CACHED("datachecksumworker-fake-temptable-wait", NULL);
 			}
 		}
 #endif
@@ -1706,9 +1706,9 @@ DataChecksumsWorkerMain(Datum arg)
 
 		if (aborted || abort_requested)
 		{
-			LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-			DataChecksumState->success = DATACHECKSUMSWORKER_ABORTED;
-			LWLockRelease(DataChecksumsWorkerLock);
+			LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+			DataChecksumState->success = DATACHECKSUMWORKER_ABORTED;
+			LWLockRelease(DataChecksumWorkerLock);
 			ereport(LOG,
 					errmsg("data checksum processing aborted in database OID %u",
 						   dboid));
@@ -1721,7 +1721,7 @@ DataChecksumsWorkerMain(Datum arg)
 	/* worker done */
 	pgstat_progress_end_command();
 
-	LWLockAcquire(DataChecksumsWorkerLock, LW_EXCLUSIVE);
-	DataChecksumState->success = DATACHECKSUMSWORKER_SUCCESSFUL;
-	LWLockRelease(DataChecksumsWorkerLock);
+	LWLockAcquire(DataChecksumWorkerLock, LW_EXCLUSIVE);
+	DataChecksumState->success = DATACHECKSUMWORKER_SUCCESSFUL;
+	LWLockRelease(DataChecksumWorkerLock);
 }
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 90c7c4528e8..0debcb18991 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3010,8 +3010,8 @@ PostmasterStateMachine(void)
 
 			/* also add data checksums processes */
 			remainMask = btmask_add(remainMask,
-									B_DATACHECKSUMSWORKER_LAUNCHER,
-									B_DATACHECKSUMSWORKER_WORKER);
+									B_DATACHECKSUMWORKER_LAUNCHER,
+									B_DATACHECKSUMWORKER_WORKER);
 
 			/* All types should be included in targetMask or remainMask */
 			Assert((remainMask.mask | targetMask.mask) == BTYPE_MASK_ALL.mask);
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 1397f65f67b..0e0c7acf0df 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -596,7 +596,7 @@ ProcessProcSignalBarrier(void)
 					case PROCSIGNAL_BARRIER_CHECKSUM_ON:
 					case PROCSIGNAL_BARRIER_CHECKSUM_INPROGRESS_OFF:
 					case PROCSIGNAL_BARRIER_CHECKSUM_OFF:
-						processed = AbsorbDataChecksumsBarrier(type);
+						processed = AbsorbDataChecksumBarrier(type);
 						break;
 				}
 
diff --git a/src/backend/utils/activity/pgstat_backend.c b/src/backend/utils/activity/pgstat_backend.c
index 73461c9bca5..bccf6f27121 100644
--- a/src/backend/utils/activity/pgstat_backend.c
+++ b/src/backend/utils/activity/pgstat_backend.c
@@ -381,8 +381,8 @@ pgstat_tracks_backend_bktype(BackendType bktype)
 		case B_CHECKPOINTER:
 		case B_IO_WORKER:
 		case B_STARTUP:
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 			return false;
 
 		case B_AUTOVAC_WORKER:
diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c
index 13a5d8e6440..49f0466040b 100644
--- a/src/backend/utils/activity/pgstat_io.c
+++ b/src/backend/utils/activity/pgstat_io.c
@@ -362,8 +362,8 @@ pgstat_tracks_io_bktype(BackendType bktype)
 		case B_LOGGER:
 			return false;
 
-		case B_DATACHECKSUMSWORKER_LAUNCHER:
-		case B_DATACHECKSUMSWORKER_WORKER:
+		case B_DATACHECKSUMWORKER_LAUNCHER:
+		case B_DATACHECKSUMWORKER_WORKER:
 		case B_AUTOVAC_LAUNCHER:
 		case B_AUTOVAC_WORKER:
 		case B_BACKEND:
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 7ffc808073a..42a0e896f1d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -846,7 +846,7 @@ InitializeSessionUserIdStandalone(void)
 	 */
 	Assert(!IsUnderPostmaster || AmAutoVacuumWorkerProcess() ||
 		   AmLogicalSlotSyncWorkerProcess() || AmBackgroundWorkerProcess() ||
-		   AmDataChecksumsWorkerProcess());
+		   AmDataChecksumWorkerProcess());
 
 	/* call only once */
 	Assert(!OidIsValid(AuthenticatedUserId));
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 2460e550f96..9acd984da42 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -921,7 +921,7 @@ InitPostgres(const char *in_dbname, Oid dboid,
 					 errhint("You should immediately run CREATE USER \"%s\" SUPERUSER;.",
 							 username != NULL ? username : "postgres")));
 	}
-	else if (AmBackgroundWorkerProcess() || AmDataChecksumsWorkerProcess())
+	else if (AmBackgroundWorkerProcess() || AmDataChecksumWorkerProcess())
 	{
 		if (username == NULL && !OidIsValid(useroid))
 		{
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 7de0a115402..bc538ac212e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -370,8 +370,8 @@ typedef enum BackendType
 	B_WAL_SUMMARIZER,
 	B_WAL_WRITER,
 
-	B_DATACHECKSUMSWORKER_LAUNCHER,
-	B_DATACHECKSUMSWORKER_WORKER,
+	B_DATACHECKSUMWORKER_LAUNCHER,
+	B_DATACHECKSUMWORKER_WORKER,
 
 	/*
 	 * Logger is not connected to shared memory and does not have a PGPROC
@@ -398,9 +398,9 @@ extern PGDLLIMPORT BackendType MyBackendType;
 #define AmWalSummarizerProcess()	(MyBackendType == B_WAL_SUMMARIZER)
 #define AmWalWriterProcess()		(MyBackendType == B_WAL_WRITER)
 #define AmIoWorkerProcess()			(MyBackendType == B_IO_WORKER)
-#define AmDataChecksumsWorkerProcess() \
-	(MyBackendType == B_DATACHECKSUMSWORKER_LAUNCHER || \
-	 MyBackendType == B_DATACHECKSUMSWORKER_WORKER)
+#define AmDataChecksumWorkerProcess() \
+	(MyBackendType == B_DATACHECKSUMWORKER_LAUNCHER || \
+	 MyBackendType == B_DATACHECKSUMWORKER_WORKER)
 
 #define AmSpecialWorkerProcess() \
 	(AmAutoVacuumLauncherProcess() || \
diff --git a/src/include/postmaster/datachecksum_state.h b/src/include/postmaster/datachecksum_state.h
index 2a1ae10d55d..4426f9dc622 100644
--- a/src/include/postmaster/datachecksum_state.h
+++ b/src/include/postmaster/datachecksum_state.h
@@ -17,12 +17,12 @@
 
 #include "storage/procsignal.h"
 
-/* Possible operations the DataChecksumsWorker can perform */
-typedef enum DataChecksumsWorkerOperation
+/* Possible operations the DataChecksumWorker can perform */
+typedef enum DataChecksumWorkerOperation
 {
 	ENABLE_DATACHECKSUMS,
 	DISABLE_DATACHECKSUMS,
-} DataChecksumsWorkerOperation;
+} DataChecksumWorkerOperation;
 
 /*
  * Possible states for a database entry which has been processed. Exported
@@ -30,25 +30,25 @@ typedef enum DataChecksumsWorkerOperation
  */
 typedef enum
 {
-	DATACHECKSUMSWORKER_SUCCESSFUL = 0,
-	DATACHECKSUMSWORKER_ABORTED,
-	DATACHECKSUMSWORKER_FAILED,
-	DATACHECKSUMSWORKER_DROPDB,
-} DataChecksumsWorkerResult;
+	DATACHECKSUMWORKER_SUCCESSFUL = 0,
+	DATACHECKSUMWORKER_ABORTED,
+	DATACHECKSUMWORKER_FAILED,
+	DATACHECKSUMWORKER_DROPDB,
+} DataChecksumWorkerResult;
 
 /* Prototypes for data checksum state manipulation */
-bool		AbsorbDataChecksumsBarrier(ProcSignalBarrierType barrier);
-void		EmitAndWaitDataChecksumsBarrier(uint32 state);
+bool		AbsorbDataChecksumBarrier(ProcSignalBarrierType barrier);
+void		EmitAndWaitDataChecksumBarrier(uint32 state);
 
 /* Prototypes for data checksum background worker */
 
 /* Start the background processes for enabling or disabling checksums */
-void		StartDataChecksumsWorkerLauncher(DataChecksumsWorkerOperation op,
-											 int cost_delay,
-											 int cost_limit);
+void		StartDataChecksumWorkerLauncher(DataChecksumWorkerOperation op,
+											int cost_delay,
+											int cost_limit);
 
 /* Background worker entrypoints */
-void		DataChecksumsWorkerLauncherMain(Datum arg);
-void		DataChecksumsWorkerMain(Datum arg);
+void		DataChecksumWorkerLauncherMain(Datum arg);
+void		DataChecksumWorkerMain(Datum arg);
 
 #endif							/* DATACHECKSUM_STATE_H */
diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h
index b3477e6f17a..ec84860a613 100644
--- a/src/include/postmaster/proctypelist.h
+++ b/src/include/postmaster/proctypelist.h
@@ -38,8 +38,8 @@ PG_PROCTYPE(B_BACKEND, "backend", gettext_noop("client backend"), BackendMain, t
 PG_PROCTYPE(B_BG_WORKER, "bgworker", gettext_noop("background worker"), BackgroundWorkerMain, true)
 PG_PROCTYPE(B_BG_WRITER, "bgwriter", gettext_noop("background writer"), BackgroundWriterMain, true)
 PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", gettext_noop("checkpointer"), CheckpointerMain, true)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
-PG_PROCTYPE(B_DATACHECKSUMSWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_LAUNCHER, "checksums", gettext_noop("datachecksum launcher"), NULL, false)
+PG_PROCTYPE(B_DATACHECKSUMWORKER_WORKER, "checksums", gettext_noop("datachecksum worker"), NULL, false)
 PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", gettext_noop("dead-end client backend"), BackendMain, true)
 PG_PROCTYPE(B_INVALID, "postmaster", gettext_noop("unrecognized"), NULL, false)
 PG_PROCTYPE(B_IO_WORKER, "ioworker", gettext_noop("io worker"), IoWorkerMain, true)
diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 9ad619080be..e9bd1ce0681 100644
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -84,7 +84,7 @@ PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
 #endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
-PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)
+PG_SHMEM_SUBSYSTEM(DataChecksumShmemCallbacks)
 
 /* AIO subsystem. This delegates to the method-specific callbacks */
 PG_SHMEM_SUBSYSTEM(AioShmemCallbacks)
-- 
2.47.3


----Next_Part(Thu_May_28_12_16_22_2026_214)----





^ permalink  raw  reply  [nested|flat] 196+ messages in thread