0af157f9bf
Summary:
1. Make filter_block.h a base class. Derive block_based_filter_block and full_filter_block. The previous one is the traditional filter block. The full_filter_block is newly added. It would generate a filter block that contain all the keys in SST file.
2. When querying a key, table would first check if full_filter is available. If not, it would go to the exact data block and check using block_based filter.
3. User could choose to use full_filter or tradional(block_based_filter). They would be stored in SST file with different meta index name. "filter.filter_policy" or "full_filter.filter_policy". Then, Table reader is able to know the fllter block type.
4. Some optimizations have been done for full_filter_block, thus it requires a different interface compared to the original one in filter_policy.h.
5. Actual implementation of filter bits coding/decoding is placed in util/bloom_impl.cc
Benchmark: base commit 1d23b5c470
Command:
db_bench --db=/dev/shm/rocksdb --num_levels=6 --key_size=20 --prefix_size=20 --keys_per_prefix=0 --value_size=100 --write_buffer_size=134217728 --max_write_buffer_number=2 --target_file_size_base=33554432 --max_bytes_for_level_base=1073741824 --verify_checksum=false --max_background_compactions=4 --use_plain_table=0 --memtablerep=prefix_hash --open_files=-1 --mmap_read=1 --mmap_write=0 --bloom_bits=10 --bloom_locality=1 --memtable_bloom_bits=500000 --compression_type=lz4 --num=393216000 --use_hash_search=1 --block_size=1024 --block_restart_interval=16 --use_existing_db=1 --threads=1 --benchmarks=readrandom —disable_auto_compactions=1
Read QPS increase for about 30% from 2230002 to 2991411.
Test Plan:
make all check
valgrind db_test
db_stress --use_block_based_filter = 0
./auto_sanity_test.sh
Reviewers: igor, yhchiang, ljin, sdong
Reviewed By: sdong
Subscribers: dhruba, leveldb
Differential Revision: https://reviews.facebook.net/D20979
223 lines
6.1 KiB
C++
223 lines
6.1 KiB
C++
// Copyright (c) 2013, Facebook, Inc. All rights reserved.
|
|
// This source code is licensed under the BSD-style license found in the
|
|
// LICENSE file in the root directory of this source tree. An additional grant
|
|
// of patent rights can be found in the PATENTS file in the same directory.
|
|
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <vector>
|
|
#include <memory>
|
|
|
|
#include "include/rocksdb/db.h"
|
|
#include "include/rocksdb/options.h"
|
|
#include "include/rocksdb/env.h"
|
|
#include "include/rocksdb/slice.h"
|
|
#include "include/rocksdb/status.h"
|
|
#include "include/rocksdb/comparator.h"
|
|
#include "include/rocksdb/table.h"
|
|
#include "include/rocksdb/slice_transform.h"
|
|
#include "include/rocksdb/filter_policy.h"
|
|
|
|
namespace rocksdb {
|
|
|
|
class SanityTest {
|
|
public:
|
|
explicit SanityTest(const std::string& path)
|
|
: env_(Env::Default()), path_(path) {
|
|
env_->CreateDirIfMissing(path);
|
|
}
|
|
virtual ~SanityTest() {}
|
|
|
|
virtual std::string Name() const = 0;
|
|
virtual Options GetOptions() const = 0;
|
|
|
|
Status Create() {
|
|
Options options = GetOptions();
|
|
options.create_if_missing = true;
|
|
std::string dbname = path_ + Name();
|
|
DestroyDB(dbname, options);
|
|
DB* db;
|
|
Status s = DB::Open(options, dbname, &db);
|
|
std::unique_ptr<DB> db_guard(db);
|
|
if (!s.ok()) {
|
|
return s;
|
|
}
|
|
for (int i = 0; i < 1000000; ++i) {
|
|
std::string k = "key" + std::to_string(i);
|
|
std::string v = "value" + std::to_string(i);
|
|
s = db->Put(WriteOptions(), Slice(k), Slice(v));
|
|
if (!s.ok()) {
|
|
return s;
|
|
}
|
|
}
|
|
return Status::OK();
|
|
}
|
|
Status Verify() {
|
|
DB* db;
|
|
std::string dbname = path_ + Name();
|
|
Status s = DB::Open(GetOptions(), dbname, &db);
|
|
std::unique_ptr<DB> db_guard(db);
|
|
if (!s.ok()) {
|
|
return s;
|
|
}
|
|
for (int i = 0; i < 1000000; ++i) {
|
|
std::string k = "key" + std::to_string(i);
|
|
std::string v = "value" + std::to_string(i);
|
|
std::string result;
|
|
s = db->Get(ReadOptions(), Slice(k), &result);
|
|
if (!s.ok()) {
|
|
return s;
|
|
}
|
|
if (result != v) {
|
|
return Status::Corruption("Unexpected value for key " + k);
|
|
}
|
|
}
|
|
return Status::OK();
|
|
}
|
|
|
|
private:
|
|
Env* env_;
|
|
std::string const path_;
|
|
};
|
|
|
|
class SanityTestBasic : public SanityTest {
|
|
public:
|
|
explicit SanityTestBasic(const std::string& path) : SanityTest(path) {}
|
|
virtual Options GetOptions() const {
|
|
Options options;
|
|
options.create_if_missing = true;
|
|
return options;
|
|
}
|
|
virtual std::string Name() const { return "Basic"; }
|
|
};
|
|
|
|
class SanityTestSpecialComparator : public SanityTest {
|
|
public:
|
|
explicit SanityTestSpecialComparator(const std::string& path)
|
|
: SanityTest(path) {
|
|
options_.comparator = new NewComparator();
|
|
}
|
|
~SanityTestSpecialComparator() { delete options_.comparator; }
|
|
virtual Options GetOptions() const { return options_; }
|
|
virtual std::string Name() const { return "SpecialComparator"; }
|
|
|
|
private:
|
|
class NewComparator : public Comparator {
|
|
public:
|
|
virtual const char* Name() const { return "rocksdb.NewComparator"; }
|
|
virtual int Compare(const Slice& a, const Slice& b) const {
|
|
return BytewiseComparator()->Compare(a, b);
|
|
}
|
|
virtual void FindShortestSeparator(std::string* s, const Slice& l) const {
|
|
BytewiseComparator()->FindShortestSeparator(s, l);
|
|
}
|
|
virtual void FindShortSuccessor(std::string* key) const {
|
|
BytewiseComparator()->FindShortSuccessor(key);
|
|
}
|
|
};
|
|
Options options_;
|
|
};
|
|
|
|
class SanityTestZlibCompression : public SanityTest {
|
|
public:
|
|
explicit SanityTestZlibCompression(const std::string& path)
|
|
: SanityTest(path) {
|
|
options_.compression = kZlibCompression;
|
|
}
|
|
virtual Options GetOptions() const { return options_; }
|
|
virtual std::string Name() const { return "ZlibCompression"; }
|
|
|
|
private:
|
|
Options options_;
|
|
};
|
|
|
|
class SanityTestPlainTableFactory : public SanityTest {
|
|
public:
|
|
explicit SanityTestPlainTableFactory(const std::string& path)
|
|
: SanityTest(path) {
|
|
options_.table_factory.reset(NewPlainTableFactory());
|
|
options_.prefix_extractor.reset(NewFixedPrefixTransform(2));
|
|
options_.allow_mmap_reads = true;
|
|
}
|
|
~SanityTestPlainTableFactory() {}
|
|
virtual Options GetOptions() const { return options_; }
|
|
virtual std::string Name() const { return "PlainTable"; }
|
|
|
|
private:
|
|
Options options_;
|
|
};
|
|
|
|
class SanityTestBloomFilter : public SanityTest {
|
|
public:
|
|
explicit SanityTestBloomFilter(const std::string& path)
|
|
: SanityTest(path) {
|
|
table_options_.filter_policy.reset(NewBloomFilterPolicy(10));
|
|
options_.table_factory.reset(NewBlockBasedTableFactory(table_options_));
|
|
}
|
|
~SanityTestBloomFilter() {}
|
|
virtual Options GetOptions() const { return options_; }
|
|
virtual std::string Name() const { return "BloomFilter"; }
|
|
|
|
private:
|
|
Options options_;
|
|
BlockBasedTableOptions table_options_;
|
|
};
|
|
|
|
namespace {
|
|
bool RunSanityTests(const std::string& command, const std::string& path) {
|
|
std::vector<SanityTest*> sanity_tests = {
|
|
new SanityTestBasic(path),
|
|
new SanityTestSpecialComparator(path),
|
|
new SanityTestZlibCompression(path),
|
|
new SanityTestPlainTableFactory(path),
|
|
new SanityTestBloomFilter(path)};
|
|
|
|
if (command == "create") {
|
|
fprintf(stderr, "Creating...\n");
|
|
} else {
|
|
fprintf(stderr, "Verifying...\n");
|
|
}
|
|
for (auto sanity_test : sanity_tests) {
|
|
Status s;
|
|
fprintf(stderr, "%s -- ", sanity_test->Name().c_str());
|
|
if (command == "create") {
|
|
s = sanity_test->Create();
|
|
} else {
|
|
assert(command == "verify");
|
|
s = sanity_test->Verify();
|
|
}
|
|
fprintf(stderr, "%s\n", s.ToString().c_str());
|
|
if (!s.ok()) {
|
|
fprintf(stderr, "FAIL\n");
|
|
return false;
|
|
}
|
|
|
|
delete sanity_test;
|
|
}
|
|
return true;
|
|
}
|
|
} // namespace
|
|
|
|
} // namespace rocksdb
|
|
|
|
int main(int argc, char** argv) {
|
|
std::string path, command;
|
|
bool ok = (argc == 3);
|
|
if (ok) {
|
|
path = std::string(argv[1]);
|
|
command = std::string(argv[2]);
|
|
ok = (command == "create" || command == "verify");
|
|
}
|
|
if (!ok) {
|
|
fprintf(stderr, "Usage: %s <path> [create|verify] \n", argv[0]);
|
|
exit(1);
|
|
}
|
|
if (path.back() != '/') {
|
|
path += "/";
|
|
}
|
|
|
|
bool sanity_ok = rocksdb::RunSanityTests(command, path);
|
|
|
|
return sanity_ok ? 0 : 1;
|
|
}
|