summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2014-03-10 11:06:33 -0400
committerKeith Bostic <keith@wiredtiger.com>2014-03-10 11:06:33 -0400
commitf8be7a26eff67f8f86b55ac677c18ab57628cc9c (patch)
treebcd4d064758705aa7c99635e980d4b5e7939805f /src/config
parentc6d43abfc89a5c9f4ccc994bd6a5f3d6686edf21 (diff)
downloadmongo-f8be7a26eff67f8f86b55ac677c18ab57628cc9c.tar.gz
Restore the internal-key truncation code, it wasn't the problem.
Diffstat (limited to 'src/config')
-rw-r--r--src/config/config_def.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/config/config_def.c b/src/config/config_def.c
index 7ff98ea84a8..3d60cd65838 100644
--- a/src/config/config_def.c
+++ b/src/config/config_def.c
@@ -73,6 +73,7 @@ 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_truncate", "boolean", NULL, NULL},
{ "internal_page_max", "int", "min=512B,max=512MB", NULL},
{ "key_format", "format", NULL, NULL},
{ "key_gap", "int", "min=0", NULL},
@@ -155,6 +156,7 @@ static const WT_CONFIG_CHECK confchk_session_create[] = {
{ "huffman_key", "string", NULL, NULL},
{ "huffman_value", "string", NULL, NULL},
{ "internal_item_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},
@@ -337,11 +339,11 @@ static const WT_CONFIG_ENTRY config_entries[] = {
"cache_resident=0,checkpoint=,checkpoint_lsn=,"
"checksum=uncompressed,collator=,columns=,dictionary=0,"
"format=btree,huffman_key=,huffman_value=,id=,internal_item_max=0"
- ",internal_page_max=4KB,key_format=u,key_gap=10,leaf_item_max=0,"
- "leaf_page_max=1MB,memory_page_max=5MB,os_cache_dirty_max=0,"
- "os_cache_max=0,prefix_compression=,prefix_compression_min=4,"
- "split_deepen=250,split_pct=75,value_format=u,version=(major=0,"
- "minor=0)",
+ ",internal_key_truncate=,internal_page_max=4KB,key_format=u,"
+ "key_gap=10,leaf_item_max=0,leaf_page_max=1MB,memory_page_max=5MB"
+ ",os_cache_dirty_max=0,os_cache_max=0,prefix_compression=,"
+ "prefix_compression_min=4,split_deepen=250,split_pct=75,"
+ "value_format=u,version=(major=0,minor=0)",
confchk_file_meta
},
{ "index.meta",
@@ -372,14 +374,14 @@ static const WT_CONFIG_ENTRY config_entries[] = {
"allocation_size=4KB,block_allocation=best,block_compressor=,"
"cache_resident=0,checksum=uncompressed,colgroups=,collator=,"
"columns=,dictionary=0,exclusive=0,format=btree,huffman_key=,"
- "huffman_value=,internal_item_max=0,internal_page_max=4KB,"
- "key_format=u,key_gap=10,leaf_item_max=0,leaf_page_max=1MB,"
- "lsm=(auto_throttle=,bloom=,bloom_bit_count=16,bloom_config=,"
- "bloom_hash_count=8,bloom_oldest=0,chunk_max=5GB,chunk_size=10MB,"
- "merge_max=15,merge_min=0,merge_threads=2),memory_page_max=5MB,"
- "os_cache_dirty_max=0,os_cache_max=0,prefix_compression=,"
- "prefix_compression_min=4,source=,split_deepen=250,split_pct=75,"
- "type=file,value_format=u",
+ "huffman_value=,internal_item_max=0,internal_key_truncate=,"
+ "internal_page_max=4KB,key_format=u,key_gap=10,leaf_item_max=0,"
+ "leaf_page_max=1MB,lsm=(auto_throttle=,bloom=,bloom_bit_count=16,"
+ "bloom_config=,bloom_hash_count=8,bloom_oldest=0,chunk_max=5GB,"
+ "chunk_size=10MB,merge_max=15,merge_min=0,merge_threads=2),"
+ "memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,"
+ "prefix_compression=,prefix_compression_min=4,source=,"
+ "split_deepen=250,split_pct=75,type=file,value_format=u",
confchk_session_create
},
{ "session.drop",