2016-02-09 23:12:00 +00:00
|
|
|
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
|
2014-06-18 23:36:48 +00:00
|
|
|
// 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.
|
2013-10-29 03:34:02 +00:00
|
|
|
|
2014-04-15 20:39:26 +00:00
|
|
|
#ifndef ROCKSDB_LITE
|
2013-10-29 03:34:02 +00:00
|
|
|
#include "table/plain_table_builder.h"
|
|
|
|
|
|
|
|
#include <assert.h>
|
2014-11-11 21:47:22 +00:00
|
|
|
|
|
|
|
#include <string>
|
|
|
|
#include <limits>
|
2013-10-29 03:34:02 +00:00
|
|
|
#include <map>
|
|
|
|
|
|
|
|
#include "rocksdb/comparator.h"
|
|
|
|
#include "rocksdb/env.h"
|
|
|
|
#include "rocksdb/filter_policy.h"
|
|
|
|
#include "rocksdb/options.h"
|
2014-06-18 23:36:48 +00:00
|
|
|
#include "rocksdb/table.h"
|
2014-01-27 21:53:22 +00:00
|
|
|
#include "table/plain_table_factory.h"
|
|
|
|
#include "db/dbformat.h"
|
2013-10-29 03:34:02 +00:00
|
|
|
#include "table/block_builder.h"
|
2014-07-18 23:58:13 +00:00
|
|
|
#include "table/bloom_block.h"
|
|
|
|
#include "table/plain_table_index.h"
|
2013-10-29 03:34:02 +00:00
|
|
|
#include "table/format.h"
|
2013-12-06 00:51:26 +00:00
|
|
|
#include "table/meta_blocks.h"
|
2013-10-29 03:34:02 +00:00
|
|
|
#include "util/coding.h"
|
|
|
|
#include "util/crc32c.h"
|
Move rate_limiter, write buffering, most perf context instrumentation and most random kill out of Env
Summary: We want to keep Env a think layer for better portability. Less platform dependent codes should be moved out of Env. In this patch, I create a wrapper of file readers and writers, and put rate limiting, write buffering, as well as most perf context instrumentation and random kill out of Env. It will make it easier to maintain multiple Env in the future.
Test Plan: Run all existing unit tests.
Reviewers: anthony, kradhakrishnan, IslamAbdelRahman, yhchiang, igor
Reviewed By: igor
Subscribers: leveldb, dhruba
Differential Revision: https://reviews.facebook.net/D42321
2015-07-17 23:16:11 +00:00
|
|
|
#include "util/file_reader_writer.h"
|
2013-10-29 03:34:02 +00:00
|
|
|
#include "util/stop_watch.h"
|
|
|
|
|
|
|
|
namespace rocksdb {
|
|
|
|
|
2013-12-06 00:51:26 +00:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
// a utility that helps writing block content to the file
|
|
|
|
// @offset will advance if @block_contents was successfully written.
|
|
|
|
// @block_handle the block handle this particular block.
|
Move rate_limiter, write buffering, most perf context instrumentation and most random kill out of Env
Summary: We want to keep Env a think layer for better portability. Less platform dependent codes should be moved out of Env. In this patch, I create a wrapper of file readers and writers, and put rate limiting, write buffering, as well as most perf context instrumentation and random kill out of Env. It will make it easier to maintain multiple Env in the future.
Test Plan: Run all existing unit tests.
Reviewers: anthony, kradhakrishnan, IslamAbdelRahman, yhchiang, igor
Reviewed By: igor
Subscribers: leveldb, dhruba
Differential Revision: https://reviews.facebook.net/D42321
2015-07-17 23:16:11 +00:00
|
|
|
Status WriteBlock(const Slice& block_contents, WritableFileWriter* file,
|
|
|
|
uint64_t* offset, BlockHandle* block_handle) {
|
2013-12-06 00:51:26 +00:00
|
|
|
block_handle->set_offset(*offset);
|
|
|
|
block_handle->set_size(block_contents.size());
|
|
|
|
Status s = file->Append(block_contents);
|
|
|
|
|
|
|
|
if (s.ok()) {
|
|
|
|
*offset += block_contents.size();
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
// kPlainTableMagicNumber was picked by running
|
2014-05-01 18:09:32 +00:00
|
|
|
// echo rocksdb.table.plain | sha1sum
|
2013-12-06 00:51:26 +00:00
|
|
|
// and taking the leading 64 bits.
|
2014-05-01 18:09:32 +00:00
|
|
|
extern const uint64_t kPlainTableMagicNumber = 0x8242229663bf9564ull;
|
|
|
|
extern const uint64_t kLegacyPlainTableMagicNumber = 0x4f3418eb7a8f13b8ull;
|
2013-12-06 00:51:26 +00:00
|
|
|
|
2014-07-18 23:58:13 +00:00
|
|
|
PlainTableBuilder::PlainTableBuilder(
|
A new call back to TablePropertiesCollector to allow users know the entry is add, delete or merge
Summary:
Currently users have no idea a key is add, delete or merge from TablePropertiesCollector call back. Add a new function to add it.
Also refactor the codes so that
(1) make table property collector and internal table property collector two separate data structures with the later one now exposed
(2) table builders only receive internal table properties
Test Plan: Add cases in table_properties_collector_test to cover both of old and new ways of using TablePropertiesCollector.
Reviewers: yhchiang, igor.sugak, rven, igor
Reviewed By: rven, igor
Subscribers: meyering, yoshinorim, maykov, leveldb, dhruba
Differential Revision: https://reviews.facebook.net/D35373
2015-04-06 17:04:30 +00:00
|
|
|
const ImmutableCFOptions& ioptions,
|
|
|
|
const std::vector<std::unique_ptr<IntTblPropCollectorFactory>>*
|
|
|
|
int_tbl_prop_collector_factories,
|
2015-10-08 23:57:35 +00:00
|
|
|
uint32_t column_family_id, WritableFileWriter* file, uint32_t user_key_len,
|
|
|
|
EncodingType encoding_type, size_t index_sparseness,
|
2016-04-07 06:10:32 +00:00
|
|
|
uint32_t bloom_bits_per_key, const std::string& column_family_name,
|
|
|
|
uint32_t num_probes, size_t huge_page_tlb_size, double hash_table_ratio,
|
|
|
|
bool store_index_in_file)
|
2014-09-04 23:18:36 +00:00
|
|
|
: ioptions_(ioptions),
|
2014-07-18 23:58:13 +00:00
|
|
|
bloom_block_(num_probes),
|
2014-06-18 23:36:48 +00:00
|
|
|
file_(file),
|
2014-07-18 23:58:13 +00:00
|
|
|
bloom_bits_per_key_(bloom_bits_per_key),
|
|
|
|
huge_page_tlb_size_(huge_page_tlb_size),
|
2014-09-04 23:18:36 +00:00
|
|
|
encoder_(encoding_type, user_key_len, ioptions.prefix_extractor,
|
2014-07-18 23:58:13 +00:00
|
|
|
index_sparseness),
|
|
|
|
store_index_in_file_(store_index_in_file),
|
2014-09-04 23:18:36 +00:00
|
|
|
prefix_extractor_(ioptions.prefix_extractor) {
|
2014-07-18 23:58:13 +00:00
|
|
|
// Build index block and save it in the file if hash_table_ratio > 0
|
|
|
|
if (store_index_in_file_) {
|
|
|
|
assert(hash_table_ratio > 0 || IsTotalOrderMode());
|
|
|
|
index_builder_.reset(
|
2014-09-04 23:18:36 +00:00
|
|
|
new PlainTableIndexBuilder(&arena_, ioptions, index_sparseness,
|
2014-07-18 23:58:13 +00:00
|
|
|
hash_table_ratio, huge_page_tlb_size_));
|
|
|
|
assert(bloom_bits_per_key_ > 0);
|
|
|
|
properties_.user_collected_properties
|
|
|
|
[PlainTablePropertyNames::kBloomVersion] = "1"; // For future use
|
|
|
|
}
|
|
|
|
|
2013-12-20 17:35:24 +00:00
|
|
|
properties_.fixed_key_len = user_key_len;
|
2013-10-29 03:34:02 +00:00
|
|
|
|
2013-12-06 00:51:26 +00:00
|
|
|
// for plain table, we put all the data in a big chuck.
|
|
|
|
properties_.num_data_blocks = 1;
|
2014-07-18 23:58:13 +00:00
|
|
|
// Fill it later if store_index_in_file_ == true
|
2013-12-06 00:51:26 +00:00
|
|
|
properties_.index_size = 0;
|
|
|
|
properties_.filter_size = 0;
|
2014-06-18 23:36:48 +00:00
|
|
|
// To support roll-back to previous version, now still use version 0 for
|
|
|
|
// plain encoding.
|
|
|
|
properties_.format_version = (encoding_type == kPlain) ? 0 : 1;
|
2016-04-07 06:10:32 +00:00
|
|
|
properties_.column_family_id = column_family_id;
|
|
|
|
properties_.column_family_name = column_family_name;
|
2014-06-18 23:36:48 +00:00
|
|
|
|
2014-09-04 23:18:36 +00:00
|
|
|
if (ioptions_.prefix_extractor) {
|
2014-06-18 23:36:48 +00:00
|
|
|
properties_.user_collected_properties
|
|
|
|
[PlainTablePropertyNames::kPrefixExtractorName] =
|
2014-09-04 23:18:36 +00:00
|
|
|
ioptions_.prefix_extractor->Name();
|
2014-06-18 23:36:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::string val;
|
|
|
|
PutFixed32(&val, static_cast<uint32_t>(encoder_.GetEncodingType()));
|
|
|
|
properties_.user_collected_properties
|
|
|
|
[PlainTablePropertyNames::kEncodingType] = val;
|
TablePropertiesCollectorFactory
Summary:
This diff addresses task #4296714 and rethinks how users provide us with TablePropertiesCollectors as part of Options.
Here's description of task #4296714:
I'm debugging #4295529 and noticed that our count of user properties kDeletedKeys is wrong. We're sharing one single InternalKeyPropertiesCollector with all Table Builders. In LOG Files, we're outputting number of kDeletedKeys as connected with a single table, while it's actually the total count of deleted keys since creation of the DB.
For example, this table has 3155 entries and 1391828 deleted keys.
The problem with current approach that we call methods on a single TablePropertiesCollector for all the tables we create. Even worse, we could do it from multiple threads at the same time and TablePropertiesCollector has no way of knowing which table we're calling it for.
Good part: Looks like nobody inside Facebook is using Options::table_properties_collectors. This means we should be able to painfully change the API.
In this change, I introduce TablePropertiesCollectorFactory. For every table we create, we call `CreateTablePropertiesCollector`, which creates a TablePropertiesCollector for a single table. We then use it sequentially from a single thread, which means it doesn't have to be thread-safe.
Test Plan:
Added a test in table_properties_collector_test that fails on master (build two tables, assert that kDeletedKeys count is correct for the second one).
Also, all other tests
Reviewers: sdong, dhruba, haobo, kailiu
Reviewed By: kailiu
CC: leveldb
Differential Revision: https://reviews.facebook.net/D18579
2014-05-13 19:30:55 +00:00
|
|
|
|
A new call back to TablePropertiesCollector to allow users know the entry is add, delete or merge
Summary:
Currently users have no idea a key is add, delete or merge from TablePropertiesCollector call back. Add a new function to add it.
Also refactor the codes so that
(1) make table property collector and internal table property collector two separate data structures with the later one now exposed
(2) table builders only receive internal table properties
Test Plan: Add cases in table_properties_collector_test to cover both of old and new ways of using TablePropertiesCollector.
Reviewers: yhchiang, igor.sugak, rven, igor
Reviewed By: rven, igor
Subscribers: meyering, yoshinorim, maykov, leveldb, dhruba
Differential Revision: https://reviews.facebook.net/D35373
2015-04-06 17:04:30 +00:00
|
|
|
for (auto& collector_factories : *int_tbl_prop_collector_factories) {
|
TablePropertiesCollectorFactory
Summary:
This diff addresses task #4296714 and rethinks how users provide us with TablePropertiesCollectors as part of Options.
Here's description of task #4296714:
I'm debugging #4295529 and noticed that our count of user properties kDeletedKeys is wrong. We're sharing one single InternalKeyPropertiesCollector with all Table Builders. In LOG Files, we're outputting number of kDeletedKeys as connected with a single table, while it's actually the total count of deleted keys since creation of the DB.
For example, this table has 3155 entries and 1391828 deleted keys.
The problem with current approach that we call methods on a single TablePropertiesCollector for all the tables we create. Even worse, we could do it from multiple threads at the same time and TablePropertiesCollector has no way of knowing which table we're calling it for.
Good part: Looks like nobody inside Facebook is using Options::table_properties_collectors. This means we should be able to painfully change the API.
In this change, I introduce TablePropertiesCollectorFactory. For every table we create, we call `CreateTablePropertiesCollector`, which creates a TablePropertiesCollector for a single table. We then use it sequentially from a single thread, which means it doesn't have to be thread-safe.
Test Plan:
Added a test in table_properties_collector_test that fails on master (build two tables, assert that kDeletedKeys count is correct for the second one).
Also, all other tests
Reviewers: sdong, dhruba, haobo, kailiu
Reviewed By: kailiu
CC: leveldb
Differential Revision: https://reviews.facebook.net/D18579
2014-05-13 19:30:55 +00:00
|
|
|
table_properties_collectors_.emplace_back(
|
2015-10-08 23:57:35 +00:00
|
|
|
collector_factories->CreateIntTblPropCollector(column_family_id));
|
TablePropertiesCollectorFactory
Summary:
This diff addresses task #4296714 and rethinks how users provide us with TablePropertiesCollectors as part of Options.
Here's description of task #4296714:
I'm debugging #4295529 and noticed that our count of user properties kDeletedKeys is wrong. We're sharing one single InternalKeyPropertiesCollector with all Table Builders. In LOG Files, we're outputting number of kDeletedKeys as connected with a single table, while it's actually the total count of deleted keys since creation of the DB.
For example, this table has 3155 entries and 1391828 deleted keys.
The problem with current approach that we call methods on a single TablePropertiesCollector for all the tables we create. Even worse, we could do it from multiple threads at the same time and TablePropertiesCollector has no way of knowing which table we're calling it for.
Good part: Looks like nobody inside Facebook is using Options::table_properties_collectors. This means we should be able to painfully change the API.
In this change, I introduce TablePropertiesCollectorFactory. For every table we create, we call `CreateTablePropertiesCollector`, which creates a TablePropertiesCollector for a single table. We then use it sequentially from a single thread, which means it doesn't have to be thread-safe.
Test Plan:
Added a test in table_properties_collector_test that fails on master (build two tables, assert that kDeletedKeys count is correct for the second one).
Also, all other tests
Reviewers: sdong, dhruba, haobo, kailiu
Reviewed By: kailiu
CC: leveldb
Differential Revision: https://reviews.facebook.net/D18579
2014-05-13 19:30:55 +00:00
|
|
|
}
|
2013-10-29 03:34:02 +00:00
|
|
|
}
|
|
|
|
|
2013-12-06 00:51:26 +00:00
|
|
|
PlainTableBuilder::~PlainTableBuilder() {
|
2013-10-29 03:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PlainTableBuilder::Add(const Slice& key, const Slice& value) {
|
2014-06-18 23:36:48 +00:00
|
|
|
// temp buffer for metadata bytes between key and value.
|
|
|
|
char meta_bytes_buf[6];
|
|
|
|
size_t meta_bytes_buf_size = 0;
|
2013-10-29 03:34:02 +00:00
|
|
|
|
2014-07-18 23:58:13 +00:00
|
|
|
ParsedInternalKey internal_key;
|
|
|
|
ParseInternalKey(key, &internal_key);
|
2016-08-19 22:10:31 +00:00
|
|
|
if (internal_key.type == kTypeRangeDeletion) {
|
|
|
|
status_ = Status::NotSupported("Range deletion unsupported");
|
|
|
|
return;
|
|
|
|
}
|
2014-07-18 23:58:13 +00:00
|
|
|
|
|
|
|
// Store key hash
|
|
|
|
if (store_index_in_file_) {
|
2014-09-04 23:18:36 +00:00
|
|
|
if (ioptions_.prefix_extractor == nullptr) {
|
2014-07-18 23:58:13 +00:00
|
|
|
keys_or_prefixes_hashes_.push_back(GetSliceHash(internal_key.user_key));
|
|
|
|
} else {
|
|
|
|
Slice prefix =
|
2014-09-04 23:18:36 +00:00
|
|
|
ioptions_.prefix_extractor->Transform(internal_key.user_key);
|
2014-07-18 23:58:13 +00:00
|
|
|
keys_or_prefixes_hashes_.push_back(GetSliceHash(prefix));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write value
|
2014-11-11 21:47:22 +00:00
|
|
|
assert(offset_ <= std::numeric_limits<uint32_t>::max());
|
|
|
|
auto prev_offset = static_cast<uint32_t>(offset_);
|
2014-06-18 23:36:48 +00:00
|
|
|
// Write out the key
|
|
|
|
encoder_.AppendKey(key, file_, &offset_, meta_bytes_buf,
|
|
|
|
&meta_bytes_buf_size);
|
2014-07-18 23:58:13 +00:00
|
|
|
if (SaveIndexInFile()) {
|
|
|
|
index_builder_->AddKeyPrefix(GetPrefix(internal_key), prev_offset);
|
|
|
|
}
|
2013-10-29 03:34:02 +00:00
|
|
|
|
2013-12-20 17:35:24 +00:00
|
|
|
// Write value length
|
2014-11-11 21:47:22 +00:00
|
|
|
uint32_t value_size = static_cast<uint32_t>(value.size());
|
2014-04-09 16:44:23 +00:00
|
|
|
char* end_ptr =
|
2014-06-18 23:36:48 +00:00
|
|
|
EncodeVarint32(meta_bytes_buf + meta_bytes_buf_size, value_size);
|
|
|
|
assert(end_ptr <= meta_bytes_buf + sizeof(meta_bytes_buf));
|
|
|
|
meta_bytes_buf_size = end_ptr - meta_bytes_buf;
|
|
|
|
file_->Append(Slice(meta_bytes_buf, meta_bytes_buf_size));
|
2013-12-20 17:35:24 +00:00
|
|
|
|
|
|
|
// Write value
|
2013-10-29 03:34:02 +00:00
|
|
|
file_->Append(value);
|
2014-06-18 23:36:48 +00:00
|
|
|
offset_ += value_size + meta_bytes_buf_size;
|
2013-10-29 03:34:02 +00:00
|
|
|
|
2013-12-06 00:51:26 +00:00
|
|
|
properties_.num_entries++;
|
|
|
|
properties_.raw_key_size += key.size();
|
|
|
|
properties_.raw_value_size += value.size();
|
|
|
|
|
|
|
|
// notify property collectors
|
A new call back to TablePropertiesCollector to allow users know the entry is add, delete or merge
Summary:
Currently users have no idea a key is add, delete or merge from TablePropertiesCollector call back. Add a new function to add it.
Also refactor the codes so that
(1) make table property collector and internal table property collector two separate data structures with the later one now exposed
(2) table builders only receive internal table properties
Test Plan: Add cases in table_properties_collector_test to cover both of old and new ways of using TablePropertiesCollector.
Reviewers: yhchiang, igor.sugak, rven, igor
Reviewed By: rven, igor
Subscribers: meyering, yoshinorim, maykov, leveldb, dhruba
Differential Revision: https://reviews.facebook.net/D35373
2015-04-06 17:04:30 +00:00
|
|
|
NotifyCollectTableCollectorsOnAdd(
|
|
|
|
key, value, offset_, table_properties_collectors_, ioptions_.info_log);
|
2013-10-29 03:34:02 +00:00
|
|
|
}
|
|
|
|
|
2014-01-27 21:53:22 +00:00
|
|
|
Status PlainTableBuilder::status() const { return status_; }
|
2013-10-29 03:34:02 +00:00
|
|
|
|
|
|
|
Status PlainTableBuilder::Finish() {
|
|
|
|
assert(!closed_);
|
|
|
|
closed_ = true;
|
2013-12-06 00:51:26 +00:00
|
|
|
|
|
|
|
properties_.data_size = offset_;
|
|
|
|
|
2014-07-18 23:58:13 +00:00
|
|
|
// Write the following blocks
|
|
|
|
// 1. [meta block: bloom] - optional
|
|
|
|
// 2. [meta block: index] - optional
|
|
|
|
// 3. [meta block: properties]
|
|
|
|
// 4. [metaindex block]
|
|
|
|
// 5. [footer]
|
|
|
|
|
2013-12-06 00:51:26 +00:00
|
|
|
MetaIndexBuilder meta_index_builer;
|
|
|
|
|
2014-07-18 23:58:13 +00:00
|
|
|
if (store_index_in_file_ && (properties_.num_entries > 0)) {
|
2014-11-11 21:47:22 +00:00
|
|
|
assert(properties_.num_entries <= std::numeric_limits<uint32_t>::max());
|
2014-07-18 23:58:13 +00:00
|
|
|
bloom_block_.SetTotalBits(
|
2014-11-11 21:47:22 +00:00
|
|
|
&arena_,
|
|
|
|
static_cast<uint32_t>(properties_.num_entries) * bloom_bits_per_key_,
|
|
|
|
ioptions_.bloom_locality, huge_page_tlb_size_, ioptions_.info_log);
|
2014-07-18 23:58:13 +00:00
|
|
|
|
|
|
|
PutVarint32(&properties_.user_collected_properties
|
|
|
|
[PlainTablePropertyNames::kNumBloomBlocks],
|
|
|
|
bloom_block_.GetNumBlocks());
|
|
|
|
|
|
|
|
bloom_block_.AddKeysHashes(keys_or_prefixes_hashes_);
|
|
|
|
BlockHandle bloom_block_handle;
|
|
|
|
auto finish_result = bloom_block_.Finish();
|
|
|
|
|
|
|
|
properties_.filter_size = finish_result.size();
|
|
|
|
auto s = WriteBlock(finish_result, file_, &offset_, &bloom_block_handle);
|
|
|
|
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
BlockHandle index_block_handle;
|
|
|
|
finish_result = index_builder_->Finish();
|
|
|
|
|
|
|
|
properties_.index_size = finish_result.size();
|
|
|
|
s = WriteBlock(finish_result, file_, &offset_, &index_block_handle);
|
|
|
|
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
meta_index_builer.Add(BloomBlockBuilder::kBloomBlock, bloom_block_handle);
|
|
|
|
meta_index_builer.Add(PlainTableIndexBuilder::kPlainTableIndexBlock,
|
|
|
|
index_block_handle);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Calculate bloom block size and index block size
|
2013-12-06 00:51:26 +00:00
|
|
|
PropertyBlockBuilder property_block_builder;
|
|
|
|
// -- Add basic properties
|
|
|
|
property_block_builder.AddTableProperty(properties_);
|
|
|
|
|
2014-06-18 23:36:48 +00:00
|
|
|
property_block_builder.Add(properties_.user_collected_properties);
|
|
|
|
|
2013-12-06 00:51:26 +00:00
|
|
|
// -- Add user collected properties
|
TablePropertiesCollectorFactory
Summary:
This diff addresses task #4296714 and rethinks how users provide us with TablePropertiesCollectors as part of Options.
Here's description of task #4296714:
I'm debugging #4295529 and noticed that our count of user properties kDeletedKeys is wrong. We're sharing one single InternalKeyPropertiesCollector with all Table Builders. In LOG Files, we're outputting number of kDeletedKeys as connected with a single table, while it's actually the total count of deleted keys since creation of the DB.
For example, this table has 3155 entries and 1391828 deleted keys.
The problem with current approach that we call methods on a single TablePropertiesCollector for all the tables we create. Even worse, we could do it from multiple threads at the same time and TablePropertiesCollector has no way of knowing which table we're calling it for.
Good part: Looks like nobody inside Facebook is using Options::table_properties_collectors. This means we should be able to painfully change the API.
In this change, I introduce TablePropertiesCollectorFactory. For every table we create, we call `CreateTablePropertiesCollector`, which creates a TablePropertiesCollector for a single table. We then use it sequentially from a single thread, which means it doesn't have to be thread-safe.
Test Plan:
Added a test in table_properties_collector_test that fails on master (build two tables, assert that kDeletedKeys count is correct for the second one).
Also, all other tests
Reviewers: sdong, dhruba, haobo, kailiu
Reviewed By: kailiu
CC: leveldb
Differential Revision: https://reviews.facebook.net/D18579
2014-05-13 19:30:55 +00:00
|
|
|
NotifyCollectTableCollectorsOnFinish(table_properties_collectors_,
|
2014-09-04 23:18:36 +00:00
|
|
|
ioptions_.info_log,
|
TablePropertiesCollectorFactory
Summary:
This diff addresses task #4296714 and rethinks how users provide us with TablePropertiesCollectors as part of Options.
Here's description of task #4296714:
I'm debugging #4295529 and noticed that our count of user properties kDeletedKeys is wrong. We're sharing one single InternalKeyPropertiesCollector with all Table Builders. In LOG Files, we're outputting number of kDeletedKeys as connected with a single table, while it's actually the total count of deleted keys since creation of the DB.
For example, this table has 3155 entries and 1391828 deleted keys.
The problem with current approach that we call methods on a single TablePropertiesCollector for all the tables we create. Even worse, we could do it from multiple threads at the same time and TablePropertiesCollector has no way of knowing which table we're calling it for.
Good part: Looks like nobody inside Facebook is using Options::table_properties_collectors. This means we should be able to painfully change the API.
In this change, I introduce TablePropertiesCollectorFactory. For every table we create, we call `CreateTablePropertiesCollector`, which creates a TablePropertiesCollector for a single table. We then use it sequentially from a single thread, which means it doesn't have to be thread-safe.
Test Plan:
Added a test in table_properties_collector_test that fails on master (build two tables, assert that kDeletedKeys count is correct for the second one).
Also, all other tests
Reviewers: sdong, dhruba, haobo, kailiu
Reviewed By: kailiu
CC: leveldb
Differential Revision: https://reviews.facebook.net/D18579
2014-05-13 19:30:55 +00:00
|
|
|
&property_block_builder);
|
2013-12-06 00:51:26 +00:00
|
|
|
|
|
|
|
// -- Write property block
|
|
|
|
BlockHandle property_block_handle;
|
|
|
|
auto s = WriteBlock(
|
|
|
|
property_block_builder.Finish(),
|
|
|
|
file_,
|
|
|
|
&offset_,
|
|
|
|
&property_block_handle
|
|
|
|
);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
meta_index_builer.Add(kPropertiesBlock, property_block_handle);
|
|
|
|
|
|
|
|
// -- write metaindex block
|
|
|
|
BlockHandle metaindex_block_handle;
|
|
|
|
s = WriteBlock(
|
|
|
|
meta_index_builer.Finish(),
|
|
|
|
file_,
|
|
|
|
&offset_,
|
|
|
|
&metaindex_block_handle
|
|
|
|
);
|
|
|
|
if (!s.ok()) {
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write Footer
|
2014-05-01 18:09:32 +00:00
|
|
|
// no need to write out new footer if we're using default checksum
|
2015-01-13 22:33:04 +00:00
|
|
|
Footer footer(kLegacyPlainTableMagicNumber, 0);
|
2013-12-06 00:51:26 +00:00
|
|
|
footer.set_metaindex_handle(metaindex_block_handle);
|
|
|
|
footer.set_index_handle(BlockHandle::NullBlockHandle());
|
|
|
|
std::string footer_encoding;
|
|
|
|
footer.EncodeTo(&footer_encoding);
|
|
|
|
s = file_->Append(footer_encoding);
|
|
|
|
if (s.ok()) {
|
|
|
|
offset_ += footer_encoding.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
return s;
|
2013-10-29 03:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PlainTableBuilder::Abandon() {
|
|
|
|
closed_ = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t PlainTableBuilder::NumEntries() const {
|
2013-12-06 00:51:26 +00:00
|
|
|
return properties_.num_entries;
|
2013-10-29 03:34:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t PlainTableBuilder::FileSize() const {
|
|
|
|
return offset_;
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace rocksdb
|
2014-04-15 20:39:26 +00:00
|
|
|
#endif // ROCKSDB_LITE
|