diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-04-16 14:36:51 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2019-04-16 14:45:56 +1000 |
| commit | a654dcf592ea7ed65426a0de96b4079ff4fc6716 (patch) | |
| tree | a5256edad1bb219e6af72fd7e7525f58e235a307 /src/third_party/wiredtiger/src/meta | |
| parent | 19b622ebfb42a525f38e278c09f440eb47b12f1e (diff) | |
| download | mongo-a654dcf592ea7ed65426a0de96b4079ff4fc6716.tar.gz | |
Import wiredtiger: 9416282c42d40328dfb7ff0f28831f639f98d3cb from branch mongodb-4.2
ref: 1768d66613..9416282c42
for: 4.1.11
WT-4317 Read checksum error in test_wt4156_metadata_salvage
WT-4579 Track the newest durable timestamp for each page
WT-4585 Add WT_WITH_HOTBACKUP_LOCK macro
WT-4598 Enable the assertion that the durable_timestamp is newer than or equals the commit timestamp.
WT-4640 Remove round_to_oldest in favour of roundup_timestamps
WT-4695 Python3: allow most tests to run with Python3 with small changes
WT-4696 Python3: change dist scripts to run under Python3
WT-4698 Python3: fix modify related tests
WT-4699 Python3: fix test_jsondump02.py
WT-4700 Python3: run with same source as Python2
WT-4703 Extend test/checkpoint to do removes and online checking
WT-4704 Add statistic tracking oldest active read timestamp
WT-4705 column-store no longer needs to handle WT_COL page offsets of 0
WT-4707 Failure in verifying cells with copied values
WT-4708 Coverity reported copy-paste error in WiredTiger error message
WT-4711 Python formatting errors reported while running "s_all"
WT-4714 Use the durable timestamp to determine if a page should stay dirty
WT-4724 Syntax error in wtperf_ckpt.sh when running 'dash' as default shell
Diffstat (limited to 'src/third_party/wiredtiger/src/meta')
| -rw-r--r-- | src/third_party/wiredtiger/src/meta/meta_ckpt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/src/meta/meta_ckpt.c b/src/third_party/wiredtiger/src/meta/meta_ckpt.c index 58711cc4e92..c4eb01b2d39 100644 --- a/src/third_party/wiredtiger/src/meta/meta_ckpt.c +++ b/src/third_party/wiredtiger/src/meta/meta_ckpt.c @@ -352,16 +352,16 @@ __ckpt_load(WT_SESSION_IMPL *session, WT_RET_NOTFOUND_OK(ret); ckpt->oldest_start_ts = ret == WT_NOTFOUND || a.len == 0 ? WT_TS_NONE : (uint64_t)a.val; - ret = __wt_config_subgets(session, v, "newest_start_ts", &a); + ret = __wt_config_subgets(session, v, "newest_durable_ts", &a); WT_RET_NOTFOUND_OK(ret); - ckpt->newest_start_ts = + ckpt->newest_durable_ts = ret == WT_NOTFOUND || a.len == 0 ? WT_TS_NONE : (uint64_t)a.val; ret = __wt_config_subgets(session, v, "newest_stop_ts", &a); WT_RET_NOTFOUND_OK(ret); ckpt->newest_stop_ts = ret == WT_NOTFOUND || a.len == 0 ? WT_TS_MAX : (uint64_t)a.val; __wt_timestamp_addr_check(session, - ckpt->oldest_start_ts, ckpt->newest_start_ts, ckpt->newest_stop_ts); + ckpt->oldest_start_ts, ckpt->newest_stop_ts); WT_RET(__wt_config_subgets(session, v, "write_gen", &a)); if (a.len == 0) @@ -433,8 +433,8 @@ __wt_meta_ckptlist_set(WT_SESSION_IMPL *session, __wt_seconds(session, &ckpt->sec); } - __wt_timestamp_addr_check(session, ckpt->oldest_start_ts, - ckpt->newest_start_ts, ckpt->newest_stop_ts); + __wt_timestamp_addr_check(session, + ckpt->oldest_start_ts, ckpt->newest_stop_ts); WT_ERR(__wt_buf_catfmt(session, buf, "%s%s", sep, ckpt->name)); sep = ","; @@ -452,7 +452,7 @@ __wt_meta_ckptlist_set(WT_SESSION_IMPL *session, ",time=%" PRIu64 ",size=%" PRId64 ",oldest_start_ts=%" PRId64 - ",newest_start_ts=%" PRId64 + ",newest_durable_ts=%" PRId64 ",newest_stop_ts=%" PRId64 ",write_gen=%" PRId64 ")", (int)ckpt->addr.size, (char *)ckpt->addr.data, @@ -460,7 +460,7 @@ __wt_meta_ckptlist_set(WT_SESSION_IMPL *session, ckpt->sec, (int64_t)ckpt->size, (int64_t)ckpt->oldest_start_ts, - (int64_t)ckpt->newest_start_ts, + (int64_t)ckpt->newest_durable_ts, (int64_t)ckpt->newest_stop_ts, (int64_t)ckpt->write_gen)); } |