+ Rename Archive
modules to remove redundancy.
+
diff --git a/lib/pgBackRest/Archive/Archive.pm b/lib/pgBackRest/Archive/Base.pm
similarity index 95%
rename from lib/pgBackRest/Archive/Archive.pm
rename to lib/pgBackRest/Archive/Base.pm
index 33ae8efaf..637c08268 100644
--- a/lib/pgBackRest/Archive/Archive.pm
+++ b/lib/pgBackRest/Archive/Base.pm
@@ -1,7 +1,7 @@
####################################################################################################################################
# ARCHIVE MODULE
####################################################################################################################################
-package pgBackRest::Archive::Archive;
+package pgBackRest::Archive::Base;
use strict;
use warnings FATAL => qw(all);
@@ -11,8 +11,8 @@ use Exporter qw(import);
our @EXPORT = qw();
use File::Basename qw(dirname);
-use pgBackRest::Archive::ArchiveInfo;
-use pgBackRest::Archive::ArchiveCommon;
+use pgBackRest::Archive::Info;
+use pgBackRest::Archive::Common;
use pgBackRest::Db;
use pgBackRest::DbVersion;
use pgBackRest::Common::Exception;
@@ -97,7 +97,7 @@ sub getCheck
{
# check that the archive info is compatible with the database
$strArchiveId =
- (new pgBackRest::Archive::ArchiveInfo(
+ (new pgBackRest::Archive::Info(
storageRepo()->pathGet(STORAGE_REPO_ARCHIVE), true))->check($strDbVersion, $ullDbSysId);
if (defined($strWalFile))
diff --git a/lib/pgBackRest/Archive/ArchiveCommon.pm b/lib/pgBackRest/Archive/Common.pm
similarity index 99%
rename from lib/pgBackRest/Archive/ArchiveCommon.pm
rename to lib/pgBackRest/Archive/Common.pm
index 3b726d155..181eefe85 100644
--- a/lib/pgBackRest/Archive/ArchiveCommon.pm
+++ b/lib/pgBackRest/Archive/Common.pm
@@ -1,7 +1,7 @@
####################################################################################################################################
# ARCHIVE COMMON MODULE
####################################################################################################################################
-package pgBackRest::Archive::ArchiveCommon;
+package pgBackRest::Archive::Common;
use strict;
use warnings FATAL => qw(all);
diff --git a/lib/pgBackRest/Archive/ArchiveGet.pm b/lib/pgBackRest/Archive/Get/Get.pm
similarity index 95%
rename from lib/pgBackRest/Archive/ArchiveGet.pm
rename to lib/pgBackRest/Archive/Get/Get.pm
index 270d658e4..b2766c728 100644
--- a/lib/pgBackRest/Archive/ArchiveGet.pm
+++ b/lib/pgBackRest/Archive/Get/Get.pm
@@ -1,8 +1,8 @@
####################################################################################################################################
# ARCHIVE GET MODULE
####################################################################################################################################
-package pgBackRest::Archive::ArchiveGet;
-use parent 'pgBackRest::Archive::Archive';
+package pgBackRest::Archive::Get::Get;
+use parent 'pgBackRest::Archive::Base';
use strict;
use warnings FATAL => qw(all);
@@ -18,8 +18,8 @@ use Scalar::Util qw(blessed);
use pgBackRest::Common::Exception;
use pgBackRest::Common::Lock;
use pgBackRest::Common::Log;
-use pgBackRest::Archive::ArchiveCommon;
-use pgBackRest::Archive::ArchiveInfo;
+use pgBackRest::Archive::Common;
+use pgBackRest::Archive::Info;
use pgBackRest::Common::String;
use pgBackRest::Common::Wait;
use pgBackRest::Config::Config;
@@ -160,7 +160,7 @@ sub getArchiveId
}
else
{
- $strArchiveId = (new pgBackRest::Archive::ArchiveInfo(storageRepo()->pathGet(STORAGE_REPO_ARCHIVE), true))->archiveId();
+ $strArchiveId = (new pgBackRest::Archive::Info(storageRepo()->pathGet(STORAGE_REPO_ARCHIVE), true))->archiveId();
}
# Return from function and log return values if any
diff --git a/lib/pgBackRest/Archive/ArchiveInfo.pm b/lib/pgBackRest/Archive/Info.pm
similarity index 99%
rename from lib/pgBackRest/Archive/ArchiveInfo.pm
rename to lib/pgBackRest/Archive/Info.pm
index 979ba583b..dc449904c 100644
--- a/lib/pgBackRest/Archive/ArchiveInfo.pm
+++ b/lib/pgBackRest/Archive/Info.pm
@@ -5,7 +5,7 @@
# regarding the stanza database version, database WAL segment system id and other information to ensure that archiving is being
# performed on the proper database.
####################################################################################################################################
-package pgBackRest::Archive::ArchiveInfo;
+package pgBackRest::Archive::Info;
use parent 'pgBackRest::Common::Ini';
use strict;
@@ -17,7 +17,7 @@ use Exporter qw(import);
our @EXPORT = qw();
use File::Basename qw(dirname basename);
-use pgBackRest::Archive::ArchiveCommon;
+use pgBackRest::Archive::Common;
use pgBackRest::Common::Exception;
use pgBackRest::Config::Config;
use pgBackRest::Common::Ini;
diff --git a/lib/pgBackRest/Archive/ArchivePushAsync.pm b/lib/pgBackRest/Archive/Push/Async.pm
similarity index 98%
rename from lib/pgBackRest/Archive/ArchivePushAsync.pm
rename to lib/pgBackRest/Archive/Push/Async.pm
index 225221ac7..f85a2d34f 100644
--- a/lib/pgBackRest/Archive/ArchivePushAsync.pm
+++ b/lib/pgBackRest/Archive/Push/Async.pm
@@ -1,8 +1,8 @@
####################################################################################################################################
# ARCHIVE PUSH ASYNC MODULE
####################################################################################################################################
-package pgBackRest::Archive::ArchivePushAsync;
-use parent 'pgBackRest::Archive::ArchivePush';
+package pgBackRest::Archive::Push::Async;
+use parent 'pgBackRest::Archive::Push::Push';
use strict;
use warnings FATAL => qw(all);
@@ -20,9 +20,9 @@ use Scalar::Util qw(blessed);
use pgBackRest::Common::Exception;
use pgBackRest::Common::Lock;
use pgBackRest::Common::Log;
-use pgBackRest::Archive::ArchiveCommon;
-use pgBackRest::Archive::ArchiveInfo;
-use pgBackRest::Archive::ArchivePush;
+use pgBackRest::Archive::Common;
+use pgBackRest::Archive::Info;
+use pgBackRest::Archive::Push::Push;
use pgBackRest::Common::String;
use pgBackRest::Common::Wait;
use pgBackRest::Config::Config;
diff --git a/lib/pgBackRest/Archive/ArchivePushFile.pm b/lib/pgBackRest/Archive/Push/File.pm
similarity index 95%
rename from lib/pgBackRest/Archive/ArchivePushFile.pm
rename to lib/pgBackRest/Archive/Push/File.pm
index 828c6bc2c..9a3fda973 100644
--- a/lib/pgBackRest/Archive/ArchivePushFile.pm
+++ b/lib/pgBackRest/Archive/Push/File.pm
@@ -1,7 +1,7 @@
####################################################################################################################################
# ARCHIVE PUSH FILE MODULE
####################################################################################################################################
-package pgBackRest::Archive::ArchivePushFile;
+package pgBackRest::Archive::Push::File;
use strict;
use warnings FATAL => qw(all);
@@ -12,8 +12,8 @@ use Exporter qw(import);
our @EXPORT = qw();
use File::Basename qw(basename dirname);
-use pgBackRest::Archive::ArchiveCommon;
-use pgBackRest::Archive::ArchiveInfo;
+use pgBackRest::Archive::Common;
+use pgBackRest::Archive::Info;
use pgBackRest::Common::Exception;
use pgBackRest::Common::Log;
use pgBackRest::Config::Config;
@@ -69,7 +69,7 @@ sub archivePushCheck
if ($bWalSegment)
{
# If the info file exists check db version and system-id else error
- $strArchiveId = (new pgBackRest::Archive::ArchiveInfo(
+ $strArchiveId = (new pgBackRest::Archive::Info(
$oStorageRepo->pathGet(STORAGE_REPO_ARCHIVE)))->check($strDbVersion, $ullDbSysId);
# Check if the WAL segment already exists in the archive
@@ -83,7 +83,7 @@ sub archivePushCheck
# Else just get the archive id
else
{
- $strArchiveId = (new pgBackRest::Archive::ArchiveInfo($oStorageRepo->pathGet(STORAGE_REPO_ARCHIVE)))->archiveId();
+ $strArchiveId = (new pgBackRest::Archive::Info($oStorageRepo->pathGet(STORAGE_REPO_ARCHIVE)))->archiveId();
}
}
diff --git a/lib/pgBackRest/Archive/ArchivePush.pm b/lib/pgBackRest/Archive/Push/Push.pm
similarity index 96%
rename from lib/pgBackRest/Archive/ArchivePush.pm
rename to lib/pgBackRest/Archive/Push/Push.pm
index 6ffa957a5..01419c466 100644
--- a/lib/pgBackRest/Archive/ArchivePush.pm
+++ b/lib/pgBackRest/Archive/Push/Push.pm
@@ -1,8 +1,8 @@
####################################################################################################################################
# ARCHIVE PUSH MODULE
####################################################################################################################################
-package pgBackRest::Archive::ArchivePush;
-use parent 'pgBackRest::Archive::Archive';
+package pgBackRest::Archive::Push::Push;
+use parent 'pgBackRest::Archive::Base';
use strict;
use warnings FATAL => qw(all);
@@ -13,7 +13,7 @@ use Exporter qw(import);
our @EXPORT = qw();
use File::Basename qw(basename dirname);
-use pgBackRest::Archive::ArchiveCommon;
+use pgBackRest::Archive::Common;
use pgBackRest::DbVersion;
use pgBackRest::Common::Exception;
use pgBackRest::Common::Lock;
@@ -94,8 +94,8 @@ sub process
if (!$bPushed)
{
# Load module dynamically
- require pgBackRest::Archive::ArchivePushAsync;
- $bClient = (new pgBackRest::Archive::ArchivePushAsync(
+ require pgBackRest::Archive::Push::Async;
+ $bClient = (new pgBackRest::Archive::Push::Async(
$strWalPath, $self->{strSpoolPath}, $self->{strBackRestBin}))->process();
}
@@ -114,8 +114,8 @@ sub process
else
{
# Load module dynamically
- require pgBackRest::Archive::ArchivePushFile;
- pgBackRest::Archive::ArchivePushFile->import();
+ require pgBackRest::Archive::Push::File;
+ pgBackRest::Archive::Push::File->import();
# Drop file if queue max has been exceeded
$self->{strWalPath} = $strWalPath;
diff --git a/lib/pgBackRest/Backup/Backup.pm b/lib/pgBackRest/Backup/Backup.pm
index a95df04af..3049b3326 100644
--- a/lib/pgBackRest/Backup/Backup.pm
+++ b/lib/pgBackRest/Backup/Backup.pm
@@ -11,8 +11,8 @@ use English '-no_match_vars';
use Exporter qw(import);
use File::Basename;
-use pgBackRest::Archive::ArchiveCommon;
-use pgBackRest::Archive::ArchiveGet;
+use pgBackRest::Archive::Common;
+use pgBackRest::Archive::Get::Get;
use pgBackRest::Backup::Filter::PageChecksum; # ??? Temporary until isLibC is moved to a better place
use pgBackRest::Backup::Common;
use pgBackRest::Backup::File;
@@ -882,7 +882,7 @@ sub process
# After the backup has been stopped, need to make a copy of the archive logs to make the db consistent
logDebugMisc($strOperation, "retrieve archive logs ${strArchiveStart}:${strArchiveStop}");
- my $strArchiveId = new pgBackRest::Archive::ArchiveGet()->getArchiveId();
+ my $strArchiveId = new pgBackRest::Archive::Get::Get()->getArchiveId();
my @stryArchive = lsnFileRange($strLsnStart, $strLsnStop, $strDbVersion);
foreach my $strArchive (@stryArchive)
diff --git a/lib/pgBackRest/Backup/Info.pm b/lib/pgBackRest/Backup/Info.pm
index da235e153..1c5618bab 100644
--- a/lib/pgBackRest/Backup/Info.pm
+++ b/lib/pgBackRest/Backup/Info.pm
@@ -14,7 +14,7 @@ use Exporter qw(import);
use File::Basename qw(dirname basename);
use File::stat;
-use pgBackRest::Archive::ArchiveInfo;
+use pgBackRest::Archive::Info;
use pgBackRest::Backup::Common;
use pgBackRest::Common::Exception;
use pgBackRest::Common::Ini;
@@ -645,7 +645,7 @@ sub backupArchiveDbHistoryId
my @stryArchiveBackup;
# Build the db list from the history in the backup info and archive info file
- my $oArchiveInfo = new pgBackRest::Archive::ArchiveInfo($strPathBackupArchive, true);
+ my $oArchiveInfo = new pgBackRest::Archive::Info($strPathBackupArchive, true);
my $hDbListArchive = $oArchiveInfo->dbHistoryList();
my $hDbListBackup = $self->dbHistoryList();
my $iDbHistoryId = undef;
diff --git a/lib/pgBackRest/Check/Check.pm b/lib/pgBackRest/Check/Check.pm
index 91e2da884..f47006cca 100644
--- a/lib/pgBackRest/Check/Check.pm
+++ b/lib/pgBackRest/Check/Check.pm
@@ -8,8 +8,8 @@ use warnings FATAL => qw(all);
use Carp qw(confess);
use English '-no_match_vars';
-use pgBackRest::Archive::ArchiveCommon;
-use pgBackRest::Archive::ArchiveGet;
+use pgBackRest::Archive::Common;
+use pgBackRest::Archive::Get::Get;
use pgBackRest::Backup::Info;
use pgBackRest::Common::Exception;
use pgBackRest::Common::Log;
@@ -96,7 +96,7 @@ sub process
eval
{
# Check that the archive info file is written and is valid for the current database of the stanza
- ($strArchiveId) = new pgBackRest::Archive::ArchiveGet()->getCheck();
+ ($strArchiveId) = new pgBackRest::Archive::Get::Get()->getCheck();
return true;
}
or do
diff --git a/lib/pgBackRest/Db.pm b/lib/pgBackRest/Db.pm
index 214408d82..d7fedf0fe 100644
--- a/lib/pgBackRest/Db.pm
+++ b/lib/pgBackRest/Db.pm
@@ -869,8 +869,8 @@ sub replayWait
);
# Load ArchiveCommon Module
- require pgBackRest::Archive::ArchiveCommon;
- pgBackRest::Archive::ArchiveCommon->import();
+ require pgBackRest::Archive::Common;
+ pgBackRest::Archive::Common->import();
# Initialize working variables
my $oWait = waitInit(optionGet(OPTION_ARCHIVE_TIMEOUT));
diff --git a/lib/pgBackRest/Expire.pm b/lib/pgBackRest/Expire.pm
index d38fb9edc..d1c30c1fe 100644
--- a/lib/pgBackRest/Expire.pm
+++ b/lib/pgBackRest/Expire.pm
@@ -11,9 +11,9 @@ use Exporter qw(import);
use File::Basename qw(dirname);
use Scalar::Util qw(looks_like_number);
-use pgBackRest::Archive::ArchiveCommon;
-use pgBackRest::Archive::ArchiveGet;
-use pgBackRest::Archive::ArchiveInfo;
+use pgBackRest::Archive::Common;
+use pgBackRest::Archive::Get::Get;
+use pgBackRest::Archive::Info;
use pgBackRest::Common::Exception;
use pgBackRest::Common::Ini;
use pgBackRest::Common::Log;
@@ -238,7 +238,7 @@ sub process
if ($iBackupTotal > 0)
{
- my $oArchiveInfo = new pgBackRest::Archive::ArchiveInfo($oStorageRepo->pathGet(STORAGE_REPO_ARCHIVE), true);
+ my $oArchiveInfo = new pgBackRest::Archive::Info($oStorageRepo->pathGet(STORAGE_REPO_ARCHIVE), true);
my @stryListArchiveDisk = $oStorageRepo->list(
STORAGE_REPO_ARCHIVE, {strExpression => REGEX_ARCHIVE_DIR_DB_VERSION, bIgnoreMissing => true});
diff --git a/lib/pgBackRest/Info.pm b/lib/pgBackRest/Info.pm
index aa0892dbe..e767bb211 100644
--- a/lib/pgBackRest/Info.pm
+++ b/lib/pgBackRest/Info.pm
@@ -385,7 +385,7 @@ sub stanzaList
# With multiple DB versions, the backup.info history-id may not be the same as archive.info history-id, so the
# archive path must be built by retrieving the archive id given the db version and system id of the backup
- my $oArchiveInfo = new pgBackRest::Archive::ArchiveInfo(storageRepo()->pathGet($strArchiveStanzaPath));
+ my $oArchiveInfo = new pgBackRest::Archive::Info(storageRepo()->pathGet($strArchiveStanzaPath));
my $strArchiveId = $oArchiveInfo->archiveId({strDbVersion => $hDbInfo->{&INFO_KEY_VERSION},
ullDbSysId => $hDbInfo->{&INFO_KEY_SYSTEM_ID}});
my $strArchivePath = "archive/${strStanzaFound}/${strArchiveId}";
diff --git a/lib/pgBackRest/Protocol/Local/Minion.pm b/lib/pgBackRest/Protocol/Local/Minion.pm
index b52f14527..81b11dbe6 100644
--- a/lib/pgBackRest/Protocol/Local/Minion.pm
+++ b/lib/pgBackRest/Protocol/Local/Minion.pm
@@ -8,7 +8,7 @@ use strict;
use warnings FATAL => qw(all);
use Carp qw(confess);
-use pgBackRest::Archive::ArchivePushFile;
+use pgBackRest::Archive::Push::File;
use pgBackRest::Backup::File;
use pgBackRest::Common::Log;
use pgBackRest::Config::Config;
diff --git a/lib/pgBackRest/Protocol/Remote/Minion.pm b/lib/pgBackRest/Protocol/Remote/Minion.pm
index de9b1b8f5..f379448f5 100644
--- a/lib/pgBackRest/Protocol/Remote/Minion.pm
+++ b/lib/pgBackRest/Protocol/Remote/Minion.pm
@@ -14,8 +14,8 @@ use pgBackRest::Backup::File;
use pgBackRest::Common::Log;
use pgBackRest::Common::Io::Buffered;
use pgBackRest::Common::Wait;
-use pgBackRest::Archive::ArchiveGet;
-use pgBackRest::Archive::ArchivePushFile;
+use pgBackRest::Archive::Get::Get;
+use pgBackRest::Archive::Push::File;
use pgBackRest::Check::Check;
use pgBackRest::Config::Config;
use pgBackRest::Db;
@@ -70,7 +70,7 @@ sub init
# Create objects
my $oStorage = optionTest(OPTION_TYPE, DB) ? storageDb() : storageRepo();
- my $oArchiveGet = optionTest(OPTION_TYPE, BACKUP) ? new pgBackRest::Archive::ArchiveGet() : undef;
+ my $oArchiveGet = optionTest(OPTION_TYPE, BACKUP) ? new pgBackRest::Archive::Get::Get() : undef;
my $oCheck = optionTest(OPTION_TYPE, BACKUP) ? new pgBackRest::Check::Check() : undef;
my $oInfo = optionTest(OPTION_TYPE, BACKUP) ? new pgBackRest::Info() : undef;
my $oDb = optionTest(OPTION_TYPE, DB) ? new pgBackRest::Db() : undef;
diff --git a/lib/pgBackRest/Stanza.pm b/lib/pgBackRest/Stanza.pm
index 239735800..0fcf0f507 100644
--- a/lib/pgBackRest/Stanza.pm
+++ b/lib/pgBackRest/Stanza.pm
@@ -16,7 +16,7 @@ use Exporter qw(import);
use pgBackRest::Common::Exception;
use pgBackRest::Common::Log;
use pgBackRest::Config::Config;
-use pgBackRest::Archive::ArchiveInfo;
+use pgBackRest::Archive::Info;
use pgBackRest::Backup::Info;
use pgBackRest::Db;
use pgBackRest::DbVersion;
@@ -311,7 +311,7 @@ sub infoObject
# attempt to be loaded
$oInfo = ($strPathType eq STORAGE_REPO_BACKUP ?
new pgBackRest::Backup::Info($strParentPath, false, $bRequired, {bIgnoreMissing => $bIgnoreMissing}) :
- new pgBackRest::Archive::ArchiveInfo($strParentPath, $bRequired, {bIgnoreMissing => $bIgnoreMissing}));
+ new pgBackRest::Archive::Info($strParentPath, $bRequired, {bIgnoreMissing => $bIgnoreMissing}));
# Reset the console logging
logEnable();
@@ -347,7 +347,7 @@ sub infoObject
{
$oInfo = ($strPathType eq STORAGE_REPO_BACKUP ?
new pgBackRest::Backup::Info($strParentPath, false, false, {bLoad => false}) :
- new pgBackRest::Archive::ArchiveInfo($strParentPath, false, {bLoad => false}));
+ new pgBackRest::Archive::Info($strParentPath, false, {bLoad => false}));
}
}
@@ -420,7 +420,7 @@ sub infoFileCreate
{
my $oInfoOnDisk =
($strPathType eq STORAGE_REPO_BACKUP ?
- new pgBackRest::Backup::Info($strParentPath) : new pgBackRest::Archive::ArchiveInfo($strParentPath));
+ new pgBackRest::Backup::Info($strParentPath) : new pgBackRest::Archive::Info($strParentPath));
# If the hashes are not the same
if ($oInfoOnDisk->hash() ne $oInfo->hash())
diff --git a/test/expect/archive-get-001.log b/test/expect/archive-get-001.log
index e4a7a4fee..0666ebe18 100644
--- a/test/expect/archive-get-001.log
+++ b/test/expect/archive-get-001.log
@@ -5,14 +5,14 @@ run 001 - rmt 0, cmp 0, exists 0, s3 0
------------------------------------------------------------------------------------------------------------------------------------
P00 INFO: archive-get command begin [BACKREST-VERSION]: --no-compress --config=[TEST_PATH]/db-master/pgbackrest.conf --db-path=[TEST_PATH]/db-master/db/base --db-timeout=45 --lock-path=[TEST_PATH]/db-master/lock --log-level-console=debug --log-level-file=trace --log-level-stderr=off --log-path=[TEST_PATH]/db-master/log --protocol-timeout=60 --repo-path=[TEST_PATH]/db-master/repo --stanza=db
P00 INFO: get WAL segment 000000010000000100000001
-P00 DEBUG: Archive::ArchiveGet->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001, strSourceArchive = 000000010000000100000001
+P00 DEBUG: Archive::Get::Get->get(): strDestinationFile = [TEST_PATH]/db-master/db/base/pg_xlog/000000010000000100000001, strSourceArchive = 000000010000000100000001
P00 DEBUG: Storage::Local->new(): bAllowTemp =