diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-03-09 14:52:38 +1100 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2022-03-09 14:52:38 +1100 |
| commit | a7bf7cda9c88e80e5b7f045c884840a0cd49ee5e (patch) | |
| tree | 34d43e97404bcbf3eca62304c9b4b0eb6782de0d | |
| parent | 9f30fd5bf3f5a5a541d0cadcb486cc67181a147f (diff) | |
| download | mongo-a7bf7cda9c88e80e5b7f045c884840a0cd49ee5e.tar.gz | |
Import wiredtiger: 01f90f2464dcf5a03d5968d75c0f9ec4172437fe from branch mongodb-5.3
ref: 3e44a24338..01f90f2464
for: 5.3.0-rc4
WT-8560 Clear the obsolete on-disk time start time window if it exists
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/reconcile_inline.h | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/timestamp_inline.h | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index f9b6dfaaea5..b1a4596f3e1 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.3", - "commit": "3e44a24338c041119127a05fed55808551e5d892" + "commit": "01f90f2464dcf5a03d5968d75c0f9ec4172437fe" } diff --git a/src/third_party/wiredtiger/src/include/reconcile_inline.h b/src/third_party/wiredtiger/src/include/reconcile_inline.h index b3e92d8ed9e..39209bcc9af 100644 --- a/src/third_party/wiredtiger/src/include/reconcile_inline.h +++ b/src/third_party/wiredtiger/src/include/reconcile_inline.h @@ -490,8 +490,8 @@ __wt_rec_time_window_clear_obsolete( session, (upd_select != NULL && vpack == NULL) || (upd_select == NULL && vpack != NULL)); tw = upd_select != NULL ? &upd_select->tw : &vpack->tw; - /* Return if the time window is empty. */ - if (WT_TIME_WINDOW_IS_EMPTY(tw)) + /* Return if the start time window is empty. */ + if (!WT_TIME_WINDOW_HAS_START(tw)) return; /* diff --git a/src/third_party/wiredtiger/src/include/timestamp_inline.h b/src/third_party/wiredtiger/src/include/timestamp_inline.h index fd27a1f8a90..f90bd97e72a 100644 --- a/src/third_party/wiredtiger/src/include/timestamp_inline.h +++ b/src/third_party/wiredtiger/src/include/timestamp_inline.h @@ -27,6 +27,10 @@ (tw)->start_txn == WT_TXN_NONE && (tw)->durable_stop_ts == WT_TS_NONE && \ (tw)->stop_ts == WT_TS_MAX && (tw)->stop_txn == WT_TXN_MAX && (tw)->prepare == 0) +/* Check if the start time window is set. */ +#define WT_TIME_WINDOW_HAS_START(tw) \ + ((tw)->start_txn != WT_TXN_NONE || (tw)->start_ts != WT_TS_NONE) + /* Check if the stop time window is set. */ #define WT_TIME_WINDOW_HAS_STOP(tw) ((tw)->stop_txn != WT_TXN_MAX || (tw)->stop_ts != WT_TS_MAX) |