NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull from https://reviews.facebook.net/D10917

Browse Source 
Summary: Pull Mark's patch and slightly revise it. I revised another place in db_impl.cc with similar new formula.

Test Plan:
make all check. Also run "time ./db_bench --num=2500000000 --numdistinct=2200000000". It has run for 20+ hours and hasn't finished. Looks good so far:

Installed stack trace handler for SIGILL SIGSEGV SIGBUS SIGABRT
LevelDB:    version 2.0
Date:       Tue Aug 20 23:11:55 2013
CPU:        32 * Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz
CPUCache:   20480 KB
Keys:       16 bytes each
Values:     100 bytes each (50 bytes after compression)
Entries:    2500000000
RawSize:    276565.6 MB (estimated)
FileSize:   157356.3 MB (estimated)
Write rate limit: 0
Compression: snappy
WARNING: Assertions are enabled; benchmarks unnecessarily slow
------------------------------------------------
DB path: [/tmp/leveldbtest-3088/dbbench]
fillseq      :    7202.000 micros/op 138 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
fillsync     :    7148.000 micros/op 139 ops/sec; (2500000 ops)
DB path: [/tmp/leveldbtest-3088/dbbench]
fillrandom   :    7105.000 micros/op 140 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
overwrite    :    6930.000 micros/op 144 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
readrandom   :       1.020 micros/op 980507 ops/sec; (0 of 2500000000 found)
DB path: [/tmp/leveldbtest-3088/dbbench]
readrandom   :       1.021 micros/op 979620 ops/sec; (0 of 2500000000 found)
DB path: [/tmp/leveldbtest-3088/dbbench]
readseq      :     113.000 micros/op 8849 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
readreverse  :     102.000 micros/op 9803 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
Created bg thread 0x7f0ac17f7700
compact      :  111701.000 micros/op 8 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
readrandom   :       1.020 micros/op 980376 ops/sec; (0 of 2500000000 found)
DB path: [/tmp/leveldbtest-3088/dbbench]
readseq      :     120.000 micros/op 8333 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
readreverse  :      29.000 micros/op 34482 ops/sec;
DB path: [/tmp/leveldbtest-3088/dbbench]
... finished 618100000 ops

Reviewers: MarkCallaghan, haobo, dhruba, chip

Reviewed By: dhruba

Differential Revision: https://reviews.facebook.net/D12441
main
Xing Jin 11 years ago
parent 94cf218720
commit 17dc128048
2 changed files with 91 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 158
      db/db_bench.cc
  2. 14
      db/db_impl.cc

158
db/db_bench.cc
Unescape View File

@ -82,12 +82,12 @@ static const char* FLAGS_benchmarks =
// the maximum size of key in bytes // the maximum size of key in bytes
static const int MAX_KEY_SIZE = 128; static const int MAX_KEY_SIZE = 128;
// Number of key/values to place in database // Number of key/values to place in database
static long FLAGS_num = 1000000; static long long FLAGS_num = 1000000;
// Number of distinct keys to use. Used in RandomWithVerify to read/write // Number of distinct keys to use. Used in RandomWithVerify to read/write
// on fewer keys so that gets are more likely to find the key and puts // on fewer keys so that gets are more likely to find the key and puts
// are more likely to update the same key // are more likely to update the same key
static long FLAGS_numdistinct = 1000; static long long FLAGS_numdistinct = 1000;
// Number of read operations to do. If negative, do FLAGS_num reads. // Number of read operations to do. If negative, do FLAGS_num reads.
static long FLAGS_reads = -1; static long FLAGS_reads = -1;
@ -278,7 +278,7 @@ static leveldb::Env* FLAGS_env = leveldb::Env::Default();
// Stats are reported every N operations when this is greater // Stats are reported every N operations when this is greater
// than zero. When 0 the interval grows over time. // than zero. When 0 the interval grows over time.
static int FLAGS_stats_interval = 0; static long long FLAGS_stats_interval = 0;
// Reports additional stats per interval when this is greater // Reports additional stats per interval when this is greater
// than 0. // than 0.
@ -418,9 +418,9 @@ class Stats {
double start_; double start_;
double finish_; double finish_;
double seconds_; double seconds_;
long done_; long long done_;
long last_report_done_; long long last_report_done_;
int next_report_; long long next_report_;
int64_t bytes_; int64_t bytes_;
double last_op_finish_; double last_op_finish_;
double last_report_finish_; double last_report_finish_;
@ -497,12 +497,13 @@ class Stats {
else if (next_report_ < 100000) next_report_ += 10000; else if (next_report_ < 100000) next_report_ += 10000;
else if (next_report_ < 500000) next_report_ += 50000; else if (next_report_ < 500000) next_report_ += 50000;
else next_report_ += 100000; else next_report_ += 100000;
fprintf(stderr, "... finished %ld ops%30s\r", done_, ""); fprintf(stderr, "... finished %lld ops%30s\r", done_, "");
fflush(stderr); fflush(stderr);
} else { } else {
double now = FLAGS_env->NowMicros(); double now = FLAGS_env->NowMicros();
fprintf(stderr, fprintf(stderr,
"%s ... thread %d: (%ld,%ld) ops and (%.1f,%.1f) ops/second in (%.6f,%.6f) seconds\n", "%s ... thread %d: (%lld,%lld) ops and "
"(%.1f,%.1f) ops/second in (%.6f,%.6f) seconds\n",
FLAGS_env->TimeToString((uint64_t) now/1000000).c_str(), FLAGS_env->TimeToString((uint64_t) now/1000000).c_str(),
id_, id_,
done_ - last_report_done_, done_, done_ - last_report_done_, done_,
@ -584,7 +585,7 @@ struct SharedState {
// Per-thread state for concurrent executions of the same benchmark. // Per-thread state for concurrent executions of the same benchmark.
struct ThreadState { struct ThreadState {
int tid; // 0..n-1 when running in n threads int tid; // 0..n-1 when running in n threads
Random rand; // Has different seeds for different threads Random64 rand; // Has different seeds for different threads
Stats stats; Stats stats;
SharedState* shared; SharedState* shared;
@ -596,7 +597,7 @@ struct ThreadState {
class Duration { class Duration {
public: public:
Duration(int max_seconds, long max_ops) { Duration(int max_seconds, long long max_ops) {
max_seconds_ = max_seconds; max_seconds_ = max_seconds;
max_ops_= max_ops; max_ops_= max_ops;
ops_ = 0; ops_ = 0;
@ -622,8 +623,8 @@ class Duration {
private: private:
int max_seconds_; int max_seconds_;
long max_ops_; long long max_ops_;
long ops_; long long ops_;
double start_at_; double start_at_;
}; };
@ -632,14 +633,14 @@ class Benchmark {
shared_ptr<Cache> cache_; shared_ptr<Cache> cache_;
const FilterPolicy* filter_policy_; const FilterPolicy* filter_policy_;
DB* db_; DB* db_;
long num_; long long num_;
int value_size_; int value_size_;
int key_size_; int key_size_;
int entries_per_batch_; int entries_per_batch_;
WriteOptions write_options_; WriteOptions write_options_;
long reads_; long long reads_;
long writes_; long long writes_;
long readwrites_; long long readwrites_;
int heap_counter_; int heap_counter_;
char keyFormat_[100]; // this string will contain the format of key. e.g "%016d" char keyFormat_[100]; // this string will contain the format of key. e.g "%016d"
void PrintHeader() { void PrintHeader() {
@ -648,7 +649,7 @@ class Benchmark {
fprintf(stdout, "Values: %d bytes each (%d bytes after compression)\n", fprintf(stdout, "Values: %d bytes each (%d bytes after compression)\n",
FLAGS_value_size, FLAGS_value_size,
static_cast<int>(FLAGS_value_size * FLAGS_compression_ratio + 0.5)); static_cast<int>(FLAGS_value_size * FLAGS_compression_ratio + 0.5));
fprintf(stdout, "Entries: %ld\n", num_); fprintf(stdout, "Entries: %lld\n", num_);
fprintf(stdout, "RawSize: %.1f MB (estimated)\n", fprintf(stdout, "RawSize: %.1f MB (estimated)\n",
((static_cast<int64_t>(FLAGS_key_size + FLAGS_value_size) * num_) ((static_cast<int64_t>(FLAGS_key_size + FLAGS_value_size) * num_)
/ 1048576.0)); / 1048576.0));
@ -801,14 +802,14 @@ class Benchmark {
delete filter_policy_; delete filter_policy_;
} }
//this function will construct string format for key. e.g "%016d" //this function will construct string format for key. e.g "%016lld"
void ConstructStrFormatForKey(char* str, int keySize) { void ConstructStrFormatForKey(char* str, int keySize) {
str[0] = '%'; str[0] = '%';
str[1] = '0'; str[1] = '0';
sprintf(str+2, "%dd%s", keySize, "%s"); sprintf(str+2, "%dlld%s", keySize, "%s");
} }
unique_ptr<char []> GenerateKeyFromInt(int v, const char* suffix = "") { unique_ptr<char []> GenerateKeyFromInt(long long v, const char* suffix = "") {
unique_ptr<char []> keyInStr(new char[MAX_KEY_SIZE]); unique_ptr<char []> keyInStr(new char[MAX_KEY_SIZE]);
snprintf(keyInStr.get(), MAX_KEY_SIZE, keyFormat_, v, suffix); snprintf(keyInStr.get(), MAX_KEY_SIZE, keyFormat_, v, suffix);
return keyInStr; return keyInStr;
@ -1261,7 +1262,7 @@ class Benchmark {
if (num_ != FLAGS_num) { if (num_ != FLAGS_num) {
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "(%ld ops)", num_); snprintf(msg, sizeof(msg), "(%lld ops)", num_);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1273,7 +1274,7 @@ class Benchmark {
while (!duration.Done(entries_per_batch_)) { while (!duration.Done(entries_per_batch_)) {
batch.Clear(); batch.Clear();
for (int j = 0; j < entries_per_batch_; j++) { for (int j = 0; j < entries_per_batch_; j++) {
int k = 0; long long k = 0;
switch(write_mode) { switch(write_mode) {
case SEQUENTIAL: case SEQUENTIAL:
k = i +j; k = i +j;
@ -1283,7 +1284,7 @@ class Benchmark {
break; break;
case UNIQUE_RANDOM: case UNIQUE_RANDOM:
{ {
int t = thread->rand.Next() % FLAGS_num; const long long t = thread->rand.Next() % FLAGS_num;
if (!bit_set->test(t)) { if (!bit_set->test(t)) {
// best case // best case
k = t; k = t;
@ -1328,7 +1329,7 @@ class Benchmark {
void ReadSequential(ThreadState* thread) { void ReadSequential(ThreadState* thread) {
Iterator* iter = db_->NewIterator(ReadOptions(FLAGS_verify_checksum, true)); Iterator* iter = db_->NewIterator(ReadOptions(FLAGS_verify_checksum, true));
long i = 0; long long i = 0;
int64_t bytes = 0; int64_t bytes = 0;
for (iter->SeekToFirst(); i < reads_ && iter->Valid(); iter->Next()) { for (iter->SeekToFirst(); i < reads_ && iter->Valid(); iter->Next()) {
bytes += iter->key().size() + iter->value().size(); bytes += iter->key().size() + iter->value().size();
@ -1341,7 +1342,7 @@ class Benchmark {
void ReadReverse(ThreadState* thread) { void ReadReverse(ThreadState* thread) {
Iterator* iter = db_->NewIterator(ReadOptions(FLAGS_verify_checksum, true)); Iterator* iter = db_->NewIterator(ReadOptions(FLAGS_verify_checksum, true));
long i = 0; long long i = 0;
int64_t bytes = 0; int64_t bytes = 0;
for (iter->SeekToLast(); i < reads_ && iter->Valid(); iter->Prev()) { for (iter->SeekToLast(); i < reads_ && iter->Valid(); iter->Prev()) {
bytes += iter->key().size() + iter->value().size(); bytes += iter->key().size() + iter->value().size();
@ -1355,14 +1356,14 @@ class Benchmark {
// Calls MultiGet over a list of keys from a random distribution. // Calls MultiGet over a list of keys from a random distribution.
// Returns the total number of keys found. // Returns the total number of keys found.
long MultiGetRandom(ReadOptions& options, int num_keys, long MultiGetRandom(ReadOptions& options, int num_keys,
Random& rand, int range, const char* suffix) { Random64& rand, long long range, const char* suffix) {
assert(num_keys > 0); assert(num_keys > 0);
std::vector<Slice> keys(num_keys); std::vector<Slice> keys(num_keys);
std::vector<std::string> values(num_keys); std::vector<std::string> values(num_keys);
std::vector<unique_ptr<char []> > gen_keys(num_keys); std::vector<unique_ptr<char []> > gen_keys(num_keys);
int i; int i;
long k; long long k;
// Fill the keys vector // Fill the keys vector
for(i=0; i<num_keys; ++i) { for(i=0; i<num_keys; ++i) {
@ -1404,7 +1405,7 @@ class Benchmark {
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
Duration duration(FLAGS_duration, reads_); Duration duration(FLAGS_duration, reads_);
long found = 0; long long found = 0;
if (FLAGS_use_multiget) { // MultiGet if (FLAGS_use_multiget) { // MultiGet
const long& kpg = FLAGS_keys_per_multiget; // keys per multiget group const long& kpg = FLAGS_keys_per_multiget; // keys per multiget group
@ -1421,7 +1422,7 @@ class Benchmark {
Iterator* iter = db_->NewIterator(options); Iterator* iter = db_->NewIterator(options);
std::string value; std::string value;
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
if (FLAGS_use_snapshot) { if (FLAGS_use_snapshot) {
options.snapshot = db_->GetSnapshot(); options.snapshot = db_->GetSnapshot();
@ -1463,7 +1464,7 @@ class Benchmark {
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "(%ld of %ld found)", found, reads_); snprintf(msg, sizeof(msg), "(%lld of %lld found)", found, reads_);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1496,7 +1497,7 @@ class Benchmark {
std::string value; std::string value;
Status s; Status s;
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k, "."); unique_ptr<char []> key = GenerateKeyFromInt(k, ".");
s = db_->Get(options, key.get(), &value); s = db_->Get(options, key.get(), &value);
assert(!s.ok() && s.IsNotFound()); assert(!s.ok() && s.IsNotFound());
@ -1508,12 +1509,12 @@ class Benchmark {
void ReadHot(ThreadState* thread) { void ReadHot(ThreadState* thread) {
Duration duration(FLAGS_duration, reads_); Duration duration(FLAGS_duration, reads_);
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
const long range = (FLAGS_num + 99) / 100; const long long range = (FLAGS_num + 99) / 100;
long found = 0; long long found = 0;
if (FLAGS_use_multiget) { if (FLAGS_use_multiget) {
const long& kpg = FLAGS_keys_per_multiget; // keys per multiget group const long long kpg = FLAGS_keys_per_multiget; // keys per multiget group
long keys_left = reads_; long long keys_left = reads_;
// Recalculate number of keys per group, and call MultiGet until done // Recalculate number of keys per group, and call MultiGet until done
long num_keys; long num_keys;
@ -1525,7 +1526,7 @@ class Benchmark {
} else { } else {
std::string value; std::string value;
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % range; const long long k = thread->rand.Next() % range;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
if (db_->Get(options, key.get(), &value).ok()){ if (db_->Get(options, key.get(), &value).ok()){
++found; ++found;
@ -1535,7 +1536,7 @@ class Benchmark {
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "(%ld of %ld found)", found, reads_); snprintf(msg, sizeof(msg), "(%lld of %lld found)", found, reads_);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1543,10 +1544,10 @@ class Benchmark {
Duration duration(FLAGS_duration, reads_); Duration duration(FLAGS_duration, reads_);
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
std::string value; std::string value;
long found = 0; long long found = 0;
while (!duration.Done(1)) { while (!duration.Done(1)) {
Iterator* iter = db_->NewIterator(options); Iterator* iter = db_->NewIterator(options);
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
iter->Seek(key.get()); iter->Seek(key.get());
if (iter->Valid() && iter->key() == key.get()) found++; if (iter->Valid() && iter->key() == key.get()) found++;
@ -1554,7 +1555,7 @@ class Benchmark {
thread->stats.FinishedSingleOp(db_); thread->stats.FinishedSingleOp(db_);
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "(%ld of %ld found)", found, num_); snprintf(msg, sizeof(msg), "(%lld of %lld found)", found, num_);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1566,7 +1567,7 @@ class Benchmark {
while (!duration.Done(entries_per_batch_)) { while (!duration.Done(entries_per_batch_)) {
batch.Clear(); batch.Clear();
for (int j = 0; j < entries_per_batch_; j++) { for (int j = 0; j < entries_per_batch_; j++) {
const int k = seq ? i+j : (thread->rand.Next() % FLAGS_num); const long long k = seq ? i+j : (thread->rand.Next() % FLAGS_num);
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
batch.Delete(key.get()); batch.Delete(key.get());
thread->stats.FinishedSingleOp(db_); thread->stats.FinishedSingleOp(db_);
@ -1616,7 +1617,7 @@ class Benchmark {
} }
} }
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
Status s = db_->Put(write_options_, key.get(), gen.Generate(value_size_)); Status s = db_->Put(write_options_, key.get(), gen.Generate(value_size_));
if (!s.ok()) { if (!s.ok()) {
@ -1730,17 +1731,17 @@ class Benchmark {
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
RandomGenerator gen; RandomGenerator gen;
std::string value; std::string value;
long found = 0; long long found = 0;
int get_weight = 0; int get_weight = 0;
int put_weight = 0; int put_weight = 0;
int delete_weight = 0; int delete_weight = 0;
long gets_done = 0; long long gets_done = 0;
long puts_done = 0; long long puts_done = 0;
long deletes_done = 0; long long deletes_done = 0;
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
for (long i = 0; i < readwrites_; i++) { for (long long i = 0; i < readwrites_; i++) {
const int k = thread->rand.Next() % (FLAGS_numdistinct); const long long k = thread->rand.Next() % (FLAGS_numdistinct);
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
if (get_weight == 0 && put_weight == 0 && delete_weight == 0) { if (get_weight == 0 && put_weight == 0 && delete_weight == 0) {
// one batch completed, reinitialize for next batch // one batch completed, reinitialize for next batch
@ -1783,7 +1784,8 @@ class Benchmark {
thread->stats.FinishedSingleOp(db_); thread->stats.FinishedSingleOp(db_);
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "( get:%ld put:%ld del:%ld total:%ld found:%ld)", snprintf(msg, sizeof(msg),
"( get:%lld put:%lld del:%lld total:%lld found:%lld)",
gets_done, puts_done, deletes_done, readwrites_, found); gets_done, puts_done, deletes_done, readwrites_, found);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1800,16 +1802,16 @@ class Benchmark {
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
RandomGenerator gen; RandomGenerator gen;
std::string value; std::string value;
long found = 0; long long found = 0;
int get_weight = 0; int get_weight = 0;
int put_weight = 0; int put_weight = 0;
long reads_done = 0; long long reads_done = 0;
long writes_done = 0; long long writes_done = 0;
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
if (get_weight == 0 && put_weight == 0) { if (get_weight == 0 && put_weight == 0) {
// one batch completed, reinitialize for next batch // one batch completed, reinitialize for next batch
@ -1824,7 +1826,7 @@ class Benchmark {
if (FLAGS_get_approx) { if (FLAGS_get_approx) {
char key2[100]; char key2[100];
snprintf(key2, sizeof(key2), "%016d", k + 1); snprintf(key2, sizeof(key2), "%016lld", k + 1);
Slice skey2(key2); Slice skey2(key2);
Slice skey(key2); Slice skey(key2);
Range range(skey, skey2); Range range(skey, skey2);
@ -1863,7 +1865,8 @@ class Benchmark {
thread->stats.FinishedSingleOp(db_); thread->stats.FinishedSingleOp(db_);
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "( reads:%ld writes:%ld total:%ld found:%ld)", snprintf(msg, sizeof(msg),
"( reads:%lld writes:%lld total:%lld found:%lld)",
reads_done, writes_done, readwrites_, found); reads_done, writes_done, readwrites_, found);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1920,7 +1923,7 @@ class Benchmark {
// Now do the puts // Now do the puts
int i; int i;
long k; long long k;
for(i=0; i<num_put_keys; ++i) { for(i=0; i<num_put_keys; ++i) {
k = thread->rand.Next() % FLAGS_num; k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
@ -1938,7 +1941,7 @@ class Benchmark {
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), snprintf(msg, sizeof(msg),
"( reads:%ld writes:%ld total:%ld multiget_ops:%ld found:%ld)", "( reads:%ld writes:%ld total:%lld multiget_ops:%ld found:%ld)",
reads_done, writes_done, readwrites_, multigets_done, found); reads_done, writes_done, readwrites_, multigets_done, found);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -1949,12 +1952,12 @@ class Benchmark {
ReadOptions options(FLAGS_verify_checksum, true); ReadOptions options(FLAGS_verify_checksum, true);
RandomGenerator gen; RandomGenerator gen;
std::string value; std::string value;
long found = 0; long long found = 0;
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
// the number of iterations is the larger of read_ or write_ // the number of iterations is the larger of read_ or write_
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
if (FLAGS_use_snapshot) { if (FLAGS_use_snapshot) {
@ -1963,7 +1966,7 @@ class Benchmark {
if (FLAGS_get_approx) { if (FLAGS_get_approx) {
char key2[100]; char key2[100];
snprintf(key2, sizeof(key2), "%016d", k + 1); snprintf(key2, sizeof(key2), "%016lld", k + 1);
Slice skey2(key2); Slice skey2(key2);
Slice skey(key2); Slice skey(key2);
Range range(skey, skey2); Range range(skey, skey2);
@ -1987,7 +1990,8 @@ class Benchmark {
thread->stats.FinishedSingleOp(db_); thread->stats.FinishedSingleOp(db_);
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "( updates:%ld found:%ld)", readwrites_, found); snprintf(msg, sizeof(msg),
"( updates:%lld found:%lld)", readwrites_, found);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -2003,7 +2007,7 @@ class Benchmark {
// The number of iterations is the larger of read_ or write_ // The number of iterations is the larger of read_ or write_
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
if (FLAGS_use_snapshot) { if (FLAGS_use_snapshot) {
@ -2012,7 +2016,7 @@ class Benchmark {
if (FLAGS_get_approx) { if (FLAGS_get_approx) {
char key2[100]; char key2[100];
snprintf(key2, sizeof(key2), "%016d", k + 1); snprintf(key2, sizeof(key2), "%016lld", k + 1);
Slice skey2(key2); Slice skey2(key2);
Slice skey(key2); Slice skey(key2);
Range range(skey, skey2); Range range(skey, skey2);
@ -2049,7 +2053,7 @@ class Benchmark {
thread->stats.FinishedSingleOp(db_); thread->stats.FinishedSingleOp(db_);
} }
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "( updates:%ld found:%ld)", readwrites_, found); snprintf(msg, sizeof(msg), "( updates:%lld found:%ld)", readwrites_, found);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -2066,7 +2070,7 @@ class Benchmark {
// The number of iterations is the larger of read_ or write_ // The number of iterations is the larger of read_ or write_
Duration duration(FLAGS_duration, readwrites_); Duration duration(FLAGS_duration, readwrites_);
while (!duration.Done(1)) { while (!duration.Done(1)) {
const int k = thread->rand.Next() % FLAGS_num; const long long k = thread->rand.Next() % FLAGS_num;
unique_ptr<char []> key = GenerateKeyFromInt(k); unique_ptr<char []> key = GenerateKeyFromInt(k);
Status s = db_->Merge(write_options_, key.get(), Status s = db_->Merge(write_options_, key.get(),
@ -2081,7 +2085,7 @@ class Benchmark {
// Print some statistics // Print some statistics
char msg[100]; char msg[100];
snprintf(msg, sizeof(msg), "( updates:%ld)", readwrites_); snprintf(msg, sizeof(msg), "( updates:%lld)", readwrites_);
thread->stats.AddMessage(msg); thread->stats.AddMessage(msg);
} }
@ -2148,6 +2152,7 @@ int main(int argc, char** argv) {
double d; double d;
int n; int n;
long l; long l;
long long ll;
char junk; char junk;
char buf[2048]; char buf[2048];
char str[512]; char str[512];
@ -2162,12 +2167,12 @@ int main(int argc, char** argv) {
} else if (sscanf(argv[i], "--use_existing_db=%d%c", &n, &junk) == 1 && } else if (sscanf(argv[i], "--use_existing_db=%d%c", &n, &junk) == 1 &&
(n == 0 || n == 1)) { (n == 0 || n == 1)) {
FLAGS_use_existing_db = n; FLAGS_use_existing_db = n;
} else if (sscanf(argv[i], "--num=%ld%c", &l, &junk) == 1) { } else if (sscanf(argv[i], "--num=%lld%c", &ll, &junk) == 1) {
FLAGS_num = l; FLAGS_num = ll;
} else if (sscanf(argv[i], "--numdistinct=%ld%c", &l, &junk) == 1) { } else if (sscanf(argv[i], "--numdistinct=%lld%c", &ll, &junk) == 1) {
FLAGS_numdistinct = l; FLAGS_numdistinct = ll;
} else if (sscanf(argv[i], "--reads=%d%c", &n, &junk) == 1) { } else if (sscanf(argv[i], "--reads=%lld%c", &ll, &junk) == 1) {
FLAGS_reads = n; FLAGS_reads = ll;
} else if (sscanf(argv[i], "--read_range=%d%c", &n, &junk) == 1) { } else if (sscanf(argv[i], "--read_range=%d%c", &n, &junk) == 1) {
FLAGS_read_range = n; FLAGS_read_range = n;
} else if (sscanf(argv[i], "--duration=%d%c", &n, &junk) == 1) { } else if (sscanf(argv[i], "--duration=%d%c", &n, &junk) == 1) {
@ -2244,8 +2249,8 @@ int main(int argc, char** argv) {
dbstats = leveldb::CreateDBStatistics(); dbstats = leveldb::CreateDBStatistics();
FLAGS_statistics = true; FLAGS_statistics = true;
} }
} else if (sscanf(argv[i], "--writes=%d%c", &n, &junk) == 1) { } else if (sscanf(argv[i], "--writes=%lld%c", &ll, &junk) == 1) {
FLAGS_writes = n; FLAGS_writes = ll;
} else if (sscanf(argv[i], "--writes_per_second=%d%c", &n, &junk) == 1) { } else if (sscanf(argv[i], "--writes_per_second=%d%c", &n, &junk) == 1) {
FLAGS_writes_per_second = n; FLAGS_writes_per_second = n;
} else if (sscanf(argv[i], "--sync=%d%c", &n, &junk) == 1 && } else if (sscanf(argv[i], "--sync=%d%c", &n, &junk) == 1 &&
@ -2328,9 +2333,8 @@ int main(int argc, char** argv) {
} else if (sscanf(argv[i], "--delete_obsolete_files_period_micros=%ld%c", } else if (sscanf(argv[i], "--delete_obsolete_files_period_micros=%ld%c",
&l, &junk) == 1) { &l, &junk) == 1) {
FLAGS_delete_obsolete_files_period_micros = l; FLAGS_delete_obsolete_files_period_micros = l;
} else if (sscanf(argv[i], "--stats_interval=%d%c", &n, &junk) == 1 && } else if (sscanf(argv[i], "--stats_interval=%lld%c", &ll, &junk) == 1) {
n >= 0 && n < 2000000000) { FLAGS_stats_interval = ll;
FLAGS_stats_interval = n;
} else if (sscanf(argv[i], "--stats_per_interval=%d%c", &n, &junk) == 1 } else if (sscanf(argv[i], "--stats_per_interval=%d%c", &n, &junk) == 1
&& (n == 0 || n == 1)) { && (n == 0 || n == 1)) {
FLAGS_stats_per_interval = n; FLAGS_stats_per_interval = n;

14
db/db_impl.cc
Unescape View File

@ -2097,7 +2097,8 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) {
VersionSet::LevelSummaryStorage tmp; VersionSet::LevelSummaryStorage tmp;
Log(options_.info_log, Log(options_.info_log,
"compacted to: %s, %.1f MB/sec, level %d, files in(%d, %d) out(%d) " "compacted to: %s, %.1f MB/sec, level %d, files in(%d, %d) out(%d) "
"MB in(%.1f, %.1f) out(%.1f), amplify(%.1f) %s\n", "MB in(%.1f, %.1f) out(%.1f), read-write-amplify(%.1f) "
"write-amplify(%.1f) %s\n",
versions_->LevelSummary(&tmp), versions_->LevelSummary(&tmp),
(stats.bytes_readn + stats.bytes_readnp1 + stats.bytes_written) / (stats.bytes_readn + stats.bytes_readnp1 + stats.bytes_written) /
(double) stats.micros, (double) stats.micros,
@ -2106,8 +2107,9 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) {
stats.bytes_readn / 1048576.0, stats.bytes_readn / 1048576.0,
stats.bytes_readnp1 / 1048576.0, stats.bytes_readnp1 / 1048576.0,
stats.bytes_written / 1048576.0, stats.bytes_written / 1048576.0,
(stats.bytes_written + stats.bytes_readnp1) / (stats.bytes_written + stats.bytes_readnp1 + stats.bytes_readn) /
(double) stats.bytes_readn, (double) stats.bytes_readn,
stats.bytes_written / (double) stats.bytes_readn,
status.ToString().c_str()); status.ToString().c_str());
return status; return status;
@ -2773,7 +2775,7 @@ bool DBImpl::GetProperty(const Slice& property, std::string* value) {
// Pardon the long line but I think it is easier to read this way. // Pardon the long line but I think it is easier to read this way.
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
" Compactions\n" " Compactions\n"
"Level Files Size(MB) Score Time(sec) Read(MB) Write(MB) Rn(MB) Rnp1(MB) Wnew(MB) Amplify Read(MB/s) Write(MB/s) Rn Rnp1 Wnp1 NewW Count Ln-stall Stall-cnt\n" "Level Files Size(MB) Score Time(sec) Read(MB) Write(MB) Rn(MB) Rnp1(MB) Wnew(MB) RW-Amplify Read(MB/s) Write(MB/s) Rn Rnp1 Wnp1 NewW Count Ln-stall Stall-cnt\n"
"--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n" "--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
); );
value->append(buf); value->append(buf);
@ -2786,7 +2788,9 @@ bool DBImpl::GetProperty(const Slice& property, std::string* value) {
stats_[level].bytes_readnp1; stats_[level].bytes_readnp1;
double amplify = (stats_[level].bytes_readn == 0) double amplify = (stats_[level].bytes_readn == 0)
? 0.0 ? 0.0
: (stats_[level].bytes_written + stats_[level].bytes_readnp1) / : (stats_[level].bytes_written +
stats_[level].bytes_readnp1 +
stats_[level].bytes_readn) /
(double) stats_[level].bytes_readn; (double) stats_[level].bytes_readn;
total_bytes_read += bytes_read; total_bytes_read += bytes_read;
@ -2794,7 +2798,7 @@ bool DBImpl::GetProperty(const Slice& property, std::string* value) {
snprintf( snprintf(
buf, sizeof(buf), buf, sizeof(buf),
"%3d %8d %8.0f %5.1f %9.0f %9.0f %9.0f %9.0f %9.0f %9.0f %7.1f %9.1f %11.1f %8d %8d %8d %8d %8d %9.1f %9lu\n", "%3d %8d %8.0f %5.1f %9.0f %9.0f %9.0f %9.0f %9.0f %9.0f %10.1f %9.1f %11.1f %8d %8d %8d %8d %8d %9.1f %9lu\n",
level, level,
files, files,
versions_->NumLevelBytes(level) / 1048576.0, versions_->NumLevelBytes(level) / 1048576.0,

Write Preview
Loading…
Cancel
Save