summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/config
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2020-09-29 13:29:39 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-29 03:44:36 +0000
commita6bd068bc2943898b64943c70ae5760c35ba65e0 (patch)
tree231eb4cbdd306fe888e747663e67691a2618d2a4 /src/third_party/wiredtiger/src/config
parentf31ce895f1475e1184bafbf74f3c2032b9f1801f (diff)
downloadmongo-a6bd068bc2943898b64943c70ae5760c35ba65e0.tar.gz
Import wiredtiger: bb1cc65a63a4fb081cb5969f0728ff2b74fc7c8b from branch mongodb-4.4
ref: 8a1dce8653..bb1cc65a63 for: 4.4.2 WT-5645 Add Evergreen test that cycles through known failure test/format configs WT-6181 Have Python Evergreen tests print standard output on failure WT-6490 Acquire snapshot for eviction threads WT-6654 Clean up test_backup15.py WT-6657 Fix history store panic when inserting an update without timestamp WT-6670 Fix uninitialized buffer WT-6674 Remove Async API code and documentation WT-6683 Fix logically dead code WT-6685 Add import configuration option to WT_SESSION::create WT-6689 Add support for file import when the exported configuration is provided WT-6721 Add a new Evergreen task to run cyclomatic complexity WT-6734 Add missing brace to Swig Java interface
Diffstat (limited to 'src/third_party/wiredtiger/src/config')
-rw-r--r--src/third_party/wiredtiger/src/config/config_def.c59
1 files changed, 22 insertions, 37 deletions
diff --git a/src/third_party/wiredtiger/src/config/config_def.c b/src/third_party/wiredtiger/src/config/config_def.c
index 6c7931360fb..e72009b98da 100644
--- a/src/third_party/wiredtiger/src/config/config_def.c
+++ b/src/third_party/wiredtiger/src/config/config_def.c
@@ -2,11 +2,6 @@
#include "wt_internal.h"
-static const WT_CONFIG_CHECK confchk_WT_CONNECTION_async_new_op[] = {
- {"append", "boolean", NULL, NULL, NULL, 0}, {"overwrite", "boolean", NULL, NULL, NULL, 0},
- {"raw", "boolean", NULL, NULL, NULL, 0}, {"timeout", "int", NULL, NULL, NULL, 0},
- {NULL, NULL, NULL, NULL, NULL, 0}};
-
static const WT_CONFIG_CHECK confchk_WT_CONNECTION_close[] = {
{"leak_memory", "boolean", NULL, NULL, NULL, 0},
{"use_timestamp", "boolean", NULL, NULL, NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}};
@@ -38,10 +33,6 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_query_timestamp[] = {
NULL, 0},
{NULL, NULL, NULL, NULL, NULL, 0}};
-static const WT_CONFIG_CHECK confchk_wiredtiger_open_async_subconfigs[] = {
- {"enabled", "boolean", NULL, NULL, NULL, 0}, {"ops_max", "int", NULL, "min=1,max=4096", NULL, 0},
- {"threads", "int", NULL, "min=1,max=20", NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}};
-
static const WT_CONFIG_CHECK confchk_wiredtiger_open_checkpoint_subconfigs[] = {
{"log_size", "int", NULL, "min=0,max=2GB", NULL, 0},
{"wait", "int", NULL, "min=0,max=100000", NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}};
@@ -99,7 +90,6 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure_statistics_log_su
{"wait", "int", NULL, "min=0,max=100000", NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}};
static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure[] = {
- {"async", "category", NULL, NULL, confchk_wiredtiger_open_async_subconfigs, 3},
{"cache_max_wait_ms", "int", NULL, "min=0", NULL, 0},
{"cache_overhead", "int", NULL, "min=0,max=30", NULL, 0},
{"cache_size", "int", NULL, "min=1MB,max=10TB", NULL, 0},
@@ -223,6 +213,10 @@ static const WT_CONFIG_CHECK confchk_WT_SESSION_create_encryption_subconfigs[] =
{"keyid", "string", NULL, NULL, NULL, 0}, {"name", "string", NULL, NULL, NULL, 0},
{NULL, NULL, NULL, NULL, NULL, 0}};
+static const WT_CONFIG_CHECK confchk_WT_SESSION_create_import_subconfigs[] = {
+ {"enabled", "boolean", NULL, NULL, NULL, 0}, {"file_metadata", "string", NULL, NULL, NULL, 0},
+ {"repair", "boolean", NULL, NULL, NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}};
+
static const WT_CONFIG_CHECK confchk_WT_SESSION_create_merge_custom_subconfigs[] = {
{"prefix", "string", NULL, NULL, NULL, 0},
{"start_generation", "int", NULL, "min=0,max=10", NULL, 0},
@@ -258,6 +252,7 @@ static const WT_CONFIG_CHECK confchk_WT_SESSION_create[] = {
{"huffman_key", "string", NULL, NULL, NULL, 0}, {"huffman_value", "string", NULL, NULL, NULL, 0},
{"ignore_in_memory_cache_size", "boolean", NULL, NULL, NULL, 0},
{"immutable", "boolean", NULL, NULL, NULL, 0},
+ {"import", "category", NULL, NULL, confchk_WT_SESSION_create_import_subconfigs, 3},
{"internal_item_max", "int", NULL, "min=0", NULL, 0},
{"internal_key_max", "int", NULL, "min=0", NULL, 0},
{"internal_key_truncate", "boolean", NULL, NULL, NULL, 0},
@@ -535,7 +530,6 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_transaction_sync_subconfigs
{NULL, NULL, NULL, NULL, NULL, 0}};
static const WT_CONFIG_CHECK confchk_wiredtiger_open[] = {
- {"async", "category", NULL, NULL, confchk_wiredtiger_open_async_subconfigs, 3},
{"buffer_alignment", "int", NULL, "min=-1,max=1MB", NULL, 0},
{"builtin_extension_config", "string", NULL, NULL, NULL, 0},
{"cache_cursors", "boolean", NULL, NULL, NULL, 0},
@@ -612,7 +606,6 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open[] = {
{NULL, NULL, NULL, NULL, NULL, 0}};
static const WT_CONFIG_CHECK confchk_wiredtiger_open_all[] = {
- {"async", "category", NULL, NULL, confchk_wiredtiger_open_async_subconfigs, 3},
{"buffer_alignment", "int", NULL, "min=-1,max=1MB", NULL, 0},
{"builtin_extension_config", "string", NULL, NULL, NULL, 0},
{"cache_cursors", "boolean", NULL, NULL, NULL, 0},
@@ -689,7 +682,6 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_all[] = {
{NULL, NULL, NULL, NULL, NULL, 0}};
static const WT_CONFIG_CHECK confchk_wiredtiger_open_basecfg[] = {
- {"async", "category", NULL, NULL, confchk_wiredtiger_open_async_subconfigs, 3},
{"buffer_alignment", "int", NULL, "min=-1,max=1MB", NULL, 0},
{"builtin_extension_config", "string", NULL, NULL, NULL, 0},
{"cache_cursors", "boolean", NULL, NULL, NULL, 0},
@@ -761,7 +753,6 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_basecfg[] = {
{NULL, NULL, NULL, NULL, NULL, 0}};
static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = {
- {"async", "category", NULL, NULL, confchk_wiredtiger_open_async_subconfigs, 3},
{"buffer_alignment", "int", NULL, "min=-1,max=1MB", NULL, 0},
{"builtin_extension_config", "string", NULL, NULL, NULL, 0},
{"cache_cursors", "boolean", NULL, NULL, NULL, 0},
@@ -835,8 +826,6 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = {
static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "", NULL, 0},
{"WT_CONNECTION.add_compressor", "", NULL, 0}, {"WT_CONNECTION.add_data_source", "", NULL, 0},
{"WT_CONNECTION.add_encryptor", "", NULL, 0}, {"WT_CONNECTION.add_extractor", "", NULL, 0},
- {"WT_CONNECTION.async_new_op", "append=false,overwrite=true,raw=false,timeout=1200",
- confchk_WT_CONNECTION_async_new_op, 4},
{"WT_CONNECTION.close", "leak_memory=false,use_timestamp=true", confchk_WT_CONNECTION_close, 2},
{"WT_CONNECTION.debug_info",
"cache=false,cursors=false,handles=false,log=false,sessions=false"
@@ -852,9 +841,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
confchk_WT_CONNECTION_open_session, 3},
{"WT_CONNECTION.query_timestamp", "get=all_durable", confchk_WT_CONNECTION_query_timestamp, 1},
{"WT_CONNECTION.reconfigure",
- "async=(enabled=false,ops_max=1024,threads=2),cache_max_wait_ms=0"
- ",cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,"
- "wait=0),compatibility=(release=),"
+ "cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
+ "checkpoint=(log_size=0,wait=0),compatibility=(release=),"
"debug_mode=(checkpoint_retention=0,cursor_copy=false,"
"eviction=false,log_retention=0,realloc_exact=false,"
"rollback_error=0,slow_checkpoint=false,table_logging=false),"
@@ -872,7 +860,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
"statistics=none,statistics_log=(json=false,on_close=false,"
"sources=,timestamp=\"%b %d %H:%M:%S\",wait=0),"
"timing_stress_for_test=,verbose=",
- confchk_WT_CONNECTION_reconfigure, 28},
+ confchk_WT_CONNECTION_reconfigure, 27},
{"WT_CONNECTION.rollback_to_stable", "", NULL, 0}, {"WT_CONNECTION.set_file_system", "", NULL, 0},
{"WT_CONNECTION.set_timestamp",
"commit_timestamp=,durable_timestamp=,force=false,"
@@ -908,6 +896,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
"columns=,dictionary=0,encryption=(keyid=,name=),exclusive=false,"
"extractor=,format=btree,huffman_key=,huffman_value=,"
"ignore_in_memory_cache_size=false,immutable=false,"
+ "import=(enabled=false,file_metadata=,repair=false),"
"internal_item_max=0,internal_key_max=0,"
"internal_key_truncate=true,internal_page_max=4KB,key_format=u,"
"key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,"
@@ -920,7 +909,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
"prefix_compression=false,prefix_compression_min=4,source=,"
"split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,"
"type=file,value_format=u",
- confchk_WT_SESSION_create, 44},
+ confchk_WT_SESSION_create, 45},
{"WT_SESSION.drop",
"checkpoint_wait=true,force=false,lock_wait=true,"
"remove_files=true",
@@ -1029,9 +1018,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
"value_format=u",
confchk_table_meta, 6},
{"wiredtiger_open",
- "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
- ",builtin_extension_config=,cache_cursors=true,"
- "cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
+ "buffer_alignment=-1,builtin_extension_config=,cache_cursors=true"
+ ",cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
"checkpoint=(log_size=0,wait=0),checkpoint_sync=true,"
"compatibility=(release=,require_max=,require_min=),"
"config_base=true,create=false,debug_mode=(checkpoint_retention=0"
@@ -1059,11 +1047,10 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
",wait=0),timing_stress_for_test=,transaction_sync=(enabled=false"
",method=fsync),use_environment=true,use_environment_priv=false,"
"verbose=,verify_metadata=false,write_through=",
- confchk_wiredtiger_open, 56},
+ confchk_wiredtiger_open, 55},
{"wiredtiger_open_all",
- "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
- ",builtin_extension_config=,cache_cursors=true,"
- "cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
+ "buffer_alignment=-1,builtin_extension_config=,cache_cursors=true"
+ ",cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
"checkpoint=(log_size=0,wait=0),checkpoint_sync=true,"
"compatibility=(release=,require_max=,require_min=),"
"config_base=true,create=false,debug_mode=(checkpoint_retention=0"
@@ -1092,11 +1079,10 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
",method=fsync),use_environment=true,use_environment_priv=false,"
"verbose=,verify_metadata=false,version=(major=0,minor=0),"
"write_through=",
- confchk_wiredtiger_open_all, 57},
+ confchk_wiredtiger_open_all, 56},
{"wiredtiger_open_basecfg",
- "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
- ",builtin_extension_config=,cache_cursors=true,"
- "cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
+ "buffer_alignment=-1,builtin_extension_config=,cache_cursors=true"
+ ",cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
"checkpoint=(log_size=0,wait=0),checkpoint_sync=true,"
"compatibility=(release=,require_max=,require_min=),"
"debug_mode=(checkpoint_retention=0,cursor_copy=false,"
@@ -1124,11 +1110,10 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
"timing_stress_for_test=,transaction_sync=(enabled=false,"
"method=fsync),verbose=,verify_metadata=false,version=(major=0,"
"minor=0),write_through=",
- confchk_wiredtiger_open_basecfg, 51},
+ confchk_wiredtiger_open_basecfg, 50},
{"wiredtiger_open_usercfg",
- "async=(enabled=false,ops_max=1024,threads=2),buffer_alignment=-1"
- ",builtin_extension_config=,cache_cursors=true,"
- "cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
+ "buffer_alignment=-1,builtin_extension_config=,cache_cursors=true"
+ ",cache_max_wait_ms=0,cache_overhead=8,cache_size=100MB,"
"checkpoint=(log_size=0,wait=0),checkpoint_sync=true,"
"compatibility=(release=,require_max=,require_min=),"
"debug_mode=(checkpoint_retention=0,cursor_copy=false,"
@@ -1155,7 +1140,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator",
"path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\",wait=0),"
"timing_stress_for_test=,transaction_sync=(enabled=false,"
"method=fsync),verbose=,verify_metadata=false,write_through=",
- confchk_wiredtiger_open_usercfg, 50},
+ confchk_wiredtiger_open_usercfg, 49},
{NULL, NULL, NULL, 0}};
int