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

Refactor MultiGet names in BlockBasedTable (#5726)

Browse Source 
Summary:
To improve code readability, since RetrieveBlock already calls MaybeReadBlockAndLoadToCache, we avoid name similarity of the functions that call RetrieveBlock with MaybeReadBlockAndLoadToCache. The patch thus renames MaybeLoadBlocksToCache to RetrieveMultipleBlock and deletes GetDataBlockFromCache, which contains only two lines.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5726

Differential Revision: D16962535

Pulled By: maysamyabandeh

fbshipit-source-id: 99e8946808ce4eb7857592b9003812e3004f92d6
This commit is contained in:
Maysam Yabandeh 2019-08-22 08:47:36 -07:00 committed by Facebook Github Bot
parent 9046bdc5d3
commit 244e6f2002
2 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
table/block_based/block_based_table_reader.cc
View File

@ -2080,27 +2080,6 @@ TBlockIter* BlockBasedTable::NewDataBlockIterator(
return iter; return iter;
} }
// Lookup the cache for the given data block referenced by an index iterator
// value (i.e BlockHandle). If it exists in the cache, initialize block to
// the contents of the data block.
Status BlockBasedTable::GetDataBlockFromCache(
const ReadOptions& ro, const BlockHandle& handle,
const UncompressionDict& uncompression_dict,
CachableEntry<Block>* block, BlockType block_type,
GetContext* get_context) const {
BlockCacheLookupContext lookup_data_block_context(
TableReaderCaller::kUserMultiGet);
assert(block_type == BlockType::kData);
Status s = RetrieveBlock(nullptr, ro, handle, uncompression_dict, block,
block_type, get_context, &lookup_data_block_context,
/* for_compaction */ false, /* use_cache */ true);
if (s.IsIncomplete()) {
s = Status::OK();
}
return s;
}
// If contents is nullptr, this function looks up the block caches for the // If contents is nullptr, this function looks up the block caches for the
// data block referenced by handle, and read the block from disk if necessary. // data block referenced by handle, and read the block from disk if necessary.
// If contents is non-null, it skips the cache lookup and disk read, since // If contents is non-null, it skips the cache lookup and disk read, since
@ -2275,7 +2254,7 @@ Status BlockBasedTable::MaybeReadBlockAndLoadToCache(
// found in cache // found in cache
// handles - A vector of block handles. Some of them me be NULL handles // handles - A vector of block handles. Some of them me be NULL handles
// scratch - An optional contiguous buffer to read compressed blocks into // scratch - An optional contiguous buffer to read compressed blocks into
void BlockBasedTable::MaybeLoadBlocksToCache( void BlockBasedTable::RetrieveMultipleBlocks(
const ReadOptions& options, const ReadOptions& options,
const MultiGetRange* batch, const MultiGetRange* batch,
const autovector<BlockHandle, MultiGetContext::MAX_BATCH_SIZE>* handles, const autovector<BlockHandle, MultiGetContext::MAX_BATCH_SIZE>* handles,
@ -3441,10 +3420,20 @@ void BlockBasedTable::MultiGet(const ReadOptions& read_options,
block_handles.emplace_back(BlockHandle::NullBlockHandle()); block_handles.emplace_back(BlockHandle::NullBlockHandle());
continue; continue;
} }
// Lookup the cache for the given data block referenced by an index
// iterator value (i.e BlockHandle). If it exists in the cache,
// initialize block to the contents of the data block.
offset = v.handle.offset(); offset = v.handle.offset();
BlockHandle handle = v.handle; BlockHandle handle = v.handle;
Status s = GetDataBlockFromCache(ro, handle, uncompression_dict, BlockCacheLookupContext lookup_data_block_context(
&(results.back()), BlockType::kData, miter->get_context); TableReaderCaller::kUserMultiGet);
Status s = RetrieveBlock(nullptr, ro, handle, uncompression_dict,
&(results.back()), BlockType::kData,
miter->get_context, &lookup_data_block_context,
/* for_compaction */ false, /* use_cache */ true);
if (s.IsIncomplete()) {
s = Status::OK();
}
if (s.ok() && !results.back().IsEmpty()) { if (s.ok() && !results.back().IsEmpty()) {
// Found it in the cache. Add NULL handle to indicate there is // Found it in the cache. Add NULL handle to indicate there is
// nothing to read from disk // nothing to read from disk
@ -3475,7 +3464,7 @@ void BlockBasedTable::MultiGet(const ReadOptions& read_options,
block_buf.reset(scratch); block_buf.reset(scratch);
} }
} }
MaybeLoadBlocksToCache(read_options, RetrieveMultipleBlocks(read_options,
&data_block_range, &block_handles, &statuses, &results, &data_block_range, &block_handles, &statuses, &results,
scratch, uncompression_dict); scratch, uncompression_dict);
} }

8
table/block_based/block_based_table_reader.h
View File

@ -316,13 +316,7 @@ class BlockBasedTable : public TableReader {
BlockCacheLookupContext* lookup_context, BlockCacheLookupContext* lookup_context,
bool for_compaction, bool use_cache) const; bool for_compaction, bool use_cache) const;
Status GetDataBlockFromCache( void RetrieveMultipleBlocks(
const ReadOptions& ro, const BlockHandle& handle,
const UncompressionDict& uncompression_dict,
CachableEntry<Block>* block_entry, BlockType block_type,
GetContext* get_context) const;
void MaybeLoadBlocksToCache(
const ReadOptions& options, const MultiGetRange* batch, const ReadOptions& options, const MultiGetRange* batch,
const autovector<BlockHandle, MultiGetContext::MAX_BATCH_SIZE>* handles, const autovector<BlockHandle, MultiGetContext::MAX_BATCH_SIZE>* handles,
autovector<Status, MultiGetContext::MAX_BATCH_SIZE>* statuses, autovector<Status, MultiGetContext::MAX_BATCH_SIZE>* statuses,