Fix a warning against implicit type conversion (#4593)

Summary:
Test plan
```
$USE_CLANG=1 make -j32 all check
```
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4593

Differential Revision: D12811159

Pulled By: riversand963

fbshipit-source-id: 5e3bbe058c5a8d5a286a19d7643593fc154a2d6d
This commit is contained in:
Yanqin Jin 2018-10-29 09:52:54 -07:00 committed by Facebook Github Bot
parent 92b4401566
commit 7fb39f1ae1

View File

@ -792,46 +792,36 @@ class Stats {
} }
} }
void AddBytesForWrites(int nwrites, size_t nbytes) { void AddBytesForWrites(long nwrites, size_t nbytes) {
writes_ += nwrites; writes_ += nwrites;
bytes_ += nbytes; bytes_ += nbytes;
} }
void AddGets(int ngets, int nfounds) { void AddGets(long ngets, long nfounds) {
founds_ += nfounds; founds_ += nfounds;
gets_ += ngets; gets_ += ngets;
} }
void AddPrefixes(int nprefixes, int count) { void AddPrefixes(long nprefixes, long count) {
prefixes_ += nprefixes; prefixes_ += nprefixes;
iterator_size_sums_ += count; iterator_size_sums_ += count;
} }
void AddIterations(int n) { void AddIterations(long n) { iterations_ += n; }
iterations_ += n;
}
void AddDeletes(int n) { void AddDeletes(long n) { deletes_ += n; }
deletes_ += n;
}
void AddSingleDeletes(size_t n) { single_deletes_ += n; } void AddSingleDeletes(size_t n) { single_deletes_ += n; }
void AddRangeDeletions(int n) { void AddRangeDeletions(long n) { range_deletions_ += n; }
range_deletions_ += n;
}
void AddCoveredByRangeDeletions(int n) { void AddCoveredByRangeDeletions(long n) { covered_by_range_deletions_ += n; }
covered_by_range_deletions_ += n;
}
void AddErrors(int n) { void AddErrors(long n) { errors_ += n; }
errors_ += n;
}
void AddNumCompactFilesSucceed(int n) { num_compact_files_succeed_ += n; } void AddNumCompactFilesSucceed(long n) { num_compact_files_succeed_ += n; }
void AddNumCompactFilesFailed(int n) { num_compact_files_failed_ += n; } void AddNumCompactFilesFailed(long n) { num_compact_files_failed_ += n; }
void Report(const char* name) { void Report(const char* name) {
std::string extra; std::string extra;
@ -2738,16 +2728,15 @@ class NonBatchedOpsStressTest : public StressTest {
} }
Iterator* iter = db_->NewIterator(ro_copy, cfh); Iterator* iter = db_->NewIterator(ro_copy, cfh);
int64_t count = 0; long count = 0;
for (iter->Seek(prefix); for (iter->Seek(prefix);
iter->Valid() && iter->key().starts_with(prefix); iter->Next()) { iter->Valid() && iter->key().starts_with(prefix); iter->Next()) {
++count; ++count;
} }
assert(count <= assert(count <= (static_cast<long>(1) << ((8 - FLAGS_prefix_size) * 8)));
(static_cast<int64_t>(1) << ((8 - FLAGS_prefix_size) * 8)));
Status s = iter->status(); Status s = iter->status();
if (iter->status().ok()) { if (iter->status().ok()) {
thread->stats.AddPrefixes(1, static_cast<int>(count)); thread->stats.AddPrefixes(1, count);
} else { } else {
thread->stats.AddErrors(1); thread->stats.AddErrors(1);
} }
@ -3277,7 +3266,7 @@ class BatchedOpsStressTest : public StressTest {
iters[i]->Seek(prefix_slices[i]); iters[i]->Seek(prefix_slices[i]);
} }
int count = 0; long count = 0;
while (iters[0]->Valid() && iters[0]->key().starts_with(prefix_slices[0])) { while (iters[0]->Valid() && iters[0]->key().starts_with(prefix_slices[0])) {
count++; count++;
std::string values[10]; std::string values[10];
@ -3364,7 +3353,7 @@ class AtomicFlushStressTest : public StressTest {
fprintf(stderr, "multi put or merge error: %s\n", s.ToString().c_str()); fprintf(stderr, "multi put or merge error: %s\n", s.ToString().c_str());
thread->stats.AddErrors(1); thread->stats.AddErrors(1);
} else { } else {
size_t num = rand_column_families.size(); auto num = static_cast<long>(rand_column_families.size());
thread->stats.AddBytesForWrites(num, (sz + 1) * num); thread->stats.AddBytesForWrites(num, (sz + 1) * num);
} }
@ -3387,7 +3376,7 @@ class AtomicFlushStressTest : public StressTest {
fprintf(stderr, "multidel error: %s\n", s.ToString().c_str()); fprintf(stderr, "multidel error: %s\n", s.ToString().c_str());
thread->stats.AddErrors(1); thread->stats.AddErrors(1);
} else { } else {
thread->stats.AddDeletes(rand_column_families.size()); thread->stats.AddDeletes(static_cast<long>(rand_column_families.size()));
} }
return s; return s;
} }
@ -3417,7 +3406,8 @@ class AtomicFlushStressTest : public StressTest {
fprintf(stderr, "multi del range error: %s\n", s.ToString().c_str()); fprintf(stderr, "multi del range error: %s\n", s.ToString().c_str());
thread->stats.AddErrors(1); thread->stats.AddErrors(1);
} else { } else {
thread->stats.AddRangeDeletions(rand_column_families.size()); thread->stats.AddRangeDeletions(
static_cast<long>(rand_column_families.size()));
} }
return s; return s;
} }
@ -3473,15 +3463,15 @@ class AtomicFlushStressTest : public StressTest {
column_families_[rand_column_families[thread->rand.Next() % column_families_[rand_column_families[thread->rand.Next() %
rand_column_families.size()]]; rand_column_families.size()]];
Iterator* iter = db_->NewIterator(ro_copy, cfh); Iterator* iter = db_->NewIterator(ro_copy, cfh);
int64_t count = 0; long count = 0;
for (iter->Seek(prefix); iter->Valid() && iter->key().starts_with(prefix); for (iter->Seek(prefix); iter->Valid() && iter->key().starts_with(prefix);
iter->Next()) { iter->Next()) {
++count; ++count;
} }
assert(count <= (static_cast<int64_t>(1) << ((8 - FLAGS_prefix_size) * 8))); assert(count <= (static_cast<long>(1) << ((8 - FLAGS_prefix_size) * 8)));
Status s = iter->status(); Status s = iter->status();
if (s.ok()) { if (s.ok()) {
thread->stats.AddPrefixes(1, static_cast<int>(count)); thread->stats.AddPrefixes(1, count);
} else { } else {
thread->stats.AddErrors(1); thread->stats.AddErrors(1);
} }