diff options
| author | Michael Paquier <michael@paquier.xyz> | 2022-04-12 17:28:17 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2022-04-12 17:28:17 +0900 |
| commit | 3603f7c6e66afda7c7bf4acdefd4e5b04c5478b3 (patch) | |
| tree | 44cfb27d358f8a39842280644b14e910a3fb98bf /src/bin/pg_basebackup/pg_basebackup.c | |
| parent | ce4f46fdc814eb1b704d81640f6d8f03625d0f53 (diff) | |
Remove WalCompressionMethod in favor of pg_compress_algorithm
The same structure, with the same set of elements (for none, lz4, gzip
and zstd), exists in compression.h, so let's make use of the centralized
version instead of duplicating things. Some of the variables used
previously for WalCompressionMethod are renamed to stick better with the
new structure and routine names.
WalCompressionMethod was leading to some confusion in walmethods.c, as
it was sometimes used to refer to some data unrelated to WAL.
Reported-by: Robert Haas
Author: Michael Paquier
Reviewed-by: Robert Haas, Georgios Kokolatos
Discussion: https://postgr.es/m/YlPQGNAAa04raObK@paquier.xyz
Diffstat (limited to 'src/bin/pg_basebackup/pg_basebackup.c')
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 91bdaf6cc2d..6be04544763 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -520,7 +520,7 @@ typedef struct char xlog[MAXPGPATH]; /* directory or tarfile depending on mode */ char *sysidentifier; int timeline; - WalCompressionMethod wal_compress_method; + pg_compress_algorithm wal_compress_algorithm; int wal_compress_level; } logstreamer_param; @@ -550,11 +550,11 @@ LogStreamerMain(logstreamer_param *param) stream.replication_slot = replication_slot; if (format == 'p') stream.walmethod = CreateWalDirectoryMethod(param->xlog, - COMPRESSION_NONE, 0, + PG_COMPRESSION_NONE, 0, stream.do_sync); else stream.walmethod = CreateWalTarMethod(param->xlog, - param->wal_compress_method, + param->wal_compress_algorithm, param->wal_compress_level, stream.do_sync); @@ -602,7 +602,7 @@ LogStreamerMain(logstreamer_param *param) */ static void StartLogStreamer(char *startpos, uint32 timeline, char *sysidentifier, - WalCompressionMethod wal_compress_method, + pg_compress_algorithm wal_compress_algorithm, int wal_compress_level) { logstreamer_param *param; @@ -613,7 +613,7 @@ StartLogStreamer(char *startpos, uint32 timeline, char *sysidentifier, param = pg_malloc0(sizeof(logstreamer_param)); param->timeline = timeline; param->sysidentifier = sysidentifier; - param->wal_compress_method = wal_compress_method; + param->wal_compress_algorithm = wal_compress_algorithm; param->wal_compress_level = wal_compress_level; /* Convert the starting position */ @@ -2019,7 +2019,7 @@ BaseBackup(char *compression_algorithm, char *compression_detail, */ if (includewal == STREAM_WAL) { - WalCompressionMethod wal_compress_method; + pg_compress_algorithm wal_compress_algorithm; int wal_compress_level; if (verbose) @@ -2027,19 +2027,19 @@ BaseBackup(char *compression_algorithm, char *compression_detail, if (client_compress->algorithm == PG_COMPRESSION_GZIP) { - wal_compress_method = COMPRESSION_GZIP; + wal_compress_algorithm = PG_COMPRESSION_GZIP; wal_compress_level = (client_compress->options & PG_COMPRESSION_OPTION_LEVEL) != 0 ? client_compress->level : 0; } else { - wal_compress_method = COMPRESSION_NONE; + wal_compress_algorithm = PG_COMPRESSION_NONE; wal_compress_level = 0; } StartLogStreamer(xlogstart, starttli, sysidentifier, - wal_compress_method, wal_compress_level); + wal_compress_algorithm, wal_compress_level); } if (serverMajor >= 1500) |