diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/include/wiredtiger.in')
-rw-r--r-- | src/third_party/wiredtiger/src/include/wiredtiger.in | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in index b9d33094ad6..f3223141e77 100644 --- a/src/third_party/wiredtiger/src/include/wiredtiger.in +++ b/src/third_party/wiredtiger/src/include/wiredtiger.in @@ -1170,12 +1170,14 @@ struct __wt_session { * @config{import = (, configure import of an existing object into the currently running * database., a set of related configuration options defined below.} * @config{ compare_timestamp, Allow importing files with timestamps - * smaller or equal to the configured global timestamps. Note that the history of the files - * are not imported together and thus snapshot read of historical data will not work with - * the option "stable"., a string\, chosen from the following options: \c "oldest"\, \c - * "stable"; default \c oldest.} - * @config{ enabled, whether to import - * the input URI from disk., a boolean flag; default \c false.} + * smaller or equal to the configured global timestamps. Note the history of the files are + * not imported together and thus snapshot read of historical data will not work with the + * option "stable_timestamp". (The \c oldest and \c stable arguments are deprecated + * short-hand for \c oldest_timestamp and \c stable_timestamp\, respectively.)., a string\, + * chosen from the following options: \c "oldest"\, \c "oldest_timestamp"\, \c "stable"\, \c + * "stable_timestamp"; default \c oldest_timestamp.} + * @config{ + * enabled, whether to import the input URI from disk., a boolean flag; default \c false.} * @config{ file_metadata, the file configuration extracted from the * metadata of the export database., a string; default empty.} * @config{ repair, whether to reconstruct the metadata from the raw @@ -2442,15 +2444,18 @@ struct __wt_connection { * @configstart{WT_CONNECTION.query_timestamp, see dist/api_data.py} * @config{get, specify which timestamp to query: \c all_durable returns the largest * timestamp such that all timestamps up to that value have been made durable\, \c - * last_checkpoint returns the timestamp of the most recent stable checkpoint\, \c oldest - * returns the most recent \c oldest_timestamp set with WT_CONNECTION::set_timestamp\, \c - * oldest_reader returns the minimum of the read timestamps of all active readers \c pinned - * returns the minimum of the \c oldest_timestamp and the read timestamps of all active - * readers\, \c recovery returns the timestamp of the most recent stable checkpoint taken - * prior to a shutdown and \c stable returns the most recent \c stable_timestamp set with - * WT_CONNECTION::set_timestamp. See @ref transaction_timestamps., a string\, chosen from - * the following options: \c "all_durable"\, \c "last_checkpoint"\, \c "oldest"\, \c - * "oldest_reader"\, \c "pinned"\, \c "recovery"\, \c "stable"; default \c all_durable.} + * last_checkpoint returns the timestamp of the most recent stable checkpoint\, \c + * oldest_timestamp returns the most recent \c oldest_timestamp set with + * WT_CONNECTION::set_timestamp\, \c oldest_reader returns the minimum of the read + * timestamps of all active readers \c pinned returns the minimum of the \c oldest_timestamp + * and the read timestamps of all active readers\, \c recovery returns the timestamp of the + * most recent stable checkpoint taken prior to a shutdown and \c stable_timestamp returns + * the most recent \c stable_timestamp set with WT_CONNECTION::set_timestamp. (The \c + * oldest and \c stable arguments are deprecated short-hand for \c oldest_timestamp and \c + * stable_timestamp\, respectively.) See @ref transaction_timestamps., a string\, chosen + * from the following options: \c "all_durable"\, \c "last_checkpoint"\, \c "oldest"\, \c + * "oldest_reader"\, \c "oldest_timestamp"\, \c "pinned"\, \c "recovery"\, \c "stable"\, \c + * "stable_timestamp"; default \c all_durable.} * @configend * @errors * If there is no matching timestamp (e.g., if this method is called |