diff options
author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-12-10 10:53:27 +1100 |
---|---|---|
committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-12-10 10:53:27 +1100 |
commit | 402041727de02931be1dd385f3c970f31a53341c (patch) | |
tree | 072ad4ba670c3e67a9106fb5d749db4fbe51507d | |
parent | cbc99c8a30590de409648ab630d03d42e8762b35 (diff) | |
download | mongo-402041727de02931be1dd385f3c970f31a53341c.tar.gz |
Remove the min / max bounds on overflow sizes.
-rw-r--r-- | dist/api_data.py | 12 | ||||
-rw-r--r-- | src/config/config_def.c | 12 | ||||
-rw-r--r-- | src/include/wiredtiger.in | 8 |
3 files changed, 17 insertions, 15 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index fb9a2ecb4d0..5e9e22bfda4 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -207,14 +207,15 @@ file_config = format_meta + [ block compression is done''', min='512B', max='512MB'), Config('internal_item_max', '0', r''' - historic term for internal_key_max''', min=0,undoc=True), + historic term for internal_key_max''', + min=0, undoc=True), Config('internal_key_max', '0', r''' the largest key stored in an internal node, in bytes. If set, keys larger than the specified size are stored as overflow items (which may require additional I/O to access). The default and the maximum allowed value are both one-tenth the size of a newly split internal page''', - min='40B'), + min='0'), Config('key_gap', '10', r''' the maximum gap between instantiated keys in a Btree leaf page, constraining the number of keys processed to instantiate a @@ -225,7 +226,7 @@ file_config = format_meta + [ larger than the specified size are stored as overflow items (which may require additional I/O to access). The default value is one-tenth the size of a newly split leaf page''', - min='40B'), + min='0'), Config('leaf_page_max', '32KB', r''' the maximum page size for leaf nodes, in bytes; the size must be a multiple of the allocation size, and is significant for @@ -241,9 +242,10 @@ file_config = format_meta + [ the maximum leaf page size, the page size is temporarily ignored when large values are written. The default is one-half the size of a newly split leaf page''', - min='40B',max='100KB'), + min='0'), Config('leaf_item_max', '0', r''' - historic term for leaf_key_max and leaf_value_max''', min=0,undoc=True), + historic term for leaf_key_max and leaf_value_max''', + min=0, undoc=True), Config('memory_page_max', '5MB', r''' the maximum size a page can grow to in memory before being reconciled to disk. The specified size will be adjusted to a lower diff --git a/src/config/config_def.c b/src/config/config_def.c index f3e52e25e8e..cf07fafef23 100644 --- a/src/config/config_def.c +++ b/src/config/config_def.c @@ -131,15 +131,15 @@ static const WT_CONFIG_CHECK confchk_file_meta[] = { { "huffman_value", "string", NULL, NULL }, { "id", "string", NULL, NULL }, { "internal_item_max", "int", "min=0", NULL }, - { "internal_key_max", "int", "min=40B", NULL }, + { "internal_key_max", "int", "min=0", NULL }, { "internal_key_truncate", "boolean", NULL, NULL }, { "internal_page_max", "int", "min=512B,max=512MB", NULL }, { "key_format", "format", NULL, NULL }, { "key_gap", "int", "min=0", NULL }, { "leaf_item_max", "int", "min=0", NULL }, - { "leaf_key_max", "int", "min=40B", NULL }, + { "leaf_key_max", "int", "min=0", NULL }, { "leaf_page_max", "int", "min=512B,max=512MB", NULL }, - { "leaf_value_max", "int", "min=40B,max=100KB", NULL }, + { "leaf_value_max", "int", "min=0", NULL }, { "memory_page_max", "int", "min=512B,max=10TB", NULL }, { "os_cache_dirty_max", "int", "min=0", NULL }, { "os_cache_max", "int", "min=0", NULL }, @@ -223,15 +223,15 @@ static const WT_CONFIG_CHECK confchk_session_create[] = { { "huffman_value", "string", NULL, NULL }, { "immutable", "boolean", NULL, NULL }, { "internal_item_max", "int", "min=0", NULL }, - { "internal_key_max", "int", "min=40B", NULL }, + { "internal_key_max", "int", "min=0", NULL }, { "internal_key_truncate", "boolean", NULL, NULL }, { "internal_page_max", "int", "min=512B,max=512MB", NULL }, { "key_format", "format", NULL, NULL }, { "key_gap", "int", "min=0", NULL }, { "leaf_item_max", "int", "min=0", NULL }, - { "leaf_key_max", "int", "min=40B", NULL }, + { "leaf_key_max", "int", "min=0", NULL }, { "leaf_page_max", "int", "min=512B,max=512MB", NULL }, - { "leaf_value_max", "int", "min=40B,max=100KB", NULL }, + { "leaf_value_max", "int", "min=0", NULL }, { "lsm", "category", NULL, confchk_lsm_subconfigs }, { "memory_page_max", "int", "min=512B,max=10TB", NULL }, { "os_cache_dirty_max", "int", "min=0", NULL }, diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index 0b6810d0855..2638b931c0e 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -989,7 +989,7 @@ struct __wt_session { * stored as overflow items (which may require additional I/O to * access). The default and the maximum allowed value are both one-tenth * the size of a newly split internal page., an integer greater than or - * equal to 40B; default \c 0.} + * equal to 0; default \c 0.} * @config{internal_key_truncate, configure internal key truncation\, * discarding unnecessary trailing bytes on internal keys (ignored for * custom collators)., a boolean flag; default \c true.} @@ -1011,7 +1011,7 @@ struct __wt_session { * bytes. If set\, keys larger than the specified size are stored as * overflow items (which may require additional I/O to access). The * default value is one-tenth the size of a newly split leaf page., an - * integer greater than or equal to 40B; default \c 0.} + * integer greater than or equal to 0; default \c 0.} * @config{leaf_page_max, the maximum page size for leaf nodes\, in * bytes; the size must be a multiple of the allocation size\, and is * significant for applications wanting to maximize sequential data @@ -1024,8 +1024,8 @@ struct __wt_session { * overflow items (which may require additional I/O to access). If the * size is larger than the maximum leaf page size\, the page size is * temporarily ignored when large values are written. The default is - * one-half the size of a newly split leaf page., an integer between 40B - * and 100KB; default \c 0.} + * one-half the size of a newly split leaf page., an integer greater + * than or equal to 0; default \c 0.} * @config{lsm = (, options only relevant for LSM data sources., a set * of related configuration options defined below.} * @config{ auto_throttle, Throttle inserts into |