diff options
| author | Yi Wu <yiwu@fb.com> | 2018-10-26 14:27:09 -0700 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2018-10-26 14:30:30 -0700 |
| commit | f560c8f5c8904ee36782c8acbe027c8bbfc8175d (patch) | |
| tree | 3e7a652d8ab5375326c2096ce01b7633e57cca38 /table/format.cc | |
| parent | 7528130e383d7dbc889f18005d00942ea47118cd (diff) | |
s/CacheAllocator/MemoryAllocator/g (#4590)
Summary:
Rename the interface, as it is mean to be a generic interface for memory allocation.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4590
Differential Revision: D10866340
Pulled By: yiwu-arbug
fbshipit-source-id: 85cb753351a40cb856c046aeaa3f3b369eef3d16
Diffstat (limited to 'table/format.cc')
| -rw-r--r-- | table/format.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/table/format.cc b/table/format.cc index 3eaa97065..62f5ab6dc 100644 --- a/table/format.cc +++ b/table/format.cc @@ -19,12 +19,12 @@ #include "table/block_based_table_reader.h" #include "table/block_fetcher.h" #include "table/persistent_cache_helper.h" -#include "util/cache_allocator.h" #include "util/coding.h" #include "util/compression.h" #include "util/crc32c.h" #include "util/file_reader_writer.h" #include "util/logging.h" +#include "util/memory_allocator.h" #include "util/stop_watch.h" #include "util/string_util.h" #include "util/xxhash.h" @@ -280,7 +280,7 @@ Status ReadFooterFromFile(RandomAccessFileReader* file, Status UncompressBlockContentsForCompressionType( const UncompressionContext& uncompression_ctx, const char* data, size_t n, BlockContents* contents, uint32_t format_version, - const ImmutableCFOptions& ioptions, CacheAllocator* allocator) { + const ImmutableCFOptions& ioptions, MemoryAllocator* allocator) { CacheAllocationPtr ubuf; assert(uncompression_ctx.type() != kNoCompression && @@ -405,7 +405,7 @@ Status UncompressBlockContents(const UncompressionContext& uncompression_ctx, const char* data, size_t n, BlockContents* contents, uint32_t format_version, const ImmutableCFOptions& ioptions, - CacheAllocator* allocator) { + MemoryAllocator* allocator) { assert(data[n] != kNoCompression); assert(data[n] == uncompression_ctx.type()); return UncompressBlockContentsForCompressionType(uncompression_ctx, data, n, |