From 3fbf8186fb33e1c08ddc48299a819ee98e8737a2 Mon Sep 17 00:00:00 2001
From: bowang <bowang@fb.com>
Date: Thu, 12 May 2022 16:44:53 -0700
Subject: [PATCH] update

---
 db/flush_job.cc              |  5 -----
 file/writable_file_writer.cc | 14 --------------
 2 files changed, 19 deletions(-)

diff --git a/db/flush_job.cc b/db/flush_job.cc
index 40a610ac3..db1f401fd 100644
--- a/db/flush_job.cc
+++ b/db/flush_job.cc
@@ -1074,12 +1074,7 @@ Env::IOPriority FlushJob::GetRateLimiterPriority(
       versions_->GetColumnFamilySet()->write_controller();
 
   if (op_type == RateLimiter::OpType::kWrite) {
-<<<<<<< HEAD
     if (write_controller->IsStopped() || write_controller->NeedsDelay()) {
-=======
-    if (UNLIKELY(write_controller->IsStopped()) ||
-        UNLIKELY(write_controller->NeedsDelay())) {
->>>>>>> c19ac641ea67dd068be5e50e86de84f26f396e65
       return Env::IO_USER;
     }
     return Env::IO_HIGH;
diff --git a/file/writable_file_writer.cc b/file/writable_file_writer.cc
index ee676f4df..c96b31d87 100644
--- a/file/writable_file_writer.cc
+++ b/file/writable_file_writer.cc
@@ -54,20 +54,12 @@ IOStatus WritableFileWriter::Append(const Slice& data, uint32_t crc32c_checksum,
   UpdateFileChecksum(data);
 
   {
-<<<<<<< HEAD
     IOOptions io_options;
-=======
-    std::unique_ptr<IOOptions> io_options;
->>>>>>> c19ac641ea67dd068be5e50e86de84f26f396e65
     UpdateIOOptionsIfNeeded(io_options, op_rate_limiter_priority);
     IOSTATS_TIMER_GUARD(prepare_write_nanos);
     TEST_SYNC_POINT("WritableFileWriter::Append:BeforePrepareWrite");
     writable_file_->PrepareWrite(static_cast<size_t>(GetFileSize()), left,
-<<<<<<< HEAD
                                  io_options, nullptr);
-=======
-                                 *io_options, nullptr);
->>>>>>> c19ac641ea67dd068be5e50e86de84f26f396e65
   }
 
   // See whether we need to enlarge the buffer to avoid the flush
@@ -343,15 +335,9 @@ IOStatus WritableFileWriter::Flush(Env::IOPriority op_rate_limiter_priority) {
       start_ts = FileOperationInfo::StartNow();
     }
 #endif
-<<<<<<< HEAD
     IOOptions io_options;
     UpdateIOOptionsIfNeeded(io_options, op_rate_limiter_priority);
     s = writable_file_->Flush(io_options, nullptr);
-=======
-    std::unique_ptr<IOOptions> io_options;
-    UpdateIOOptionsIfNeeded(io_options, op_rate_limiter_priority);
-    s = writable_file_->Flush(*io_options, nullptr);
->>>>>>> c19ac641ea67dd068be5e50e86de84f26f396e65
 #ifndef ROCKSDB_LITE
     if (ShouldNotifyListeners()) {
       auto finish_ts = std::chrono::steady_clock::now();