summaryrefslogtreecommitdiff
path: root/src/lsm/lsm_merge.c
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2014-11-11 16:19:08 +1100
committerAlex Gorrod <alexg@wiredtiger.com>2014-11-11 16:19:08 +1100
commit89b689706d270f54e1010fdb0b4eaea72607158d (patch)
tree3dfddc4dfee59ff9705a5faf65ccac85f1ed23f8 /src/lsm/lsm_merge.c
parentcf799535359d26305d8ca5d342e6bc9acc2e8887 (diff)
downloadmongo-89b689706d270f54e1010fdb0b4eaea72607158d.tar.gz
Have LSM cleanup bloom filters consistently.
There were cases before that old bloom filters could interfere with creating new chunks.
Diffstat (limited to 'src/lsm/lsm_merge.c')
-rw-r--r--src/lsm/lsm_merge.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lsm/lsm_merge.c b/src/lsm/lsm_merge.c
index 6d2691aa045..d448988d7c4 100644
--- a/src/lsm/lsm_merge.c
+++ b/src/lsm/lsm_merge.c
@@ -272,7 +272,6 @@ __wt_lsm_merge(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, u_int id)
nchunks = (end_chunk + 1) - start_chunk;
WT_ASSERT(session, nchunks > 0);
-
start_id = lsm_tree->chunk[start_chunk]->id;
/* Find the merge generation. */
@@ -326,8 +325,7 @@ __wt_lsm_merge(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, u_int id)
ret = __wt_lsm_tree_setup_chunk(session, lsm_tree, chunk));
WT_ERR(ret);
if (create_bloom) {
- WT_ERR(__wt_lsm_tree_bloom_name(
- session, lsm_tree, chunk->id, &chunk->bloom_uri));
+ WT_ERR(__wt_lsm_tree_setup_bloom(session, lsm_tree, chunk));
WT_ERR(__wt_bloom_create(session, chunk->bloom_uri,
lsm_tree->bloom_config,