diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-25 22:51:35 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-25 22:51:35 +1100 |
| commit | 7b08fda19c283c8af7793e003e690c34bd05a0f2 (patch) | |
| tree | 0d4b64d24804bcd7b0e8591430093107a6367de3 /src/bloom | |
| parent | 068bd803ba2bb21feae8b7508f69f228b33d07e9 (diff) | |
| parent | 7d2126b55dc59e093e0f263f21d67932a5265539 (diff) | |
| download | mongo-7b08fda19c283c8af7793e003e690c34bd05a0f2.tar.gz | |
Merge branch 'develop' into data-handles
Conflicts:
src/btree/bt_evict.c
src/btree/bt_handle.c
src/btree/bt_page.c
src/btree/rec_evict.c
src/conn/conn_dhandle.c
src/cursor/cur_stat.c
src/include/btree.h
src/include/btree.i
src/include/stat.h
src/lsm/lsm_cursor.c
src/schema/schema_create.c
src/txn/txn_ckpt.c
Diffstat (limited to 'src/bloom')
| -rw-r--r-- | src/bloom/bloom.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bloom/bloom.c b/src/bloom/bloom.c index df16aa39c55..9e0a2817a11 100644 --- a/src/bloom/bloom.c +++ b/src/bloom/bloom.c @@ -65,7 +65,8 @@ static int __bloom_setup( WT_BLOOM *bloom, uint64_t n, uint64_t m, uint32_t factor, uint32_t k) { - WT_ASSERT(bloom->session, k > 1); + if (k < 2) + return (EINVAL); bloom->k = k; bloom->factor = factor; @@ -240,6 +241,7 @@ __wt_bloom_hash_get(WT_BLOOM *bloom, WT_BLOOM_HASH *bhash) uint64_t h1, h2; uint8_t bit; + /* Get operations are only supported by finalized bloom filters. */ WT_ASSERT(bloom->session, bloom->bitstring == NULL); wt_session = (WT_SESSION *)bloom->session; |