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/src/lsm/lsm_tree.c | |
| 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/src/lsm/lsm_tree.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/lsm/lsm_tree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/src/lsm/lsm_tree.c b/src/third_party/wiredtiger/src/lsm/lsm_tree.c index 6e71c0434c5..236120c29f3 100644 --- a/src/third_party/wiredtiger/src/lsm/lsm_tree.c +++ b/src/third_party/wiredtiger/src/lsm/lsm_tree.c @@ -439,9 +439,9 @@ __lsm_tree_open_check(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree) required = WT_LSM_TREE_MINIMUM_SIZE(lsm_tree->chunk_size, lsm_tree->merge_max, maxleafpage); if (conn->cache_size < required) - WT_RET_MSG(session, EINVAL, "LSM cache size %" PRIu64 " (%" PRIu64 - "MB) too small, " - "must be at least %" PRIu64 " (%" PRIu64 "MB)", + WT_RET_MSG(session, EINVAL, + "LSM cache size %" PRIu64 " (%" PRIu64 "MB) too small, must be at least %" PRIu64 + " (%" PRIu64 "MB)", conn->cache_size, conn->cache_size / WT_MEGABYTE, required, (required + (WT_MEGABYTE - 1)) / WT_MEGABYTE); return (0); @@ -1083,8 +1083,9 @@ __wt_lsm_compact(WT_SESSION_IMPL *session, const char *name, bool *skipp) * There is no work to do if there is only a single chunk in the tree and it has a bloom filter * or is configured to never have a bloom filter. */ - if (lsm_tree->nchunks == 1 && (!FLD_ISSET(lsm_tree->bloom, WT_LSM_BLOOM_OLDEST) || - F_ISSET(lsm_tree->chunk[0], WT_LSM_CHUNK_BLOOM))) { + if (lsm_tree->nchunks == 1 && + (!FLD_ISSET(lsm_tree->bloom, WT_LSM_BLOOM_OLDEST) || + F_ISSET(lsm_tree->chunk[0], WT_LSM_CHUNK_BLOOM))) { __wt_lsm_tree_release(session, lsm_tree); return (0); } @@ -1174,9 +1175,8 @@ __wt_lsm_compact(WT_SESSION_IMPL *session, const char *name, bool *skipp) if (flushing) { WT_ASSERT(session, chunk != NULL); if (F_ISSET(chunk, WT_LSM_CHUNK_ONDISK)) { - __wt_verbose(session, WT_VERB_LSM, "Compact flush done %s chunk %" PRIu32 - ". " - "Start compacting progress %" PRIu64, + __wt_verbose(session, WT_VERB_LSM, + "Compact flush done %s chunk %" PRIu32 ". Start compacting progress %" PRIu64, name, chunk->id, lsm_tree->merge_progressing); (void)__wt_atomic_sub32(&chunk->refcnt, 1); flushing = ref = false; |