@nxtedition/rocksdb 8.2.0 → 8.2.2

package/deps/rocksdb/rocksdb/memtable/write_buffer_manager.cc

@@ -117,7 +117,6 @@ void WriteBufferManager::FreeMemWithCache(size_t mem) {
 
 void WriteBufferManager::BeginWriteStall(StallInterface* wbm_stall) {
   assert(wbm_stall != nullptr);
-  assert(allow_stall_);
 
   // Allocate outside of the lock.
   std::list<StallInterface*> new_node = {wbm_stall};
@@ -140,16 +139,12 @@ void WriteBufferManager::BeginWriteStall(StallInterface* wbm_stall) {
 
 // Called when memory is freed in FreeMem or the buffer size has changed.
 void WriteBufferManager::MaybeEndWriteStall() {
-  // Cannot early-exit on !enabled() because SetBufferSize(0) needs to unblock
-  // the writers.
-  if (!allow_stall_) {
+  // Stall conditions have not been resolved.
+  if (allow_stall_.load(std::memory_order_relaxed) &&
+      IsStallThresholdExceeded()) {
     return;
   }
 
-  if (IsStallThresholdExceeded()) {
-    return;  // Stall conditions have not resolved.
-  }
-
   // Perform all deallocations outside of the lock.
   std::list<StallInterface*> cleanup;
 
@@ -174,7 +169,7 @@ void WriteBufferManager::RemoveDBFromQueue(StallInterface* wbm_stall) {
   // Deallocate the removed nodes outside of the lock.
   std::list<StallInterface*> cleanup;
 
-  if (enabled() && allow_stall_) {
+  if (enabled() && allow_stall_.load(std::memory_order_relaxed)) {
     std::unique_lock<std::mutex> lock(mu_);
     for (auto it = queue_.begin(); it != queue_.end();) {
       auto next = std::next(it);

package/deps/rocksdb/rocksdb/microbench/db_basic_bench.cc

@@ -303,7 +303,7 @@ static void DBPut(benchmark::State& state) {
 
   if (state.thread_index() == 0) {
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    Status s = db_full->WaitForCompact(true);
+    Status s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -410,7 +410,7 @@ static void ManualCompaction(benchmark::State& state) {
 
   if (state.thread_index() == 0) {
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -436,6 +436,8 @@ static void ManualCompaction(benchmark::State& state) {
           static_cast<double>(get_perf_context()->block_read_count);
       state.counters["block_read_time"] =
           static_cast<double>(get_perf_context()->block_read_time);
+      state.counters["block_read_cpu_time"] =
+          static_cast<double>(get_perf_context()->block_read_cpu_time);
       state.counters["block_checksum_time"] =
           static_cast<double>(get_perf_context()->block_checksum_time);
       state.counters["new_table_block_iter_nanos"] =
@@ -508,7 +510,7 @@ static void ManualFlush(benchmark::State& state) {
 
   if (state.thread_index() == 0) {
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    Status s = db_full->WaitForCompact(true);
+    Status s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -592,7 +594,7 @@ static void DBGet(benchmark::State& state) {
     }
 
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -705,7 +707,7 @@ static void SimpleGetWithPerfContext(benchmark::State& state) {
       }
     }
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -721,6 +723,7 @@ static void SimpleGetWithPerfContext(benchmark::State& state) {
   size_t not_found = 0;
   uint64_t user_key_comparison_count = 0;
   uint64_t block_read_time = 0;
+  uint64_t block_read_cpu_time = 0;
   uint64_t block_checksum_time = 0;
   uint64_t get_snapshot_time = 0;
   uint64_t get_post_process_time = 0;
@@ -740,6 +743,7 @@ static void SimpleGetWithPerfContext(benchmark::State& state) {
     }
     user_key_comparison_count += get_perf_context()->user_key_comparison_count;
     block_read_time += get_perf_context()->block_read_time;
+    block_read_cpu_time += get_perf_context()->block_read_cpu_time;
     block_checksum_time += get_perf_context()->block_checksum_time;
     get_snapshot_time += get_perf_context()->get_snapshot_time;
     get_post_process_time += get_perf_context()->get_post_process_time;
@@ -760,6 +764,9 @@ static void SimpleGetWithPerfContext(benchmark::State& state) {
                          benchmark::Counter::kAvgIterations);
   state.counters["block_read_time"] = benchmark::Counter(
       static_cast<double>(block_read_time), benchmark::Counter::kAvgIterations);
+  state.counters["block_read_cpu_time"] =
+      benchmark::Counter(static_cast<double>(block_read_cpu_time),
+                         benchmark::Counter::kAvgIterations);
   state.counters["block_checksum_time"] =
       benchmark::Counter(static_cast<double>(block_checksum_time),
                          benchmark::Counter::kAvgIterations);
@@ -1108,7 +1115,7 @@ static void IteratorSeek(benchmark::State& state) {
     }
 
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -1199,7 +1206,7 @@ static void IteratorNext(benchmark::State& state) {
     }
 
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -1263,7 +1270,7 @@ static void IteratorNextWithPerfContext(benchmark::State& state) {
       }
     }
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    Status s = db_full->WaitForCompact(true);
+    Status s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -1361,7 +1368,7 @@ static void IteratorPrev(benchmark::State& state) {
     }
 
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -1453,7 +1460,7 @@ static void PrefixSeek(benchmark::State& state) {
     }
 
     auto db_full = static_cast_with_check<DBImpl>(db.get());
-    s = db_full->WaitForCompact(true);
+    s = db_full->WaitForCompact();
     if (!s.ok()) {
       state.SkipWithError(s.ToString().c_str());
       return;
@@ -1541,7 +1548,8 @@ static void RandomAccessFileReaderRead(benchmark::State& state) {
                                        : Temperature::kCold;
     readers.emplace_back(new RandomAccessFileReader(
         std::move(f), fname, env->GetSystemClock().get(), nullptr, statistics,
-        0, nullptr, nullptr, {}, temperature, rand_num == 1));
+        Histograms::HISTOGRAM_ENUM_MAX, nullptr, nullptr, {}, temperature,
+        rand_num == 1));
   }
 
   IOOptions io_options;

package/deps/rocksdb/rocksdb/monitoring/instrumented_mutex.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "monitoring/statistics.h"
+#include "monitoring/statistics_impl.h"
 #include "port/port.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/system_clock.h"