diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-10-11 02:55:53 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-11 04:12:54 +0000 |
| commit | f963b67ab0fed0ab21cffd817cb328aebd671dae (patch) | |
| tree | b3264a65061aa6dd1e68c2f1860e64f47b47dfa7 /src | |
| parent | 72899867ce78fe098d31abbf56b701d7d060ca2d (diff) | |
| download | mongo-f963b67ab0fed0ab21cffd817cb328aebd671dae.tar.gz | |
Import wiredtiger: 11ba92121f3588aa8b7bd84a824ae8057881be6d from branch mongodb-master
ref: 644a999677..11ba92121f
for: 6.2.0-rc0
WT-9795 - In test/format, use commit timestamps which are after the stable timestamp
Diffstat (limited to 'src')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/format/bulk.c | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/format/ops.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 6345b4781bd..a5424d39dc3 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-master", - "commit": "644a9996775281cc16a20b329ad65231e86a69ab" + "commit": "11ba92121f3588aa8b7bd84a824ae8057881be6d" } diff --git a/src/third_party/wiredtiger/test/format/bulk.c b/src/third_party/wiredtiger/test/format/bulk.c index 834b7d8db85..5969324a8de 100644 --- a/src/third_party/wiredtiger/test/format/bulk.c +++ b/src/third_party/wiredtiger/test/format/bulk.c @@ -39,7 +39,7 @@ bulk_begin_transaction(WT_SESSION *session) /* Writes require snapshot isolation. */ wt_wrap_begin_transaction(session, NULL); - ts = __wt_atomic_fetch_addv64(&g.timestamp, 1); + ts = __wt_atomic_addv64(&g.timestamp, 1); testutil_check(session->timestamp_transaction_uint(session, WT_TS_TXN_TYPE_READ, ts)); } @@ -52,7 +52,7 @@ bulk_commit_transaction(WT_SESSION *session) { uint64_t ts; - ts = __wt_atomic_fetch_addv64(&g.timestamp, 1); + ts = __wt_atomic_addv64(&g.timestamp, 1); testutil_check(session->timestamp_transaction_uint(session, WT_TS_TXN_TYPE_COMMIT, ts)); testutil_check(session->commit_transaction(session, NULL)); diff --git a/src/third_party/wiredtiger/test/format/ops.c b/src/third_party/wiredtiger/test/format/ops.c index 5bc27f723a2..6e2e66efcc2 100644 --- a/src/third_party/wiredtiger/test/format/ops.c +++ b/src/third_party/wiredtiger/test/format/ops.c @@ -505,7 +505,7 @@ commit_transaction(TINFO *tinfo, bool prepared) if (prepared) lock_readlock(session, &g.prepare_commit_lock); - ts = __wt_atomic_fetch_addv64(&g.timestamp, 1); + ts = __wt_atomic_addv64(&g.timestamp, 1); testutil_check(session->timestamp_transaction_uint(session, WT_TS_TXN_TYPE_COMMIT, ts)); if (prepared) |