diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2018-08-06 13:51:22 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2018-08-06 13:51:22 +1000 |
| commit | 063f0b27cfc73cb089b2e76a5fe534b39934ffa4 (patch) | |
| tree | 5674b788c4999a4db24bbff46125bcad2c2673b4 /src/third_party/wiredtiger/src/cursor/cur_join.c | |
| parent | e49247580c76ccdd4013ff0357e03d0b1c95cbb6 (diff) | |
| download | mongo-063f0b27cfc73cb089b2e76a5fe534b39934ffa4.tar.gz | |
Import wiredtiger: 65531924e397aeb55f6835b73e4c199ea378ec97 from branch mongodb-4.2
ref: 376f355fb0..65531924e3
for: 4.1.2
WT-3968 Use compression ratio to tune page sizes
WT-4010 Simplify test/format timestamp handling.
WT-4134 Rework assertion that we don't discard required history
WT-4201 Fix Coverity static analysis issues
WT-4206 Fix error handling in cursor close routines
WT-4208 tree walks can be interrupted by locked internal pages
WT-4213 Rename lock statistics that have redundant or misleading text
WT-4226 test/format LSM configurations can misconfigure prepare and timestamps
Diffstat (limited to 'src/third_party/wiredtiger/src/cursor/cur_join.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_join.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/src/cursor/cur_join.c b/src/third_party/wiredtiger/src/cursor/cur_join.c index 5cf72f68c98..1a23f4a51fc 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_join.c +++ b/src/third_party/wiredtiger/src/cursor/cur_join.c @@ -324,8 +324,8 @@ __curjoin_close(WT_CURSOR *cursor) u_int i; cjoin = (WT_CURSOR_JOIN *)cursor; - JOINABLE_CURSOR_API_CALL_PREPARE_ALLOWED(cursor, session, close, NULL); +err: WT_TRET(__wt_schema_release_table(session, cjoin->table)); @@ -362,9 +362,9 @@ __curjoin_close(WT_CURSOR *cursor) WT_TRET(cjoin->main->close(cjoin->main)); __wt_free(session, cjoin->entries); - WT_TRET(__wt_cursor_close(cursor)); + __wt_cursor_close(cursor); -err: API_END_RET(session, ret); + API_END_RET(session, ret); } /* @@ -1339,11 +1339,12 @@ __wt_curjoin_open(WT_SESSION_IMPL *session, session, tablename, size, false, 0, &table)); WT_RET(__wt_calloc_one(session, &cjoin)); - cursor = &cjoin->iface; + cursor = (WT_CURSOR *)cjoin; *cursor = iface; - cursor->session = &session->iface; + cursor->session = (WT_SESSION *)session; cursor->key_format = table->key_format; cursor->value_format = table->value_format; + cjoin->table = table; /* Handle projections. */ |