diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2024-07-23 09:53:54 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2024-07-23 10:00:41 +0200 |
| commit | 935e675f3c9efd0e39bf33db15ab85049cc4ee7c (patch) | |
| tree | 9c996e50da9c00aa2cdc37ae1ade03ff3a550b5e /src/backend/access/transam/xlog.c | |
| parent | ffb0603929617f39d449e942abe96cdba36e7545 (diff) | |
| download | postgresql-935e675f3c9efd0e39bf33db15ab85049cc4ee7c.tar.gz postgresql-935e675f3c9efd0e39bf33db15ab85049cc4ee7c.zip | |
Get rid of a global variable
bootstrap_data_checksum_version can just as easily be passed to where
it is used via function arguments.
Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://www.postgresql.org/message-id/flat/e0a62134-83da-4ba4-8cdb-ceb0111c95ce@eisentraut.org
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index d70ba67bac9..473a9c5c2f8 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -105,8 +105,6 @@ #include "utils/timestamp.h" #include "utils/varlena.h" -extern uint32 bootstrap_data_checksum_version; - /* timeline ID to be used when bootstrapping */ #define BootstrapTimeLineID 1 @@ -683,7 +681,7 @@ static void ValidateXLOGDirectoryStructure(void); static void CleanupBackupHistory(void); static void UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force); static bool PerformRecoveryXLogAction(void); -static void InitControlFile(uint64 sysidentifier); +static void InitControlFile(uint64 sysidentifier, uint32 data_checksum_version); static void WriteControlFile(void); static void ReadControlFile(void); static void UpdateControlFile(void); @@ -4190,7 +4188,7 @@ CleanupBackupHistory(void) */ static void -InitControlFile(uint64 sysidentifier) +InitControlFile(uint64 sysidentifier, uint32 data_checksum_version) { char mock_auth_nonce[MOCK_AUTH_NONCE_LEN]; @@ -4221,7 +4219,7 @@ InitControlFile(uint64 sysidentifier) ControlFile->wal_level = wal_level; ControlFile->wal_log_hints = wal_log_hints; ControlFile->track_commit_timestamp = track_commit_timestamp; - ControlFile->data_checksum_version = bootstrap_data_checksum_version; + ControlFile->data_checksum_version = data_checksum_version; } static void @@ -4997,7 +4995,7 @@ XLOGShmemInit(void) * and the initial XLOG segment. */ void -BootStrapXLOG(void) +BootStrapXLOG(uint32 data_checksum_version) { CheckPoint checkPoint; char *buffer; @@ -5139,7 +5137,7 @@ BootStrapXLOG(void) openLogFile = -1; /* Now create pg_control */ - InitControlFile(sysidentifier); + InitControlFile(sysidentifier, data_checksum_version); ControlFile->time = checkPoint.time; ControlFile->checkPoint = checkPoint.redo; ControlFile->checkPointCopy = checkPoint; |