wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FastRestore: Resolve review comments 

1) Add type for RestoreCommandEnum
2) Make RestoreRoleStr const
This commit is contained in:
Meng Xu 2019-05-11 23:55:20 -07:00
parent 5406c74daf
commit ef9dcd545c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/RestoreUtil.actor.cpp
View File

@ -22,7 +22,7 @@
#include "flow/actorcompiler.h" // This must be the last #include. #include "flow/actorcompiler.h" // This must be the last #include.
std::vector<std::string> RestoreRoleStr = {"Invalid", "Master", "Loader", "Applier"}; const std::vector<std::string> RestoreRoleStr = {"Invalid", "Master", "Loader", "Applier"};
int numRoles = RestoreRoleStr.size(); int numRoles = RestoreRoleStr.size();
std::string getRoleStr(RestoreRole role) { std::string getRoleStr(RestoreRole role) {

5
fdbserver/RestoreUtil.h
View File

@ -30,10 +30,11 @@
#include "flow/Stats.h" #include "flow/Stats.h"
#include "fdbrpc/fdbrpc.h" #include "fdbrpc/fdbrpc.h"
#include "fdbrpc/IAsyncFile.h" #include "fdbrpc/IAsyncFile.h"
#include <cstdint>
// TODO: To remove unused command enum. and re-order the command sequence // TODO: To remove unused command enum. and re-order the command sequence
// RestoreCommandEnum is also used as the phase ID for CMDUID // RestoreCommandEnum is also used as the phase ID for CMDUID
enum class RestoreCommandEnum {Init = 0, enum class RestoreCommandEnum : uint32_t {Init = 0,
Sample_Range_File, Sample_Log_File, Sample_File_Done, Sample_Range_File, Sample_Log_File, Sample_File_Done,
Loader_Send_Sample_Mutation_To_Applier, Loader_Send_Sample_Mutation_To_Applier_Done, //5 Loader_Send_Sample_Mutation_To_Applier, Loader_Send_Sample_Mutation_To_Applier_Done, //5
Calculate_Applier_KeyRange, Get_Applier_KeyRange, Get_Applier_KeyRange_Done, //8 Calculate_Applier_KeyRange, Get_Applier_KeyRange, Get_Applier_KeyRange_Done, //8
@ -50,7 +51,7 @@ BINARY_SERIALIZABLE(RestoreCommandEnum);
enum class RestoreRole {Invalid = 0, Master = 1, Loader, Applier}; enum class RestoreRole {Invalid = 0, Master = 1, Loader, Applier};
BINARY_SERIALIZABLE( RestoreRole ); BINARY_SERIALIZABLE( RestoreRole );
extern std::vector<std::string> RestoreRoleStr; extern const std::vector<std::string> RestoreRoleStr;
extern int numRoles; extern int numRoles;
std::string getRoleStr(RestoreRole role); std::string getRoleStr(RestoreRole role);