diff options
author | Sage Weil <sage@inktank.com> | 2013-10-06 10:22:41 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-10-06 10:22:41 -0700 |
commit | cf34adb99b456db845295bfca2b1fb310d873f89 (patch) | |
tree | 5f5e42820cdb3a9d710c77c004c94467c55e8542 | |
parent | f45c3b98d3941c242d428c971b494fdc5216bd18 (diff) | |
download | ceph-cf34adb99b456db845295bfca2b1fb310d873f89.tar.gz |
common/bloom_filter: simplify compressible_bloom_filter encode/decode/dump
Re-use bloom_filter for this, as per Loic's suggestion. Much nicer!
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | src/common/bloom_filter.cc | 53 |
1 files changed, 7 insertions, 46 deletions
diff --git a/src/common/bloom_filter.cc b/src/common/bloom_filter.cc index 41cad174909..a1c20bf0c12 100644 --- a/src/common/bloom_filter.cc +++ b/src/common/bloom_filter.cc @@ -82,82 +82,43 @@ void bloom_filter::generate_test_instances(list<bloom_filter*>& ls) void compressible_bloom_filter::encode(bufferlist& bl) const { ENCODE_START(2, 2, bl); - ::encode((uint64_t)salt_count_, bl); + bloom_filter::encode(bl); + uint32_t s = size_list.size(); ::encode(s, bl); for (vector<size_t>::const_iterator p = size_list.begin(); p != size_list.end(); ++p) ::encode((uint64_t)*p, bl); - ::encode((uint64_t)insert_count_, bl); - ::encode((uint64_t)target_element_count_, bl); - ::encode((uint64_t)random_seed_, bl); - bufferptr bp((const char*)bit_table_, table_size_); - ::encode(bp, bl); + ENCODE_FINISH(bl); } void compressible_bloom_filter::decode(bufferlist::iterator& p) { DECODE_START(2, p); - uint64_t v; - ::decode(v, p); - salt_count_ = v; + bloom_filter::decode(p); uint32_t s; ::decode(s, p); size_list.resize(s); for (unsigned i = 0; i < s; i++) { + uint64_t v; ::decode(v, p); size_list[i] = v; } - ::decode(v, p); - insert_count_ = v; - ::decode(v, p); - target_element_count_ = v; - ::decode(v, p); - random_seed_ = v; - bufferlist t; - ::decode(t, p); - - salt_.clear(); - generate_unique_salt(); - table_size_ = t.length(); - assert((!table_size_ && size_list.empty()) || - table_size_ == size_list.back()); - delete bit_table_; - if (table_size_) { - bit_table_ = new cell_type[table_size_]; - t.copy(0, table_size_, (char *)bit_table_); - } else { - bit_table_ = NULL; - } - DECODE_FINISH(p); } void compressible_bloom_filter::dump(Formatter *f) const { - f->dump_unsigned("salt_count", salt_count_); - f->dump_unsigned("insert_count", insert_count_); - f->dump_unsigned("target_element_count", target_element_count_); - f->dump_unsigned("random_seed", random_seed_); - f->dump_unsigned("table_size", table_size_); + bloom_filter::dump(f); + f->open_array_section("table_sizes"); for (vector<size_t>::const_iterator p = size_list.begin(); p != size_list.end(); ++p) f->dump_unsigned("size", (uint64_t)*p); f->close_section(); - - f->open_array_section("salt_table"); - for (std::vector<bloom_type>::const_iterator i = salt_.begin(); i != salt_.end(); ++i) - f->dump_unsigned("salt", *i); - f->close_section(); - - f->open_array_section("bit_table"); - for (unsigned i = 0; i < table_size_; ++i) - f->dump_unsigned("byte", (unsigned)bit_table_[i]); - f->close_section(); } void compressible_bloom_filter::generate_test_instances(list<compressible_bloom_filter*>& ls) |