update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / utilities / trace / file_trace_reader_writer.cc

diff --git a/ceph/src/rocksdb/utilities/trace/file_trace_reader_writer.cc b/ceph/src/rocksdb/utilities/trace/file_trace_reader_writer.cc
index 4a81516a8b72a23bd705e48d3f22359c1d52a18c..7160f7a4c9ad9500167a58b93ce837f6702a0a08 100644 (file)
--- a/ceph/src/rocksdb/utilities/trace/file_trace_reader_writer.cc
+++ b/ceph/src/rocksdb/utilities/trace/file_trace_reader_writer.cc
@@ -5,11 +5,13 @@
 
 #include "utilities/trace/file_trace_reader_writer.h"
 
+#include "env/composite_env_wrapper.h"
+#include "file/random_access_file_reader.h"
+#include "file/writable_file_writer.h"
+#include "trace_replay/trace_replay.h"
 #include "util/coding.h"
-#include "util/file_reader_writer.h"
-#include "util/trace_replay.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 const unsigned int FileTraceReader::kBufferSize = 1024;  // 1KB
 
@@ -95,8 +97,8 @@ Status NewFileTraceReader(Env* env, const EnvOptions& env_options,
   }
 
   std::unique_ptr<RandomAccessFileReader> file_reader;
-  file_reader.reset(
-      new RandomAccessFileReader(std::move(trace_file), trace_filename));
+  file_reader.reset(new RandomAccessFileReader(
+      NewLegacyRandomAccessFileWrapper(trace_file), trace_filename));
   trace_reader->reset(new FileTraceReader(std::move(file_reader)));
   return s;
 }
@@ -111,10 +113,11 @@ Status NewFileTraceWriter(Env* env, const EnvOptions& env_options,
   }
 
   std::unique_ptr<WritableFileWriter> file_writer;
-  file_writer.reset(new WritableFileWriter(std::move(trace_file),
-                                           trace_filename, env_options));
+  file_writer.reset(new WritableFileWriter(
+      NewLegacyWritableFileWrapper(std::move(trace_file)), trace_filename,
+      env_options));
   trace_writer->reset(new FileTraceWriter(std::move(file_writer)));
   return s;
 }
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE