diff options
author | Keith Bostic <keith@wiredtiger.com> | 2016-03-08 16:27:24 -0500 |
---|---|---|
committer | Keith Bostic <keith@wiredtiger.com> | 2016-03-08 16:27:24 -0500 |
commit | 77ac1479ad83a79c6ecb1fa049e78b5bf8eccf2d (patch) | |
tree | b9188765d12ede375815ac78813b45067ce78b09 /src/schema | |
parent | b3a40e79a018e0b7a5330a4e0db575c5f7c9b5f1 (diff) | |
download | mongo-77ac1479ad83a79c6ecb1fa049e78b5bf8eccf2d.tar.gz |
WT-2381: dump utility discards table config
Rework the dump utility and the dump library support. Previously, the
metadata cursor returned a full set of WT_SESSION.create configuration
values, basically, the requested configuration values plus the default
values, where the requested configuration values overrode the default
configuration values. This doesn't work because dump takes a few
configuration strings and collapses them into a single string, and the
default configuration values start overriding real configurtion values.
Change the metadata cursor to return only the requested configuration
values instead, and change dump to add in the default values when it's
collapsing the strings into a single string.
Add a function __wt_schema_create_final; it takes a set of configuration
strings, adds in the default WT_SESSION.create configuration values, and
collapses them into a single string.
Add a function __wt_config_strip_and_collapse; it behaves similarly to
__wt_config_collapse, except it doesn't add in the default strings.
Fix bugs where we weren't copying returned metadata strings into local
memory.
Fix bugs where we weren't correctly parsing the URIs in the metadata
file.
Diffstat (limited to 'src/schema')
-rw-r--r-- | src/schema/schema_create.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/schema/schema_create.c b/src/schema/schema_create.c index 9b3b76b62de..756f1fdcc6c 100644 --- a/src/schema/schema_create.c +++ b/src/schema/schema_create.c @@ -9,22 +9,6 @@ #include "wt_internal.h" /* - * __wt_schema_create_strip -- - * Discard any configuration information from a schema entry that is not - * applicable to an session.create call, here for the wt dump command utility, - * which only wants to dump the schema information needed for load. - */ -int -__wt_schema_create_strip(WT_SESSION_IMPL *session, - const char *v1, const char *v2, char **value_ret) -{ - const char *cfg[] = - { WT_CONFIG_BASE(session, WT_SESSION_create), v1, v2, NULL }; - - return (__wt_config_collapse(session, cfg, value_ret)); -} - -/* * __wt_direct_io_size_check -- * Return a size from the configuration, complaining if it's insufficient * for direct I/O. |