Revert "DB stress with normal skip list"

This reverts commit 86926d8c6a.
This commit is contained in:
Igor Canadi 2014-03-12 22:21:13 -07:00
parent 02a2cb139b
commit 04a1035efe
3 changed files with 15 additions and 9 deletions

View File

@ -72,8 +72,8 @@ def main(argv):
--destroy_db_initially=0 --destroy_db_initially=0
--reopen=20 --reopen=20
--readpercent=45 --readpercent=45
--prefixpercent=0 --prefixpercent=5
--writepercent=40 --writepercent=35
--delpercent=5 --delpercent=5
--iterpercent=10 --iterpercent=10
--db=%s --db=%s
@ -93,8 +93,8 @@ def main(argv):
--max_background_compactions=20 --max_background_compactions=20
--max_bytes_for_level_base=10485760 --max_bytes_for_level_base=10485760
--filter_deletes=%s --filter_deletes=%s
--memtablerep=skip_list --memtablerep=prefix_hash
--prefix_size=0 --prefix_size=7
""" % (ops_per_thread, """ % (ops_per_thread,
threads, threads,
write_buf_size, write_buf_size,

View File

@ -86,8 +86,8 @@ def main(argv):
--destroy_db_initially=0 --destroy_db_initially=0
--reopen=20 --reopen=20
--readpercent=45 --readpercent=45
--prefixpercent=0 --prefixpercent=5
--writepercent=40 --writepercent=35
--delpercent=5 --delpercent=5
--iterpercent=10 --iterpercent=10
--db=%s --db=%s
@ -107,8 +107,8 @@ def main(argv):
--max_background_compactions=20 --max_background_compactions=20
--max_bytes_for_level_base=10485760 --max_bytes_for_level_base=10485760
--filter_deletes=%s --filter_deletes=%s
--memtablerep=skip_list --memtablerep=prefix_hash
--prefix_size=0 --prefix_size=7
%s %s
""" % (random.randint(0, 1), """ % (random.randint(0, 1),
threads, threads,

View File

@ -328,7 +328,7 @@ enum RepFactory StringToRepFactory(const char* ctype) {
return kSkipList; return kSkipList;
} }
static enum RepFactory FLAGS_rep_factory; static enum RepFactory FLAGS_rep_factory;
DEFINE_string(memtablerep, "skip_list", ""); DEFINE_string(memtablerep, "prefix_hash", "");
static bool ValidatePrefixSize(const char* flagname, int32_t value) { static bool ValidatePrefixSize(const char* flagname, int32_t value) {
if (value < 0 || value > 8) { if (value < 0 || value > 8) {
@ -1525,6 +1525,12 @@ int main(int argc, char** argv) {
"not positive!\n"); "not positive!\n");
exit(1); exit(1);
} }
if (FLAGS_test_batches_snapshots && FLAGS_prefix_size <= 0) {
fprintf(stderr,
"Error: please specify prefix_size for "
"test_batches_snapshots test!\n");
exit(1);
}
if ((FLAGS_readpercent + FLAGS_prefixpercent + if ((FLAGS_readpercent + FLAGS_prefixpercent +
FLAGS_writepercent + FLAGS_delpercent + FLAGS_iterpercent) != 100) { FLAGS_writepercent + FLAGS_delpercent + FLAGS_iterpercent) != 100) {
fprintf(stderr, fprintf(stderr,