apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-18 20:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make BackupContainerFileSystem.h a non-actor file

Browse Source
This commit is contained in:
sfc-gh-tclinkenbeard 2020-10-21 10:43:08 -07:00
parent 9242456d71
commit ae91cf1d44
7 changed files with 9 additions and 14 deletions

2
fdbclient/BackupContainer.actor.cpp

@ -37,7 +37,7 @@
#include "flow/Platform.h" #include "flow/Platform.h"
#include "fdbclient/AsyncFileBlobStore.actor.h" #include "fdbclient/AsyncFileBlobStore.actor.h"
#include "fdbclient/BackupContainerAzureBlobStore.h" #include "fdbclient/BackupContainerAzureBlobStore.h"
#include "fdbclient/BackupContainerFileSystem.actor.h" #include "fdbclient/BackupContainerFileSystem.h"
#include "fdbclient/BackupContainerLocalDirectory.h" #include "fdbclient/BackupContainerLocalDirectory.h"
#include "fdbclient/BackupContainerS3BlobStore.h" #include "fdbclient/BackupContainerS3BlobStore.h"
#include "fdbclient/Status.h" #include "fdbclient/Status.h"

2
fdbclient/BackupContainerAzureBlobStore.h

@ -22,7 +22,7 @@
#define FDBCLIENT_BACKUP_CONTAINER_AZURE_BLOBSTORE_H #define FDBCLIENT_BACKUP_CONTAINER_AZURE_BLOBSTORE_H
#pragma once #pragma once
#include "fdbclient/BackupContainerFileSystem.actor.h" #include "fdbclient/BackupContainerFileSystem.h"
#include "storage_credential.h" #include "storage_credential.h"
#include "storage_account.h" #include "storage_account.h"

2
fdbclient/BackupContainerFileSystem.actor.cpp

@ -19,7 +19,7 @@
*/ */
#include "fdbclient/BackupContainerAzureBlobStore.h" #include "fdbclient/BackupContainerAzureBlobStore.h"
#include "fdbclient/BackupContainerFileSystem.actor.h" #include "fdbclient/BackupContainerFileSystem.h"
#include "fdbclient/BackupContainerLocalDirectory.h" #include "fdbclient/BackupContainerLocalDirectory.h"
#include "fdbclient/FDBTypes.h" #include "fdbclient/FDBTypes.h"

11
fdbclient/BackupContainerFileSystem.actor.h → fdbclient/BackupContainerFileSystem.h

@ -1,5 +1,5 @@
/* /*
* BackupContainerFileSystem.actor.h * BackupContainerFileSystem.h
* *
* This source file is part of the FoundationDB open source project * This source file is part of the FoundationDB open source project
* *
@ -18,12 +18,9 @@
* limitations under the License. * limitations under the License.
*/ */
#pragma once #ifndef FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H
#if defined(NO_INTELLISENSE) && !defined(FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_ACTOR_G_H)
#define FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_ACTOR_G_H
#include "fdbclient/BackupContainerFileSystem.actor.g.h"
#elif !defined(FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H)
#define FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H #define FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H
#pragma once
// FIXME: Trim this down // FIXME: Trim this down
#include "flow/Platform.actor.h" #include "flow/Platform.actor.h"
@ -50,7 +47,6 @@
#include <time.h> #include <time.h>
#include "fdbclient/BackupContainer.h" #include "fdbclient/BackupContainer.h"
#include "flow/actorcompiler.h" // has to be last include
/* BackupContainerFileSystem implements a backup container which stores files in a nested folder structure. /* BackupContainerFileSystem implements a backup container which stores files in a nested folder structure.
* Inheritors must only defined methods for writing, reading, deleting, sizing, and listing files. * Inheritors must only defined methods for writing, reading, deleting, sizing, and listing files.
@ -276,5 +272,4 @@ public:
VersionProperty logType(); VersionProperty logType();
}; };
#include "flow/unactorcompiler.h"
#endif #endif

2
fdbclient/BackupContainerLocalDirectory.h

@ -22,7 +22,7 @@
#define FDBCLIENT_BACKUP_CONTAINER_LOCAL_DIRECTORY_H #define FDBCLIENT_BACKUP_CONTAINER_LOCAL_DIRECTORY_H
#pragma once #pragma once
#include "fdbclient/BackupContainerFileSystem.actor.h" #include "fdbclient/BackupContainerFileSystem.h"
class BackupContainerLocalDirectory : public BackupContainerFileSystem, class BackupContainerLocalDirectory : public BackupContainerFileSystem,
ReferenceCounted<BackupContainerLocalDirectory> { ReferenceCounted<BackupContainerLocalDirectory> {

2
fdbclient/BackupContainerS3BlobStore.h

@ -22,7 +22,7 @@
#define FDBCLIENT_BACKUP_CONTAINER_S3_BLOBSTORE_H #define FDBCLIENT_BACKUP_CONTAINER_S3_BLOBSTORE_H
#pragma once #pragma once
#include "fdbclient/BackupContainerFileSystem.actor.h" #include "fdbclient/BackupContainerFileSystem.h"
class BackupContainerS3BlobStore final : public BackupContainerFileSystem, class BackupContainerS3BlobStore final : public BackupContainerFileSystem,
ReferenceCounted<BackupContainerS3BlobStore> { ReferenceCounted<BackupContainerS3BlobStore> {

2
fdbclient/CMakeLists.txt

@ -11,7 +11,7 @@ set(FDBCLIENT_SRCS
BackupContainerAzureBlobStore.actor.cpp BackupContainerAzureBlobStore.actor.cpp
BackupContainerAzureBlobStore.h BackupContainerAzureBlobStore.h
BackupContainerFileSystem.actor.cpp BackupContainerFileSystem.actor.cpp
BackupContainerFileSystem.actor.h BackupContainerFileSystem.h
BackupContainerLocalDirectory.actor.cpp BackupContainerLocalDirectory.actor.cpp
BackupContainerLocalDirectory.h BackupContainerLocalDirectory.h
BackupContainerS3BlobStore.actor.cpp BackupContainerS3BlobStore.actor.cpp