Skip to content

Commit e89e3fa

Browse files
committed
feat(replica): parameterize-fileddatatype
1 parent 2bfe595 commit e89e3fa

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

src/replica/replication_app_base.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@
5151
#include "utils/binary_reader.h"
5252
#include "utils/binary_writer.h"
5353
#include "utils/blob.h"
54-
#include "utils/defer.h"
5554
#include "utils/factory_store.h"
5655
#include "utils/fail_point.h"
57-
#include "utils/filesystem.h"
5856
#include "utils/fmt_logging.h"
5957
#include "utils/latency_tracer.h"
6058
#include "absl/strings/string_view.h"
@@ -112,7 +110,9 @@ error_code replica_init_info::load_json(const std::string &fname)
112110

113111
error_code replica_init_info::store_json(const std::string &fname)
114112
{
115-
return write_blob_to_file(fname, json::json_forwarder<replica_init_info>::encode(*this), dsn::utils::FileDataType &kSensitive);
113+
return write_blob_to_file(fname,
114+
json::json_forwarder<replica_init_info>::encode(*this),
115+
dsn::utils::FileDataType::kSensitive);
116116
}
117117

118118
std::string replica_init_info::to_string()

src/replica/replication_app_base.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@
3838
#include "metadata_types.h"
3939
#include "replica/replica_base.h"
4040
#include "replica_admin_types.h"
41+
#include "utils/defer.h"
4142
#include "utils/env.h"
4243
#include "utils/error_code.h"
4344
#include "utils/fmt_utils.h"
45+
#include "utils/filesystem.h"
4446
#include "utils/ports.h"
4547

4648
namespace dsn {
@@ -54,17 +56,18 @@ class learn_state;
5456
class mutation;
5557
class replica;
5658

57-
namespace{
59+
namespace {
5860
template <class T>
59-
error_code write_blob_to_file(const std::string &fname, const T &data, const dsn::utils::FileDataType &fileDataType)
61+
error_code write_blob_to_file(const std::string &fname,
62+
const T &data,
63+
const dsn::utils::FileDataType &fileDataType)
6064
{
6165
std::string tmp_fname = fname + ".tmp";
6266
auto cleanup = defer([tmp_fname]() { utils::filesystem::remove_path(tmp_fname); });
63-
auto s =
64-
rocksdb::WriteStringToFile(dsn::utils::PegasusEnv(fileDataType),
65-
rocksdb::Slice(data.data(), data.length()),
66-
tmp_fname,
67-
/* should_sync */ true);
67+
auto s = rocksdb::WriteStringToFile(dsn::utils::PegasusEnv(fileDataType),
68+
rocksdb::Slice(data.data(), data.length()),
69+
tmp_fname,
70+
/* should_sync */ true);
6871
LOG_AND_RETURN_NOT_TRUE(
6972
ERROR, s.ok(), ERR_FILE_OPERATION_FAILED, "write file {} failed", tmp_fname);
7073
LOG_AND_RETURN_NOT_TRUE(ERROR,

0 commit comments

Comments
 (0)