summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2013-12-09 19:02:06 +1100
committerAlex Gorrod <alexg@wiredtiger.com>2013-12-09 19:02:06 +1100
commitcd69b49520e9f8bf9efdee68648415cc4a725bf5 (patch)
tree4ecb620f4dab6eb0be90050e62c35d3866f5644f
parent689f1b5eb5d74b89a2a7733cd668c83c62abeabd (diff)
downloadmongo-cd69b49520e9f8bf9efdee68648415cc4a725bf5.tar.gz
Update test/format to include LSM configuration options.
-rw-r--r--test/format/config.h8
-rw-r--r--test/format/wts.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/test/format/config.h b/test/format/config.h
index b5c41905a6f..21c0ac58810 100644
--- a/test/format/config.h
+++ b/test/format/config.h
@@ -93,11 +93,11 @@ static CONFIG c[] = {
{ "bloom_bit_count",
"number of bits per item for LSM bloom filters",
- 0x0, 0x0, 4, 32, 1000, &g.c_bloom_bit_count, NULL },
+ 0x0, 0x0, 4, 64, 1000, &g.c_bloom_bit_count, NULL },
{ "bloom_hash_count",
"number of hash values per item for LSM bloom filters",
- 0x0, 0x0, 4, 16, 100, &g.c_bloom_hash_count, NULL },
+ 0x0, 0x0, 4, 32, 100, &g.c_bloom_hash_count, NULL },
{ "bloom_oldest",
"if bloom_oldest=true", /* 10% */
@@ -181,11 +181,11 @@ static CONFIG c[] = {
{ "merge_max",
"the maximum number of chunks to include in a merge operation",
- 0x0, 0x0, 2, 100, 100, &g.c_merge_max, NULL },
+ 0x0, 0x0, 4, 20, 100, &g.c_merge_max, NULL },
{ "merge_threads",
"the number of threads to perform merge operations",
- 0x0, 0x0, 1, 10, 10, &g.c_merge_threads, NULL },
+ 0x0, 0x0, 1, 4, 10, &g.c_merge_threads, NULL },
{ "ops",
"the number of modification operations done per run",
diff --git a/test/format/wts.c b/test/format/wts.c
index 401e005382f..7259a99a63a 100644
--- a/test/format/wts.c
+++ b/test/format/wts.c
@@ -274,7 +274,6 @@ wts_create(void)
if (DATASOURCE("lsm")) {
p += snprintf(p, (size_t)(end - p), ",type=lsm,lsm=(");
-#if 0
p += snprintf(p, (size_t)(end - p),
"auto_throttle=%s,", g.c_auto_throttle ? "true" : "false");
p += snprintf(p, (size_t)(end - p),
@@ -289,7 +288,6 @@ wts_create(void)
"merge_max=%u,", g.c_merge_max);
p += snprintf(p, (size_t)(end - p),
"merge_threads=%u,", g.c_merge_threads);
-#endif
p += snprintf(p, (size_t)(end - p), ",)");
}