thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 13:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Nikita Taranov 2023-11-28 23:48:52 +01:00
parent 7aca6ee5fc
commit a81453cafc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
View File

@ -1259,9 +1259,6 @@ bool CachedOnDiskReadBufferFromFile::isSeekCheap()
static bool isRangeContainedInSegments(size_t left, size_t right, const FileSegmentsHolderPtr & file_segments)
{
if (file_segments->empty())
return false;
if (!FileSegment::Range{file_segments->front().range().left, file_segments->back().range().right}.contains({left, right}))
throw Exception(
ErrorCodes::LOGICAL_ERROR,
@ -1295,6 +1292,13 @@ bool CachedOnDiskReadBufferFromFile::isContentCached(size_t offset, size_t size)
if (!initialized)
initialize();
return isRangeContainedInSegments(offset, std::min(offset + size, read_until_position) - 1, file_segments);
if (file_segments->empty())
return false;
/// We don't hold all the segments simultaneously, if there are more than `filesystem_cache_segments_batch_size` of them.
/// So we need to take minimum of the following two values to determine the intersection between [offset, offset + size - 1]
/// and the range covered by this segment currently.
const auto right_boundary = std::min(file_segments->back().range().right, read_until_position - 1);
return isRangeContainedInSegments(offset, std::min(offset + size - 1, right_boundary), file_segments);
}
}