diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-05-06 15:07:08 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-06 05:38:19 +0000 |
| commit | a6c22550e323e628b7e16ea6e9b4d272de62c18e (patch) | |
| tree | ba4b0e25c9717bac0d7eb316761b6f461573425d /src/third_party/wiredtiger/lang | |
| parent | 950dd1ff0ce5d62bbd434e8b874cce2ecbbda3ee (diff) | |
| download | mongo-a6c22550e323e628b7e16ea6e9b4d272de62c18e.tar.gz | |
Import wiredtiger: 18dfb9e58e39927696affcd8e362364e23e1aa59 from branch mongodb-4.4
ref: a707df12a2..18dfb9e58e
for: 4.5.1
WT-5242 Minimize checkpoints pinned during backup
WT-5470 Reduce copies and allocations in read path
WT-5673 Prepare support with durable history: modify verify and salvage as needed
WT-5677 Prepare support with durable history: add test/format stress tests
WT-5710 Review WT_PANIC usage
WT-5716 Create the history store file at the same time as creating the metadata file in wiredtiger open
WT-5839 Ignore non-globally visible tombstones for both data store and hs store in hs verification
WT-5841 Return WT_TRY_SALVAGE when the history file is removed or truncated
WT-5928 Cleanup stale FIXMEs from durable history
WT-5977 WT_SESSION_NO_RECONCILE flag set by history cursor prevents eviction
WT-5984 Allow prepared updates to be evicted in durable history
WT-6009 Prepare support with durable history: add statistic for prepared updates evicted
WT-6032 Turn on mongodb-4.4 branch upgrade/downgrade testing
WT-6051 Fix reconstructing full value from modifies for string format
WT-6068 Re-enable tests temporarily disabled during durable history development
WT-6069 Remove WT_UPDATE_RESTORED_FROM_DISK flag
WT-6070 Coverity : Copy paste error
WT-6071 Coverity : Change format specifier
WT-6086 Move time windows and aggregated time windows into structures
WT-6087 Add a C2S(cursor) macro to simplify translation from a cursor to a session.
WT-6095 Verify on-disk page only for row store as part of rollback to stable
WT-6109 Cleanup usage of cursor->session
WT-6110 Cleanup cast from cbt to cursor
WT-6120 Remove use-after-free in __verify_history_store_id
WT-6130 Disable test_random_abort
Diffstat (limited to 'src/third_party/wiredtiger/lang')
| -rw-r--r-- | src/third_party/wiredtiger/lang/java/wiredtiger.i | 5 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/lang/python/wiredtiger.i | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/lang/java/wiredtiger.i b/src/third_party/wiredtiger/lang/java/wiredtiger.i index cd1174e6e48..e544951909e 100644 --- a/src/third_party/wiredtiger/lang/java/wiredtiger.i +++ b/src/third_party/wiredtiger/lang/java/wiredtiger.i @@ -2264,8 +2264,7 @@ err: if (ret != 0) if ((ret = $self->open_cursor($self, uri, to_dup, config, &cursor)) != 0) goto err; - if ((ret = __wt_calloc_def((WT_SESSION_IMPL *)cursor->session, - 1, &jcb)) != 0) + if ((ret = __wt_calloc_def(CUR2S(cursor), 1, &jcb)) != 0) goto err; if ((cursor->flags & WT_CURSTD_RAW) != 0) @@ -2274,7 +2273,7 @@ err: if (ret != 0) cursor->flags |= WT_CURSTD_RAW; jcb->jnienv = jenv; - jcb->session = (WT_SESSION_IMPL *)cursor->session; + jcb->session = CUR2S(cursor); cursor->lang_private = jcb; err: if (ret != 0) diff --git a/src/third_party/wiredtiger/lang/python/wiredtiger.i b/src/third_party/wiredtiger/lang/python/wiredtiger.i index 7f5f6d17e96..249cde15837 100644 --- a/src/third_party/wiredtiger/lang/python/wiredtiger.i +++ b/src/third_party/wiredtiger/lang/python/wiredtiger.i @@ -1347,7 +1347,7 @@ cursorCloseHandler(WT_CURSOR *cursor) cursor->lang_private = NULL; if (pcb != NULL) ret = pythonClose(pcb); - __wt_free((WT_SESSION_IMPL *)cursor->session, pcb); + __wt_free(CUR2S(cursor), pcb); return (ret); } @@ -1374,7 +1374,7 @@ cursorFreeHandler(WT_CURSOR *cursor) pcb = (PY_CALLBACK *)cursor->lang_private; cursor->lang_private = NULL; - __wt_free((WT_SESSION_IMPL *)cursor->session, pcb); + __wt_free(CUR2S(cursor), pcb); return (0); } |