import 14.2.4 nautilus point release

[ceph.git] / ceph / src / rocksdb / util / file_reader_writer_test.cc

diff --git a/ceph/src/rocksdb/util/file_reader_writer_test.cc b/ceph/src/rocksdb/util/file_reader_writer_test.cc
index 3ca44ecc0959335dcede6854ad2c5032858a87de..6a7ea6d7da46cd84e6506fbb529e48940bddb230 100644 (file)
--- a/ceph/src/rocksdb/util/file_reader_writer_test.cc
+++ b/ceph/src/rocksdb/util/file_reader_writer_test.cc
@@ -20,13 +20,13 @@ TEST_F(WritableFileWriterTest, RangeSync) {
   class FakeWF : public WritableFile {
    public:
     explicit FakeWF() : size_(0), last_synced_(0) {}
-    ~FakeWF() {}
+    ~FakeWF() override {}
 
     Status Append(const Slice& data) override {
       size_ += data.size();
       return Status::OK();
     }
-    virtual Status Truncate(uint64_t /*size*/) override { return Status::OK(); }
+    Status Truncate(uint64_t /*size*/) override { return Status::OK(); }
     Status Close() override {
       EXPECT_GE(size_, last_synced_ + kMb);
       EXPECT_LT(size_, last_synced_ + 2 * kMb);
@@ -71,8 +71,8 @@ TEST_F(WritableFileWriterTest, RangeSync) {
 
   EnvOptions env_options;
   env_options.bytes_per_sync = kMb;
-  unique_ptr<FakeWF> wf(new FakeWF);
-  unique_ptr<WritableFileWriter> writer(
+  std::unique_ptr<FakeWF> wf(new FakeWF);
+  std::unique_ptr<WritableFileWriter> writer(
       new WritableFileWriter(std::move(wf), "" /* don't care */, env_options));
   Random r(301);
   std::unique_ptr<char[]> large_buf(new char[10 * kMb]);
@@ -97,7 +97,7 @@ TEST_F(WritableFileWriterTest, IncrementalBuffer) {
         : file_data_(_file_data),
           use_direct_io_(_use_direct_io),
           no_flush_(_no_flush) {}
-    ~FakeWF() {}
+    ~FakeWF() override {}
 
     Status Append(const Slice& data) override {
       file_data_->append(data.data(), data.size());
@@ -113,7 +113,7 @@ TEST_F(WritableFileWriterTest, IncrementalBuffer) {
       return Status::OK();
     }
 
-    virtual Status Truncate(uint64_t size) override {
+    Status Truncate(uint64_t size) override {
       file_data_->resize(size);
       return Status::OK();
     }
@@ -147,14 +147,14 @@ TEST_F(WritableFileWriterTest, IncrementalBuffer) {
     env_options.writable_file_max_buffer_size =
         (attempt < kNumAttempts / 2) ? 512 * 1024 : 700 * 1024;
     std::string actual;
-    unique_ptr<FakeWF> wf(new FakeWF(&actual,
+    std::unique_ptr<FakeWF> wf(new FakeWF(&actual,
 #ifndef ROCKSDB_LITE
-                                     attempt % 2 == 1,
+                                          attempt % 2 == 1,
 #else
-                                     false,
+                                          false,
 #endif
-                                     no_flush));
-    unique_ptr<WritableFileWriter> writer(new WritableFileWriter(
+                                          no_flush));
+    std::unique_ptr<WritableFileWriter> writer(new WritableFileWriter(
         std::move(wf), "" /* don't care */, env_options));
 
     std::string target;
@@ -183,7 +183,7 @@ TEST_F(WritableFileWriterTest, AppendStatusReturn) {
    public:
     explicit FakeWF() : use_direct_io_(false), io_error_(false) {}
 
-    virtual bool use_direct_io() const override { return use_direct_io_; }
+    bool use_direct_io() const override { return use_direct_io_; }
     Status Append(const Slice& /*data*/) override {
       if (io_error_) {
         return Status::IOError("Fake IO error");
@@ -206,9 +206,9 @@ TEST_F(WritableFileWriterTest, AppendStatusReturn) {
     bool use_direct_io_;
     bool io_error_;
   };
-  unique_ptr<FakeWF> wf(new FakeWF());
+  std::unique_ptr<FakeWF> wf(new FakeWF());
   wf->Setuse_direct_io(true);
-  unique_ptr<WritableFileWriter> writer(
+  std::unique_ptr<WritableFileWriter> writer(
       new WritableFileWriter(std::move(wf), "" /* don't care */, EnvOptions()));
 
   ASSERT_OK(writer->Append(std::string(2 * kMb, 'a')));
@@ -226,7 +226,7 @@ class ReadaheadRandomAccessFileTest
   static std::vector<size_t> GetReadaheadSizeList() {
     return {1lu << 12, 1lu << 16};
   }
-  virtual void SetUp() override {
+  void SetUp() override {
     readahead_size_ = GetParam();
     scratch_.reset(new char[2 * readahead_size_]);
     ResetSourceStr();