NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PrefixExtractorChanged: pass raw pointer instead shared_ptr

Browse Source 
Summary:
This should resolve the performance regression caused by the unnecessary copying of the shared_ptr.
Closes https://github.com/facebook/rocksdb/pull/3937

Differential Revision: D8232330

Pulled By: miasantreble

fbshipit-source-id: 7885bf7cd190b6f87164c52d6edd328298c13f97
main
Zhongyi Xie 7 years ago committed by Facebook Github Bot
parent 44cf84932f
commit 2a0dfaa044
1 changed files with 6 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      table/block_based_table_reader.cc

10
table/block_based_table_reader.cc
Unescape View File

@ -177,7 +177,7 @@ Cache::Handle* GetEntryFromCache(Cache* block_cache, const Slice& key,
// prefix_extractor_block mismatch, false otherwise. This flag will be used // prefix_extractor_block mismatch, false otherwise. This flag will be used
// as total_order_seek via NewIndexIterator // as total_order_seek via NewIndexIterator
bool PrefixExtractorChanged( bool PrefixExtractorChanged(
std::shared_ptr<const TableProperties> table_properties, const TableProperties* table_properties,
const SliceTransform* prefix_extractor) { const SliceTransform* prefix_extractor) {
// BlockBasedTableOptions::kHashSearch requires prefix_extractor to be set. // BlockBasedTableOptions::kHashSearch requires prefix_extractor to be set.
// Turn off hash index in prefix_extractor is not set; if prefix_extractor // Turn off hash index in prefix_extractor is not set; if prefix_extractor
@ -913,7 +913,8 @@ Status BlockBasedTable::Open(const ImmutableCFOptions& ioptions,
// check prefix_extractor match only if hash based index is used // check prefix_extractor match only if hash based index is used
if (rep->index_type == BlockBasedTableOptions::kHashSearch) { if (rep->index_type == BlockBasedTableOptions::kHashSearch) {
prefix_extractor_changed = prefix_extractor_changed =
PrefixExtractorChanged(rep->table_properties, prefix_extractor); PrefixExtractorChanged(rep->table_properties.get(),
prefix_extractor);
} }
unique_ptr<InternalIterator> iter(new_table->NewIndexIterator( unique_ptr<InternalIterator> iter(new_table->NewIndexIterator(
ReadOptions(), prefix_extractor_changed, nullptr, &index_entry)); ReadOptions(), prefix_extractor_changed, nullptr, &index_entry));
@ -2062,7 +2063,7 @@ InternalIterator* BlockBasedTable::NewIterator(
const ReadOptions& read_options, const SliceTransform* prefix_extractor, const ReadOptions& read_options, const SliceTransform* prefix_extractor,
Arena* arena, bool skip_filters) { Arena* arena, bool skip_filters) {
bool prefix_extractor_changed = bool prefix_extractor_changed =
PrefixExtractorChanged(rep_->table_properties, prefix_extractor); PrefixExtractorChanged(rep_->table_properties.get(), prefix_extractor);
const bool kIsNotIndex = false; const bool kIsNotIndex = false;
if (arena == nullptr) { if (arena == nullptr) {
return new BlockBasedTableIterator( return new BlockBasedTableIterator(
@ -2171,7 +2172,8 @@ Status BlockBasedTable::Get(const ReadOptions& read_options, const Slice& key,
bool prefix_extractor_changed = false; bool prefix_extractor_changed = false;
if (rep_->index_type == BlockBasedTableOptions::kHashSearch) { if (rep_->index_type == BlockBasedTableOptions::kHashSearch) {
prefix_extractor_changed = prefix_extractor_changed =
PrefixExtractorChanged(rep_->table_properties, prefix_extractor); PrefixExtractorChanged(rep_->table_properties.get(),
prefix_extractor);
} }
auto iiter = NewIndexIterator(read_options, prefix_extractor_changed, auto iiter = NewIndexIterator(read_options, prefix_extractor_changed,
&iiter_on_stack, /* index_entry */ nullptr, &iiter_on_stack, /* index_entry */ nullptr,

Write Preview
Loading…
Cancel
Save