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

Generalize parameters generation. (#4046)

Browse Source 
Summary:
Making generation of column families and keys virtual function so that
subclasses of StressTest can override them to provide custom parameter
generation for more flexibility. This will be useful for future tests.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4046

Differential Revision: D9073382

Pulled By: riversand963

fbshipit-source-id: 2754f0fdfa5c24d95c1f92d4944bc479552fb665
This commit is contained in:
Yanqin Jin 2018-07-30 17:35:29 -07:00 committed by Facebook Github Bot
parent 54de56844d
commit 8abafb1feb
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/db_stress.cc
View File

@ -1926,9 +1926,13 @@ class StressTest {
} }
} }
std::vector<int> rand_column_families =
GenerateColumnFamilies(FLAGS_column_families, rand_column_family);
std::vector<int64_t> rand_keys = GenerateKeys(rand_key);
if (FLAGS_ingest_external_file_one_in > 0 && if (FLAGS_ingest_external_file_one_in > 0 &&
thread->rand.Uniform(FLAGS_ingest_external_file_one_in) == 0) { thread->rand.Uniform(FLAGS_ingest_external_file_one_in) == 0) {
TestIngestExternalFile(thread, {rand_column_family}, {rand_key}, lock); TestIngestExternalFile(thread, rand_column_families, rand_keys, lock);
} }
if (FLAGS_acquire_snapshot_one_in > 0 && if (FLAGS_acquire_snapshot_one_in > 0 &&
@ -1967,28 +1971,28 @@ class StressTest {
int prob_op = thread->rand.Uniform(100); int prob_op = thread->rand.Uniform(100);
if (prob_op >= 0 && prob_op < (int)FLAGS_readpercent) { if (prob_op >= 0 && prob_op < (int)FLAGS_readpercent) {
// OPERATION read // OPERATION read
TestGet(thread, read_opts, {rand_column_family}, {rand_key}); TestGet(thread, read_opts, rand_column_families, rand_keys);
} else if ((int)FLAGS_readpercent <= prob_op && prob_op < prefixBound) { } else if ((int)FLAGS_readpercent <= prob_op && prob_op < prefixBound) {
// OPERATION prefix scan // OPERATION prefix scan
// keys are 8 bytes long, prefix size is FLAGS_prefix_size. There are // keys are 8 bytes long, prefix size is FLAGS_prefix_size. There are
// (8 - FLAGS_prefix_size) bytes besides the prefix. So there will // (8 - FLAGS_prefix_size) bytes besides the prefix. So there will
// be 2 ^ ((8 - FLAGS_prefix_size) * 8) possible keys with the same // be 2 ^ ((8 - FLAGS_prefix_size) * 8) possible keys with the same
// prefix // prefix
TestPrefixScan(thread, read_opts, {rand_column_family}, {rand_key}); TestPrefixScan(thread, read_opts, rand_column_families, rand_keys);
} else if (prefixBound <= prob_op && prob_op < writeBound) { } else if (prefixBound <= prob_op && prob_op < writeBound) {
// OPERATION write // OPERATION write
TestPut(thread, write_opts, read_opts, {rand_column_family}, {rand_key}, TestPut(thread, write_opts, read_opts, rand_column_families, rand_keys,
value, lock); value, lock);
} else if (writeBound <= prob_op && prob_op < delBound) { } else if (writeBound <= prob_op && prob_op < delBound) {
// OPERATION delete // OPERATION delete
TestDelete(thread, write_opts, {rand_column_family}, {rand_key}, lock); TestDelete(thread, write_opts, rand_column_families, rand_keys, lock);
} else if (delBound <= prob_op && prob_op < delRangeBound) { } else if (delBound <= prob_op && prob_op < delRangeBound) {
// OPERATION delete range // OPERATION delete range
TestDeleteRange(thread, write_opts, {rand_column_family}, {rand_key}, TestDeleteRange(thread, write_opts, rand_column_families, rand_keys,
lock); lock);
} else { } else {
// OPERATION iterate // OPERATION iterate
TestIterate(thread, read_opts, {rand_column_family}, {rand_key}); TestIterate(thread, read_opts, rand_column_families, rand_keys);
} }
thread->stats.FinishedSingleOp(); thread->stats.FinishedSingleOp();
} }
@ -2002,6 +2006,16 @@ class StressTest {
virtual bool ShouldAcquireMutexOnKey() const { return false; } virtual bool ShouldAcquireMutexOnKey() const { return false; }
virtual std::vector<int> GenerateColumnFamilies(
const int /* num_column_families */,
int rand_column_family) const {
return {rand_column_family};
}
virtual std::vector<int64_t> GenerateKeys(int64_t rand_key) const {
return {rand_key};
}
virtual Status TestGet(ThreadState* thread, virtual Status TestGet(ThreadState* thread,
const ReadOptions& read_opts, const ReadOptions& read_opts,
const std::vector<int>& rand_column_families, const std::vector<int>& rand_column_families,