fix RocksDB compilation errors

zjial · Oct 5, 2022 · 0361cf7 · 0361cf7
1 parent 67076aa
commit 0361cf7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/fdbserver/KeyValueStoreRocksDB.actor.cpp b/fdbserver/KeyValueStoreRocksDB.actor.cpp
@@ -1177,10 +1177,9 @@ struct RocksDBKeyValueStore : IKeyValueStore {
 			if (doPerfContextMetrics) {
 				perfContextMetrics->reset();
 			}
-			double commitBeginTime;
+			double commitBeginTime = timer_monotonic();
 			sharedState->commitQueueLatency->addMeasurement(commitBeginTime - a.startTime);
 			if (a.getHistograms) {
-				commitBeginTime = timer_monotonic();
 				metricPromiseStream->send(
 				    std::make_pair(ROCKSDB_COMMIT_QUEUEWAIT_HISTOGRAM.toString(), commitBeginTime - a.startTime));
 			}

diff --git a/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp b/fdbserver/KeyValueStoreShardedRocksDB.actor.cpp
@@ -2991,16 +2991,16 @@ TEST_CASE("noSim/ShardedRocksDB/Metadata") {
 	{
 		auto mapping = rocksdbStore->getDataMapping();
 		ASSERT(mapping.size() == 3);
-	}
 
-	// Remove ranges again.
-	kvStore->persistRangeMapping(KeyRangeRef("a"_sr, "f"_sr), false);
-	kvStore->removeRange(KeyRangeRef("a"_sr, "f"_sr));
+		// Remove ranges again.
+		kvStore->persistRangeMapping(KeyRangeRef("a"_sr, "f"_sr), false);
+		kvStore->removeRange(KeyRangeRef("a"_sr, "f"_sr));
 
-	mapping = rocksdbStore->getDataMapping();
-	ASSERT(mapping.size() == 1);
+		mapping = rocksdbStore->getDataMapping();
+		ASSERT(mapping.size() == 1);
 
-	wait(kvStore->commit(false));
+		wait(kvStore->commit(false));
+	}
 
 	// Restart.
 	{