database/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-05 15:41:11 +03:00
Code Activity

Rename HRN_PG_CONTROL_OVERRIDE_PUT().

Browse Source 
Rename to HRN_PG_CONTROL_OVERRIDE_VERSION_PUT() since other types of overrides are possible (and coming).
This commit is contained in:
David Steele
2023-07-26 10:45:12 +02:00
parent 65fb3b3b2d
commit f55c8f1b81
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/src/common/harnessPostgres.h
View File

@ -50,7 +50,7 @@ Put a control file to storage
storageParam, PG_PATH_GLOBAL "/" PG_FILE_PGCONTROL, \ storageParam, PG_PATH_GLOBAL "/" PG_FILE_PGCONTROL, \
hrnPgControlToBuffer(0, (PgControl){.version = versionParam, __VA_ARGS__})) hrnPgControlToBuffer(0, (PgControl){.version = versionParam, __VA_ARGS__}))
#define HRN_PG_CONTROL_OVERRIDE_PUT(storageParam, versionParam, controlVersionParam, ...) \ #define HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storageParam, versionParam, controlVersionParam, ...) \
HRN_STORAGE_PUT( \ HRN_STORAGE_PUT( \
storageParam, PG_PATH_GLOBAL "/" PG_FILE_PGCONTROL, \ storageParam, PG_PATH_GLOBAL "/" PG_FILE_PGCONTROL, \
hrnPgControlToBuffer(controlVersionParam, (PgControl){.version = versionParam, __VA_ARGS__})) hrnPgControlToBuffer(controlVersionParam, (PgControl){.version = versionParam, __VA_ARGS__}))

2
test/src/module/command/archiveGetTest.c
View File

@ -833,7 +833,7 @@ testRun(void)
TEST_TITLE("get WAL segment with a modified control/catalog version"); TEST_TITLE("get WAL segment with a modified control/catalog version");
// Modify control/catalog version and use the --pg-version option // Modify control/catalog version and use the --pg-version option
HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_10, 1501, .catalogVersion = 202211111); HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_10, 1501, .catalogVersion = 202211111);
TEST_ERROR( TEST_ERROR(
cmdArchiveGet(), VersionNotSupportedError, cmdArchiveGet(), VersionNotSupportedError,

2
test/src/module/command/archivePushTest.c
View File

@ -469,7 +469,7 @@ testRun(void)
"unexpected WAL magic 999\n" "unexpected WAL magic 999\n"
"HINT: is this version of PostgreSQL supported?"); "HINT: is this version of PostgreSQL supported?");
HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211111); HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211111);
TEST_ERROR( TEST_ERROR(
cmdArchivePush(), VersionNotSupportedError, cmdArchivePush(), VersionNotSupportedError,

2
test/src/module/command/backupTest.c
View File

@ -3584,7 +3584,7 @@ testRun(void)
HRN_CFG_LOAD(cfgCmdBackup, argList); HRN_CFG_LOAD(cfgCmdBackup, argList);
// Create pg_control with unexpected catalog and control version // Create pg_control with unexpected catalog and control version
HRN_PG_CONTROL_OVERRIDE_PUT( HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(
storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211110, .pageChecksum = true, storagePgWrite(), PG_VERSION_11, 1501, .catalogVersion = 202211110, .pageChecksum = true,
.walSegmentSize = 1024 * 1024); .walSegmentSize = 1024 * 1024);

4
test/src/module/command/stanzaTest.c
View File

@ -523,7 +523,7 @@ testRun(void)
hrnCfgArgRawZ(argList, cfgOptPgVersionForce, "15"); hrnCfgArgRawZ(argList, cfgOptPgVersionForce, "15");
HRN_CFG_LOAD(cfgCmdStanzaCreate, argList); HRN_CFG_LOAD(cfgCmdStanzaCreate, argList);
HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111); HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111);
TEST_RESULT_VOID(cmdStanzaCreate(), "stanza create - forcing another PG version"); TEST_RESULT_VOID(cmdStanzaCreate(), "stanza create - forcing another PG version");
TEST_RESULT_LOG("P00 INFO: stanza-create for stanza 'db' on repo1"); TEST_RESULT_LOG("P00 INFO: stanza-create for stanza 'db' on repo1");
@ -927,7 +927,7 @@ testRun(void)
hrnCfgArgRawZ(argList, cfgOptPgVersionForce, "15"); hrnCfgArgRawZ(argList, cfgOptPgVersionForce, "15");
HRN_CFG_LOAD(cfgCmdStanzaUpgrade, argList); HRN_CFG_LOAD(cfgCmdStanzaUpgrade, argList);
HRN_PG_CONTROL_OVERRIDE_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111); HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storagePgWrite(), PG_VERSION_15, 1501, .catalogVersion = 202211111);
HRN_INFO_PUT( HRN_INFO_PUT(
storageRepoIdxWrite(0), INFO_BACKUP_PATH_FILE, storageRepoIdxWrite(0), INFO_BACKUP_PATH_FILE,

4
test/src/module/postgres/interfaceTest.c
View File

@ -67,7 +67,7 @@ testRun(void)
// ------------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("unknown control version"); TEST_TITLE("unknown control version");
HRN_PG_CONTROL_OVERRIDE_PUT(storageTest, PG_VERSION_15, 1501, .catalogVersion = 202211111); HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(storageTest, PG_VERSION_15, 1501, .catalogVersion = 202211111);
TEST_ERROR( TEST_ERROR(
pgControlFromFile(storageTest, NULL), VersionNotSupportedError, pgControlFromFile(storageTest, NULL), VersionNotSupportedError,
@ -114,7 +114,7 @@ testRun(void)
// ------------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("force control version"); TEST_TITLE("force control version");
HRN_PG_CONTROL_OVERRIDE_PUT( HRN_PG_CONTROL_OVERRIDE_VERSION_PUT(
storageTest, PG_VERSION_15, 1501, .systemId = 0xEFEFEFEFEF, .catalogVersion = 202211111, storageTest, PG_VERSION_15, 1501, .systemId = 0xEFEFEFEFEF, .catalogVersion = 202211111,
.checkpoint = 0xAABBAABBEEFFEEFF, .timeline = 88); .checkpoint = 0xAABBAABBEEFFEEFF, .timeline = 88);