andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The ReadnRandomWriteRandom was always looping FLAGS_num of times.

Browse Source 
Summary: If none of reads or writes are specified by user, then pick the FLAGS_NUM as the number of iterations in the ReadRandomWriteRandom test. If either reads or writes are defined, then use their maximum.

Test Plan: run benchmark

Reviewers: heyongqiang

Reviewed By: heyongqiang

Differential Revision: https://reviews.facebook.net/D5217
This commit is contained in:
Dhruba Borthakur 2012-09-05 23:45:42 -07:00
parent 354a9ea089
commit 536ca698ba
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
db/db_bench.cc
View File

@ -373,6 +373,7 @@ class Benchmark {
WriteOptions write_options_;
long reads_;
long writes_;
long readwrites_;
int heap_counter_;
void PrintHeader() {
@ -473,6 +474,9 @@ class Benchmark {
entries_per_batch_(1),
reads_(FLAGS_reads < 0 ? FLAGS_num : FLAGS_reads),
writes_(FLAGS_writes < 0 ? FLAGS_num : FLAGS_writes),
readwrites_((FLAGS_writes < 0 && FLAGS_reads < 0)? FLAGS_num :
((FLAGS_writes > FLAGS_reads) ? FLAGS_writes : FLAGS_reads)
),
heap_counter_(0) {
std::vector<std::string> files;
FLAGS_env->GetChildren(FLAGS_db, &files);
@ -999,8 +1003,7 @@ class Benchmark {
long reads_done = 0;
long writes_done = 0;
// the number of iterations is the larger of read_ or write_
long numiter = (reads_ > writes_? reads_ : writes_);
for (long i = 0; i < numiter; i++) {
for (long i = 0; i < readwrites_; i++) {
char key[100];
const int k = thread->rand.Next() % FLAGS_num;
snprintf(key, sizeof(key), "%016d", k);
@ -1031,7 +1034,7 @@ class Benchmark {
}
char msg[100];
snprintf(msg, sizeof(msg), "( reads:%ld writes:%ld total:%ld )",
reads_done, writes_done, numiter);
reads_done, writes_done, readwrites_);
thread->stats.AddMessage(msg);
}