thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure position is at the start of buffer in ReadBufferFromRemoteFSGather

Browse Source
This commit is contained in:
kssenii 2024-08-28 15:33:04 +02:00
parent e7d63b5f79
commit e073506cde
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
View File

@ -183,13 +183,23 @@ bool ReadBufferFromRemoteFSGather::nextImpl()
if (!current_buf) if (!current_buf)
return false; return false;
if (readImpl()) bool result = readImpl();
if (!result)
{
if (!moveToNextBuffer())
return false;
result = readImpl();
}
if (result)
{
if (!use_external_buffer)
{
working_buffer = Buffer(position(), working_buffer.end());
pos = working_buffer.begin();
}
return true; return true;
}
if (!moveToNextBuffer()) return false;
return false;
return readImpl();
} }
bool ReadBufferFromRemoteFSGather::moveToNextBuffer() bool ReadBufferFromRemoteFSGather::moveToNextBuffer()
@ -215,7 +225,6 @@ bool ReadBufferFromRemoteFSGather::readImpl()
if (result) if (result)
{ {
file_offset_of_buffer_end += current_buf->available(); file_offset_of_buffer_end += current_buf->available();
nextimpl_working_buffer_offset = current_buf->offset();
chassert(current_buf->available()); chassert(current_buf->available());
chassert(blobs_to_read.size() != 1 || file_offset_of_buffer_end == current_buf->getFileOffsetOfBufferEnd()); chassert(blobs_to_read.size() != 1 || file_offset_of_buffer_end == current_buf->getFileOffsetOfBufferEnd());
@ -238,6 +247,7 @@ void ReadBufferFromRemoteFSGather::reset()
current_object = StoredObject(); current_object = StoredObject();
current_buf_idx = {}; current_buf_idx = {};
current_buf.reset(); current_buf.reset();
resetWorkingBuffer();
} }
off_t ReadBufferFromRemoteFSGather::seek(off_t offset, int whence) off_t ReadBufferFromRemoteFSGather::seek(off_t offset, int whence)