andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused BloomFilterPolicy::hash_func_ (#5961)

Browse Source 
Summary:
This is an internal, file-local "feature" that is not used and
potentially confusing.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5961

Test Plan: make check

Differential Revision: D18099018

Pulled By: pdillinger

fbshipit-source-id: 7870627eeed09941d12538ec55d10d2e164fc716
This commit is contained in:
Peter Dillinger 2019-10-23 15:45:46 -07:00 committed by Facebook Github Bot
parent b4ebda7a39
commit 6a32e3b562
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/bloom.cc
View File

@ -201,7 +201,7 @@ class FullFilterBitsReader : public FilterBitsReader {
class BloomFilterPolicy : public FilterPolicy {
public:
explicit BloomFilterPolicy(int bits_per_key, bool use_block_based_builder)
: bits_per_key_(bits_per_key), hash_func_(BloomHash),
: bits_per_key_(bits_per_key),
use_block_based_builder_(use_block_based_builder) {
initialize();
}
@ -226,7 +226,7 @@ class BloomFilterPolicy : public FilterPolicy {
dst->push_back(static_cast<char>(num_probes_)); // Remember # of probes
char* array = &(*dst)[init_size];
for (int i = 0; i < n; i++) {
LegacyNoLocalityBloomImpl::AddHash(hash_func_(keys[i]), bits, num_probes_,
LegacyNoLocalityBloomImpl::AddHash(BloomHash(keys[i]), bits, num_probes_,
array);
}
}
@ -249,7 +249,7 @@ class BloomFilterPolicy : public FilterPolicy {
return true;
}
// NB: using k not num_probes_
return LegacyNoLocalityBloomImpl::HashMayMatch(hash_func_(key), bits, k,
return LegacyNoLocalityBloomImpl::HashMayMatch(BloomHash(key), bits, k,
array);
}
@ -323,8 +323,6 @@ class BloomFilterPolicy : public FilterPolicy {
private:
int bits_per_key_;
int num_probes_;
uint32_t (*hash_func_)(const Slice& key);
const bool use_block_based_builder_;
void initialize() {