diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-05-12 16:27:34 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-12 06:42:41 +0000 |
| commit | cf68adaa79f789fd0da77ea0c4eb554af6beab08 (patch) | |
| tree | 4e11b2b8eed62d4e0e6b0f7e670bb3be655458fa /src/third_party/wiredtiger/src/btree/bt_ret.c | |
| parent | 6eb64770517b467ac903d39560c95fb470a77ad0 (diff) | |
| download | mongo-cf68adaa79f789fd0da77ea0c4eb554af6beab08.tar.gz | |
Import wiredtiger: bdff12c2331ab0478a22309a6d35519d2e2ca441 from branch mongodb-4.4
ref: 404b4a70af..bdff12c233
for: 4.4.0-rc6
WT-5864 Append globally visible tombstone with WT_TS_NONE to the update chain
WT-6063 Re-enable checkpoint-filetypes-test in Evergreen
WT-6065 Re-enable spinlock-gcc-test in Evergreen
WT-6092 Use durable timestamp for global visibility check instead of commit timestamp
WT-6111 Rework cell structures and unpacking
WT-6157 Disable table logging in workgen stress test while running prepare transactions
WT-6159 Tag verbose messages to make them easier to distinguish
WT-6160 Fix format failure caused by stack overwrite
WT-6161 Fix format hang when WiredTiger internal checkpoints are configured
WT-6162 Fix incorrectly counts failures in format.sh
WT-6166 KEY/VALUE short cells have to handle copy cells
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_ret.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_ret.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_ret.c b/src/third_party/wiredtiger/src/btree/bt_ret.c index 1a2360f6d09..abffa19cf56 100644 --- a/src/third_party/wiredtiger/src/btree/bt_ret.c +++ b/src/third_party/wiredtiger/src/btree/bt_ret.c @@ -76,9 +76,9 @@ __key_return(WT_CURSOR_BTREE *cbt) static void __read_col_time_window(WT_SESSION_IMPL *session, WT_PAGE *page, WT_CELL *cell, WT_TIME_WINDOW *tw) { - WT_CELL_UNPACK unpack; + WT_CELL_UNPACK_KV unpack; - __wt_cell_unpack(session, page, cell, &unpack); + __wt_cell_unpack_kv(session, page->dsk, cell, &unpack); __wt_time_window_copy(tw, &unpack.tw); } @@ -89,7 +89,7 @@ __read_col_time_window(WT_SESSION_IMPL *session, WT_PAGE *page, WT_CELL *cell, W void __wt_read_row_time_window(WT_SESSION_IMPL *session, WT_PAGE *page, WT_ROW *rip, WT_TIME_WINDOW *tw) { - WT_CELL_UNPACK unpack; + WT_CELL_UNPACK_KV unpack; __wt_time_window_init(tw); /* @@ -138,7 +138,7 @@ __wt_value_return_buf(WT_CURSOR_BTREE *cbt, WT_REF *ref, WT_ITEM *buf, WT_TIME_W { WT_BTREE *btree; WT_CELL *cell; - WT_CELL_UNPACK unpack; + WT_CELL_UNPACK_KV unpack; WT_CURSOR *cursor; WT_PAGE *page; WT_ROW *rip; @@ -174,7 +174,7 @@ __wt_value_return_buf(WT_CURSOR_BTREE *cbt, WT_REF *ref, WT_ITEM *buf, WT_TIME_W if (page->type == WT_PAGE_COL_VAR) { /* Take the value from the original page cell. */ cell = WT_COL_PTR(page, &page->pg_var[cbt->slot]); - __wt_cell_unpack(session, page, cell, &unpack); + __wt_cell_unpack_kv(session, page->dsk, cell, &unpack); if (tw != NULL) __wt_time_window_copy(tw, &unpack.tw); return (__wt_page_cell_data_ref(session, page, &unpack, buf)); |