From 0c2d71edbae7e0ce16a1d1cbfcdf2f76c46e59cc Mon Sep 17 00:00:00 2001 From: Ziyue Yang Date: Thu, 18 Feb 2021 14:29:36 -0800 Subject: [PATCH] Fix typo: replace readadhead with readahead (#7953) Summary: This PR replaces several "readadhead" typos with "readahead". Pull Request resolved: https://github.com/facebook/rocksdb/pull/7953 Reviewed By: ajkr Differential Revision: D26518903 Pulled By: jay-zhuang fbshipit-source-id: 6f7dece0e39ec4f71c4a936399bcb2e02574f42a --- file/file_prefetch_buffer.cc | 2 +- file/file_prefetch_buffer.h | 8 ++++---- file/file_util.cc | 2 +- table/block_based/block_based_table_reader.cc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/file/file_prefetch_buffer.cc b/file/file_prefetch_buffer.cc index 218983254..6368695bb 100644 --- a/file/file_prefetch_buffer.cc +++ b/file/file_prefetch_buffer.cc @@ -119,7 +119,7 @@ bool FilePrefetchBuffer::TryReadFromCache(const IOOptions& opts, } // If the buffer contains only a few of the requested bytes: - // If readahead is enabled: prefetch the remaining bytes + readadhead bytes + // If readahead is enabled: prefetch the remaining bytes + readahead bytes // and satisfy the request. // If readahead is not enabled: return false. if (offset + n > buffer_offset_ + buffer_.CurrentSize()) { diff --git a/file/file_prefetch_buffer.h b/file/file_prefetch_buffer.h index 5532e79df..504b36b07 100644 --- a/file/file_prefetch_buffer.h +++ b/file/file_prefetch_buffer.h @@ -41,16 +41,16 @@ class FilePrefetchBuffer { // // Automatic readhead is enabled for a file if file_reader, readahead_size, // and max_readahead_size are passed in. - // If file_reader is a nullptr, setting readadhead_size and max_readahead_size + // If file_reader is a nullptr, setting readahead_size and max_readahead_size // does not make any sense. So it does nothing. // A user can construct a FilePrefetchBuffer without any arguments, but use // `Prefetch` to load data into the buffer. FilePrefetchBuffer(RandomAccessFileReader* file_reader = nullptr, - size_t readadhead_size = 0, size_t max_readahead_size = 0, + size_t readahead_size = 0, size_t max_readahead_size = 0, bool enable = true, bool track_min_offset = false) : buffer_offset_(0), file_reader_(file_reader), - readahead_size_(readadhead_size), + readahead_size_(readahead_size), max_readahead_size_(max_readahead_size), min_offset_read_(port::kMaxSizet), enable_(enable), @@ -67,7 +67,7 @@ class FilePrefetchBuffer { // Tries returning the data for a file raed from this buffer, if that data is // in the buffer. // It handles tracking the minimum read offset if track_min_offset = true. - // It also does the exponential readahead when readadhead_size is set as part + // It also does the exponential readahead when readahead_size is set as part // of the constructor. // // offset : the file offset. diff --git a/file/file_util.cc b/file/file_util.cc index 4b0f17c7f..70191a7f3 100644 --- a/file/file_util.cc +++ b/file/file_util.cc @@ -195,7 +195,7 @@ IOStatus GenerateOneFileChecksum( : default_max_read_ahead_size; FilePrefetchBuffer prefetch_buffer( - reader.get(), readahead_size /* readadhead_size */, + reader.get(), readahead_size /* readahead_size */, readahead_size /* max_readahead_size */, !allow_mmap_reads /* enable */); Slice slice; diff --git a/table/block_based/block_based_table_reader.cc b/table/block_based/block_based_table_reader.cc index 2f22cd8ea..8758f7263 100644 --- a/table/block_based/block_based_table_reader.cc +++ b/table/block_based/block_based_table_reader.cc @@ -2925,7 +2925,7 @@ Status BlockBasedTable::VerifyChecksumInBlocks( // FilePrefetchBuffer doesn't work in mmap mode and readahead is not // needed there. FilePrefetchBuffer prefetch_buffer( - rep_->file.get(), readahead_size /* readadhead_size */, + rep_->file.get(), readahead_size /* readahead_size */, readahead_size /* max_readahead_size */, !rep_->ioptions.allow_mmap_reads /* enable */);