import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / env / file_system.cc

diff --git a/ceph/src/rocksdb/env/file_system.cc b/ceph/src/rocksdb/env/file_system.cc
index 646e6e3d11ab7478d80b171cc7c5c1686d69e2b5..d2fc06c6c955d0c4e26d264abeb1471dab22d4e5 100644 (file)
--- a/ceph/src/rocksdb/env/file_system.cc
+++ b/ceph/src/rocksdb/env/file_system.cc
@@ -21,11 +21,23 @@ Status FileSystem::Load(const std::string& value,
   s = ObjectRegistry::NewInstance()->NewSharedObject<FileSystem>(value, result);
 #else
   (void)result;
-  s = Status::NotSupported("Cannot load FileSystem in LITE mode: ", value);
+  s = Status::NotSupported("Cannot load FileSystem in LITE mode", value);
 #endif
   return s;
 }
 
+IOStatus FileSystem::ReuseWritableFile(const std::string& fname,
+                                       const std::string& old_fname,
+                                       const FileOptions& opts,
+                                       std::unique_ptr<FSWritableFile>* result,
+                                       IODebugContext* dbg) {
+  IOStatus s = RenameFile(old_fname, fname, opts.io_options, dbg);
+  if (!s.ok()) {
+    return s;
+  }
+  return NewWritableFile(fname, opts, result, dbg);
+}
+
 FileOptions FileSystem::OptimizeForLogRead(
               const FileOptions& file_options) const {
   FileOptions optimized_file_options(file_options);
@@ -71,12 +83,31 @@ FileOptions FileSystem::OptimizeForCompactionTableRead(
   return optimized_file_options;
 }
 
-Status ReadFileToString(FileSystem* fs, const std::string& fname,
-                        std::string* data) {
+IOStatus WriteStringToFile(FileSystem* fs, const Slice& data,
+                           const std::string& fname, bool should_sync) {
+  std::unique_ptr<FSWritableFile> file;
+  EnvOptions soptions;
+  IOStatus s = fs->NewWritableFile(fname, soptions, &file, nullptr);
+  if (!s.ok()) {
+    return s;
+  }
+  s = file->Append(data, IOOptions(), nullptr);
+  if (s.ok() && should_sync) {
+    s = file->Sync(IOOptions(), nullptr);
+  }
+  if (!s.ok()) {
+    fs->DeleteFile(fname, IOOptions(), nullptr);
+  }
+  return s;
+}
+
+IOStatus ReadFileToString(FileSystem* fs, const std::string& fname,
+                          std::string* data) {
   FileOptions soptions;
   data->clear();
   std::unique_ptr<FSSequentialFile> file;
-  Status s = fs->NewSequentialFile(fname, soptions, &file, nullptr);
+  IOStatus s = status_to_io_status(
+      fs->NewSequentialFile(fname, soptions, &file, nullptr));
   if (!s.ok()) {
     return s;
   }