diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2019-07-12 16:51:32 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2019-07-12 16:51:32 +1000 |
| commit | 67b760c562d7f189bad589841b4dcd14acf702d9 (patch) | |
| tree | bd2291d5306357a1093125f19ae01d5c03d9547c /src/third_party/wiredtiger/src/reconcile/rec_write.c | |
| parent | 9ae337bd27f7a513df548256400596a6eba4d7a3 (diff) | |
| download | mongo-67b760c562d7f189bad589841b4dcd14acf702d9.tar.gz | |
Import wiredtiger: 3f686382114354b29b1d92b9c4a7dfc870dc5b94 from branch mongodb-4.2
ref: 99e0760cc5..3f68638211
for: 4.3.1
WT-4530 WiredTiger session statistics cursor returns incorrect key on BigEndian systems
WT-4612 Improve test coverage for prepare updates older than the oldest
WT-4791 Coverity: Dereferencing null (cbt->ins)
WT-4842 Enhance lookaside score calculation
WT-4857 Fix a bug in column store where skip list traversal could miss an entry
WT-4889 Dump additional transaction fields
WT-4913 Fix the Windows CRC32 on blocks that aren't 8B aligned and/or multiples of 8B
WT-4916 Clang Format pre-formatting fixes
WT-4926 Fix the WiredTiger static test suite's test for EBUSY failures
WT-4927 Allow updates with timestamps to be evicted to lookaside
WT-4928 Fix clang scan warnings in Jenkins Pull Request testing
Diffstat (limited to 'src/third_party/wiredtiger/src/reconcile/rec_write.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/reconcile/rec_write.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/reconcile/rec_write.c b/src/third_party/wiredtiger/src/reconcile/rec_write.c index 5a78f0df88d..f7eeada4c8e 100644 --- a/src/third_party/wiredtiger/src/reconcile/rec_write.c +++ b/src/third_party/wiredtiger/src/reconcile/rec_write.c @@ -500,7 +500,8 @@ __rec_root_write(WT_SESSION_IMPL *session, WT_PAGE *page, uint32_t flags) return (0); case WT_PM_REC_MULTIBLOCK: /* Multiple blocks */ break; - WT_ILLEGAL_VALUE(session, mod->rec_result); + default: + return (__wt_illegal_value(session, mod->rec_result)); } __wt_verbose(session, WT_VERB_SPLIT, @@ -1401,7 +1402,8 @@ __wt_rec_split(WT_SESSION_IMPL *session, WT_RECONCILE *r, size_t next_len) r->min_space_avail = r->min_split_size - WT_PAGE_HEADER_BYTE_SIZE(btree); -done: /* +done: + /* * Overflow values can be larger than the maximum page size but still be * "on-page". If the next key/value pair is larger than space available * after a split has happened (in other words, larger than the maximum @@ -2023,7 +2025,8 @@ __rec_split_write(WT_SESSION_IMPL *session, WT_RECONCILE *r, case WT_PAGE_ROW_INT: multi->addr.type = WT_ADDR_INT; break; - WT_ILLEGAL_VALUE(session, page->type); + default: + return (__wt_illegal_value(session, page->type)); } multi->size = WT_STORE_SIZE(chunk->image.size); multi->checksum = 0; @@ -2412,7 +2415,8 @@ __rec_write_wrapup(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_PAGE *page) mod->mod_replace.size = 0; __wt_free(session, mod->mod_disk_image); break; - WT_ILLEGAL_VALUE(session, mod->rec_result); + default: + return (__wt_illegal_value(session, mod->rec_result)); } /* Reset the reconciliation state. */ |