Fix another rebase problems.

vaintroub · Dec 12, 2015 · aca403d · aca403d
1 parent a6fbdd6
commit aca403d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/db/db_bench.cc b/db/db_bench.cc
@@ -3214,7 +3214,6 @@ class Benchmark {
     if (thread->tid > 0) {
       ReadRandom(thread);
     } else {
-      BGWriter(thread, kPut);
       BGWriter(thread, kWrite);
     }
   }

diff --git a/db/version_set.cc b/db/version_set.cc
@@ -757,7 +757,7 @@ uint64_t VersionStorageInfo::GetEstimatedActiveKeys() const {
     // casting to avoid overflowing
     return 
       static_cast<uint64_t>(
-        (est * static_cast<double>(file_count) / current_num_samples_);
+        (est * static_cast<double>(file_count) / current_num_samples_)
       );
   } else {
     return est;
@@ -871,21 +871,24 @@ Version::Version(ColumnFamilyData* column_family_data, VersionSet* vset,
       refs_(0),
       version_number_(version_number) {}
 
-void Version::Get(const ReadOptions& read_options,
-                  const LookupKey& k,
-                  std::string* value,
-                  Status* status,
-                  MergeContext* merge_context,
-                  bool* value_found) {
+void Version::Get(const ReadOptions& read_options, const LookupKey& k,
+                  std::string* value, Status* status,
+                  MergeContext* merge_context, bool* value_found,
+                  bool* key_exists, SequenceNumber* seq) {
   Slice ikey = k.internal_key();
   Slice user_key = k.user_key();
 
   assert(status->ok() || status->IsMergeInProgress());
 
+  if (key_exists != nullptr) {
+    // will falsify below if not found
+    *key_exists = true;
+  }
+
   GetContext get_context(
       user_comparator(), merge_operator_, info_log_, db_statistics_,
       status->ok() ? GetContext::kNotFound : GetContext::kMerge, user_key,
-      value, value_found, merge_context, this->env_);
+      value, value_found, merge_context, this->env_, seq);
 
   FilePicker fp(
       storage_info_.files_, user_key, ikey, &storage_info_.level_files_brief_,

diff --git a/util/rate_limiter.h b/util/rate_limiter.h
@@ -60,7 +60,7 @@ class GenericRateLimiter : public RateLimiter {
  private:
   void Refill();
   int64_t CalculateRefillBytesPerPeriod(int64_t rate_bytes_per_sec) {
-    return static_cast<int64_t>(rate_bytes_per_sec * refill_period_us_ / 1000000.0);
+    return rate_bytes_per_sec * refill_period_us_ / 1000000;
   }
 
   // This mutex guard all internal states