diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-08-17 15:56:33 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-17 06:16:56 +0000 |
| commit | b2c2c5e28402f113ac52f6ce5e629d59fc09b995 (patch) | |
| tree | f66c98f6fbbc5fae973620de07d2f6e262c0bd44 /src/third_party/wiredtiger/ext | |
| parent | 3cc779415f2777223b5549d3dfd1b85eef01842b (diff) | |
| download | mongo-b2c2c5e28402f113ac52f6ce5e629d59fc09b995.tar.gz | |
Import wiredtiger: 1a3371324597a8f124c126c2df11303ded4d8dd9 from branch mongodb-4.6
ref: 1124e23db6..1a33713245
for: 4.5.1
WT-5940 Migrate to Clang Format 10
WT-6000 Enhance incremental backup testing in format to support restart
WT-6471 Avoid the error message for non-existent clang-format binary
WT-6560 Fix usage of global salvage in WT utility
WT-6577 History store dump outputs confusing time window
WT-6586 Tombstone inserted to history store should also be flagged as WT_UPDATE_HS
Diffstat (limited to 'src/third_party/wiredtiger/ext')
5 files changed, 10 insertions, 16 deletions
diff --git a/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c b/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c index 28f1d41bcfc..111c9081c73 100644 --- a/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c +++ b/src/third_party/wiredtiger/ext/compressors/lz4/lz4_compress.c @@ -181,9 +181,8 @@ lz4_decompress(WT_COMPRESSOR *compressor, WT_SESSION *session, uint8_t *src, siz lz4_prefix_swap(&prefix); #endif if (prefix.compressed_len + sizeof(LZ4_PREFIX) > src_len) { - (void)wt_api->err_printf(wt_api, session, - "WT_COMPRESSOR.decompress: stored size exceeds source " - "size"); + (void)wt_api->err_printf( + wt_api, session, "WT_COMPRESSOR.decompress: stored size exceeds source size"); return (WT_ERROR); } diff --git a/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c b/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c index 5e37a01147d..bc8a5576472 100644 --- a/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c +++ b/src/third_party/wiredtiger/ext/compressors/snappy/snappy_compress.c @@ -168,9 +168,8 @@ snappy_decompression(WT_COMPRESSOR *compressor, WT_SESSION *session, uint8_t *sr snaplen = snappy_bswap64(snaplen); #endif if (snaplen + SNAPPY_PREFIX > src_len) { - (void)wt_api->err_printf(wt_api, session, - "WT_COMPRESSOR.decompress: stored size exceeds source " - "size"); + (void)wt_api->err_printf( + wt_api, session, "WT_COMPRESSOR.decompress: stored size exceeds source size"); return (WT_ERROR); } diff --git a/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c b/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c index 80db373a597..42eed08304c 100644 --- a/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c +++ b/src/third_party/wiredtiger/ext/compressors/zlib/zlib_compress.c @@ -257,10 +257,8 @@ zlib_init_config(WT_CONNECTION *connection, WT_CONFIG_ARG *config, int *zlib_lev */ zlib_level = (int)v.val; if (zlib_level < 0 || zlib_level > 9) { - (void)wt_api->err_printf(wt_api, NULL, - "zlib_init_config: " - "unsupported compression level %d", - zlib_level); + (void)wt_api->err_printf( + wt_api, NULL, "zlib_init_config: unsupported compression level %d", zlib_level); return (EINVAL); } *zlib_levelp = zlib_level; diff --git a/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c b/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c index f6a0e09a809..f4e48ad61fd 100644 --- a/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c +++ b/src/third_party/wiredtiger/ext/compressors/zstd/zstd_compress.c @@ -157,9 +157,8 @@ zstd_decompress(WT_COMPRESSOR *compressor, WT_SESSION *session, uint8_t *src, si zstd_len = zstd_bswap64(zstd_len); #endif if (zstd_len + ZSTD_PREFIX > src_len) { - (void)wt_api->err_printf(wt_api, session, - "WT_COMPRESSOR.decompress: stored size exceeds source " - "size"); + (void)wt_api->err_printf( + wt_api, session, "WT_COMPRESSOR.decompress: stored size exceeds source size"); return (WT_ERROR); } diff --git a/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c b/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c index 02ca4fab2d1..15799625e1b 100644 --- a/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c +++ b/src/third_party/wiredtiger/ext/test/fail_fs/fail_fs.c @@ -763,9 +763,8 @@ wiredtiger_extension_init(WT_CONNECTION *conn, WT_CONFIG_ARG *config) continue; (void)wtext->err_printf(wtext, NULL, - "WT_CONFIG_PARSER.next: unexpected configuration " - "information: %.*s=%.*s: %s", - (int)k.len, k.str, (int)v.len, v.str, wtext->strerror(wtext, NULL, ret)); + "WT_CONFIG_PARSER.next: unexpected configuration information: %.*s=%.*s: %s", (int)k.len, + k.str, (int)v.len, v.str, wtext->strerror(wtext, NULL, ret)); goto err; } if (ret != WT_NOTFOUND) { |