db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Add storageDriver() inlines missed in b715c70b.

Browse Source
This commit is contained in:
David Steele 2021-04-19 14:22:36 -04:00
parent d859fe8c4d
commit a75b413ac2
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/storage/storage.c
View File

@ -260,7 +260,7 @@ storageInfo(const Storage *this, const String *fileExp, StorageInfoParam param)
}
// Else call the driver
else
result = storageInterfaceInfoP(this->pub.driver, file, param.level, .followLink = param.followLink);
result = storageInterfaceInfoP(storageDriver(this), file, param.level, .followLink = param.followLink);
// Error if the file missing and not ignoring
if (!result.exists && !param.ignoreMissing)
@ -339,7 +339,7 @@ storageInfoListSort(
// If no sorting then use the callback directly
if (sortOrder == sortOrderNone)
{
result = storageInterfaceInfoListP(this->pub.driver, path, level, callback, callbackData, .expression = expression);
result = storageInterfaceInfoListP(storageDriver(this), path, level, callback, callbackData, .expression = expression);
}
// Else sort the info before sending it to the callback
else
@ -352,7 +352,7 @@ storageInfoListSort(
};
result = storageInterfaceInfoListP(
this->pub.driver, path, level, storageInfoListSortCallback, &data, .expression = expression);
storageDriver(this), path, level, storageInfoListSortCallback, &data, .expression = expression);
lstSort(data.infoList, sortOrder);
MEM_CONTEXT_TEMP_RESET_BEGIN()
@ -581,19 +581,19 @@ storageMove(const Storage *this, StorageRead *source, StorageWrite *destination)
MEM_CONTEXT_TEMP_BEGIN()
{
// If the file can't be moved it will need to be copied
if (!storageInterfaceMoveP(this->pub.driver, source, destination))
if (!storageInterfaceMoveP(storageDriver(this), source, destination))
{
// Perform the copy
storageCopyP(source, destination);
// Remove the source file
storageInterfaceRemoveP(this->pub.driver, storageReadName(source));
storageInterfaceRemoveP(storageDriver(this), storageReadName(source));
// Sync source path if the destination path was synced. We know the source and destination paths are different because
// the move did not succeed. This will need updating when drivers other than Posix/CIFS are implemented because there's
// no way to get coverage on it now.
if (storageWriteSyncPath(destination))
storageInterfacePathSyncP(this->pub.driver, strPath(storageReadName(source)));
storageInterfacePathSyncP(storageDriver(this), strPath(storageReadName(source)));
}
}
MEM_CONTEXT_TEMP_END();
@ -623,7 +623,7 @@ storageNewRead(const Storage *this, const String *fileExp, StorageNewReadParam p
{
result = storageReadMove(
storageInterfaceNewReadP(
this->pub.driver, storagePathP(this, fileExp), param.ignoreMissing, .compressible = param.compressible,
storageDriver(this), storagePathP(this, fileExp), param.ignoreMissing, .compressible = param.compressible,
.limit = param.limit),
memContextPrior());
}
@ -660,7 +660,7 @@ storageNewWrite(const Storage *this, const String *fileExp, StorageNewWriteParam
{
result = storageWriteMove(
storageInterfaceNewWriteP(
this->pub.driver, storagePathP(this, fileExp), .modeFile = param.modeFile != 0 ? param.modeFile : this->modeFile,
storageDriver(this), storagePathP(this, fileExp), .modeFile = param.modeFile != 0 ? param.modeFile : this->modeFile,
.modePath = param.modePath != 0 ? param.modePath : this->modePath, .user = param.user, .group = param.group,
.timeModified = param.timeModified, .createPath = !param.noCreatePath, .syncFile = !param.noSyncFile,
.syncPath = !param.noSyncPath, .atomic = !param.noAtomic, .compressible = param.compressible),
@ -795,7 +795,7 @@ storagePathCreate(const Storage *this, const String *pathExp, StoragePathCreateP
// Call driver function
storageInterfacePathCreateP(
this->pub.driver, path, param.errorOnExists, param.noParentCreate, param.mode != 0 ? param.mode : this->modePath);
storageDriver(this), path, param.errorOnExists, param.noParentCreate, param.mode != 0 ? param.mode : this->modePath);
}
MEM_CONTEXT_TEMP_END();
@ -843,7 +843,7 @@ storagePathRemove(const Storage *this, const String *pathExp, StoragePathRemoveP
String *path = storagePathP(this, pathExp);
// Call driver function
if (!storageInterfacePathRemoveP(this->pub.driver, path, param.recurse) && param.errorOnMissing)
if (!storageInterfacePathRemoveP(storageDriver(this), path, param.recurse) && param.errorOnMissing)
{
THROW_FMT(PathRemoveError, STORAGE_ERROR_PATH_REMOVE_MISSING, strZ(path));
}
@ -869,7 +869,7 @@ void storagePathSync(const Storage *this, const String *pathExp)
{
MEM_CONTEXT_TEMP_BEGIN()
{
storageInterfacePathSyncP(this->pub.driver, storagePathP(this, pathExp));
storageInterfacePathSyncP(storageDriver(this), storagePathP(this, pathExp));
}
MEM_CONTEXT_TEMP_END();
}
@ -914,7 +914,7 @@ storageRemove(const Storage *this, const String *fileExp, StorageRemoveParam par
String *file = storagePathP(this, fileExp);
// Call driver function
storageInterfaceRemoveP(this->pub.driver, file, .errorOnMissing = param.errorOnMissing);
storageInterfaceRemoveP(storageDriver(this), file, .errorOnMissing = param.errorOnMissing);
}
MEM_CONTEXT_TEMP_END();

4
test/src/module/storage/posixTest.c
View File

@ -103,8 +103,8 @@ testRun(void)
TEST_RESULT_BOOL(storageTest->pathExpressionFunction != NULL, true, " check expression function is set");
TEST_RESULT_PTR(storageInterface(storageTest).info, storageTest->pub.interface.info, " check interface");
TEST_RESULT_PTR(storageDriver(storageTest), storageDriver(storageTest), " check driver");
TEST_RESULT_STR(storageType(storageTest), storageType(storageTest), " check type");
TEST_RESULT_PTR(storageDriver(storageTest), storageTest->pub.driver, " check driver");
TEST_RESULT_STR(storageType(storageTest), storageTest->pub.type, " check type");
TEST_RESULT_BOOL(storageFeature(storageTest, storageFeaturePath), true, " check path feature");
TEST_RESULT_BOOL(storageFeature(storageTest, storageFeatureCompress), true, " check compress feature");
}