diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-03-19 16:36:56 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-03-19 16:36:56 +1100 |
| commit | ea510bc8e2b2d2966757989721f925617a7f1115 (patch) | |
| tree | 347d3ae35427495071de4a757482c457f64490a8 /src/config | |
| parent | b8f28ddc24c623ceb2fdee6708dce0c5042425ce (diff) | |
| download | mongo-ea510bc8e2b2d2966757989721f925617a7f1115.tar.gz | |
Use the configured collator when index cursor need to compare keys.
While in the area, add support for WT_CURSOR::compare and WT_CURSOR::equal to index cursors.
refs #1714
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/config_def.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/config/config_def.c b/src/config/config_def.c index fa876495195..26017f4bac1 100644 --- a/src/config/config_def.c +++ b/src/config/config_def.c @@ -4,6 +4,7 @@ static const WT_CONFIG_CHECK confchk_colgroup_meta[] = { { "app_metadata", "string", NULL, NULL }, + { "collator", "string", NULL, NULL }, { "columns", "list", NULL, NULL }, { "source", "string", NULL, NULL }, { "type", "string", NULL, NULL }, @@ -170,6 +171,7 @@ static const WT_CONFIG_CHECK confchk_file_meta[] = { static const WT_CONFIG_CHECK confchk_index_meta[] = { { "app_metadata", "string", NULL, NULL }, + { "collator", "string", NULL, NULL }, { "columns", "list", NULL, NULL }, { "extractor", "string", NULL, NULL }, { "immutable", "boolean", NULL, NULL }, @@ -314,6 +316,7 @@ static const WT_CONFIG_CHECK confchk_session_verify[] = { static const WT_CONFIG_CHECK confchk_table_meta[] = { { "app_metadata", "string", NULL, NULL }, { "colgroups", "list", NULL, NULL }, + { "collator", "string", NULL, NULL }, { "columns", "list", NULL, NULL }, { "key_format", "format", NULL, NULL }, { "value_format", "format", NULL, NULL }, @@ -543,7 +546,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = { static const WT_CONFIG_ENTRY config_entries[] = { { "colgroup.meta", - "app_metadata=,columns=,source=,type=file", + "app_metadata=,collator=,columns=,source=,type=file", confchk_colgroup_meta }, { "connection.add_collator", @@ -616,8 +619,8 @@ static const WT_CONFIG_ENTRY config_entries[] = { confchk_file_meta }, { "index.meta", - "app_metadata=,columns=,extractor=,immutable=0,index_key_columns=" - ",key_format=u,source=,type=file,value_format=u", + "app_metadata=,collator=,columns=,extractor=,immutable=0," + "index_key_columns=,key_format=u,source=,type=file,value_format=u", confchk_index_meta }, { "session.begin_transaction", @@ -704,7 +707,8 @@ static const WT_CONFIG_ENTRY config_entries[] = { confchk_session_verify }, { "table.meta", - "app_metadata=,colgroups=,columns=,key_format=u,value_format=u", + "app_metadata=,colgroups=,collator=,columns=,key_format=u," + "value_format=u", confchk_table_meta }, { "wiredtiger_open", |