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/cursor/cur_json.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/cursor/cur_json.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_json.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/src/cursor/cur_json.c b/src/third_party/wiredtiger/src/cursor/cur_json.c index a34661a7992..5a3ce1268b0 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_json.c +++ b/src/third_party/wiredtiger/src/cursor/cur_json.c @@ -52,8 +52,9 @@ static int __json_pack_size(WT_SESSION_IMPL *, const char *, WT_CONFIG_ITEM *, WT_RET(json_string_arg(session, &(jstr), &(pv).u.item));\ (pv).type = 'K'; \ break; \ - /* User format strings have already been validated. */ \ - WT_ILLEGAL_VALUE(session, (pv).type); \ + default: \ + /* User format strings have already been validated. */ \ + return (__wt_illegal_value(session, (pv).type)); \ } \ } while (0) @@ -934,7 +935,8 @@ __wt_json_strncpy(WT_SESSION *wt_session, case '\\': *dst++ = ch; break; - WT_ILLEGAL_VALUE(session, ch); + default: + return (__wt_illegal_value(session, ch)); } else *dst++ = ch; |