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

Try to fix bug

Browse Source
This commit is contained in:
divanik 2024-08-09 09:37:16 +00:00
parent f5e993df2a
commit 29ce915d00
6 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ void ReadBufferFromRemoteFSGather::initialize()
bool ReadBufferFromRemoteFSGather::nextImpl()
{
// LOG_DEBU
/// Find first available buffer that fits to given offset.
if (!current_buf)
initialize();
@ -230,6 +231,7 @@ void ReadBufferFromRemoteFSGather::reset()
{
current_object = StoredObject();
current_buf_idx = {};
// buffer_cemetery_.push_back(current_buf);
current_buf.reset();
}

2
src/Disks/IO/ReadBufferFromRemoteFSGather.h
View File

@ -85,6 +85,8 @@ private:
size_t current_buf_idx = 0;
SeekableReadBufferPtr current_buf;
std::deque<SeekableReadBufferPtr> buffer_cemetery_;
LoggerPtr log;
};

28
src/Disks/IO/createReadBufferFromFileBase.cpp
View File

@ -1,14 +1,15 @@
#include <Disks/IO/IOUringReader.h>
#include <Disks/IO/ThreadPoolReader.h>
#include <Disks/IO/createReadBufferFromFileBase.h>
#include <Disks/IO/getIOUringReader.h>
#include <Disks/IO/getThreadPoolReader.h>
#include <IO/AsynchronousReadBufferFromFile.h>
#include <IO/AsynchronousReader.h>
#include <IO/MMapReadBufferFromFileWithCache.h>
#include <IO/ReadBufferFromEmptyFile.h>
#include <IO/ReadBufferFromFile.h>
#include <IO/MMapReadBufferFromFileWithCache.h>
#include <IO/AsynchronousReadBufferFromFile.h>
#include <Disks/IO/IOUringReader.h>
#include <Disks/IO/getIOUringReader.h>
#include <Disks/IO/ThreadPoolReader.h>
#include <Disks/IO/getThreadPoolReader.h>
#include <IO/AsynchronousReader.h>
#include <Common/ProfileEvents.h>
#include "ReadBufferFromRemoteFSGather.h"
#include "config.h"
namespace ProfileEvents
@ -77,6 +78,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
if (settings.local_fs_method == LocalFSReadMethod::read)
{
LOG_DEBUG(&Poco::Logger::get("Read settings"), "Read settings 1");
res = std::make_unique<ReadBufferFromFile>(
filename,
buffer_size,
@ -88,6 +90,8 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
}
else if (settings.local_fs_method == LocalFSReadMethod::pread || settings.local_fs_method == LocalFSReadMethod::mmap)
{
LOG_DEBUG(&Poco::Logger::get("Read settings"), "Read settings 2");
res = std::make_unique<ReadBufferFromFilePReadWithDescriptorsCache>(
filename,
buffer_size,
@ -99,6 +103,8 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
}
else if (settings.local_fs_method == LocalFSReadMethod::io_uring)
{
LOG_DEBUG(&Poco::Logger::get("Read settings"), "Read settings 3");
#if USE_LIBURING
auto & reader = getIOUringReaderOrThrow();
res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
@ -117,6 +123,8 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
}
else if (settings.local_fs_method == LocalFSReadMethod::pread_fake_async)
{
LOG_DEBUG(&Poco::Logger::get("Read settings"), "Read settings 4");
auto & reader = getThreadPoolReader(FilesystemReaderType::SYNCHRONOUS_LOCAL_FS_READER);
res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
reader,
@ -131,6 +139,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
}
else if (settings.local_fs_method == LocalFSReadMethod::pread_threadpool)
{
LOG_DEBUG(&Poco::Logger::get("Read settings"), "Read settings 5");
auto & reader = getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_LOCAL_FS_READER);
res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
reader,
@ -144,8 +153,11 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
settings.local_throttler);
}
else
throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown read method");
{
LOG_DEBUG(&Poco::Logger::get("Read settings"), "Read settings 6");
throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown read method");
}
return res;
};

9
src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
View File

@ -48,11 +48,12 @@ std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObjects( /// NOL
{
auto modified_settings = patchSettings(read_settings);
auto global_context = Context::getGlobalContextInstance();
auto read_buffer_creator =
[=] (bool /* restricted_seek */, const StoredObject & object)
-> std::unique_ptr<ReadBufferFromFileBase>
auto read_buffer_creator = [=](bool /* restricted_seek */, const StoredObject & object) -> std::unique_ptr<ReadBufferFromFileBase>
{
return createReadBufferFromFileBase(object.remote_path, modified_settings, read_hint, file_size);
LOG_DEBUG(&Poco::Logger::get("Get object path"), "Remote Path: {}", object.remote_path);
auto kek = createReadBufferFromFileBase(object.remote_path, modified_settings, read_hint, file_size);
LOG_DEBUG(&Poco::Logger::get("Buffer created"), "Remote Path: {}", object.remote_path);
return kek;
};
return std::make_unique<ReadBufferFromRemoteFSGather>(

3
src/IO/ReadBuffer.h
View File

@ -103,6 +103,7 @@ public:
*/
bool ALWAYS_INLINE eof()
{
LOG_DEBUG();
return !hasPendingData() && !next();
}
@ -182,6 +183,8 @@ public:
while (bytes_copied < n && !eof())
{
auto k = *pos;
LOG_DEBUG(&Poco::Logger::get("Next symbol in read"), "Symbol: {}", k);
size_t bytes_to_copy = std::min(static_cast<size_t>(working_buffer.end() - pos), n - bytes_copied);
::memcpy(to + bytes_copied, pos, bytes_to_copy);
pos += bytes_to_copy;

5
src/Storages/ObjectStorage/StorageObjectStorageSource.cpp
View File

@ -413,10 +413,7 @@ std::future<StorageObjectStorageSource::ReaderHolder> StorageObjectStorageSource
}
std::unique_ptr<ReadBuffer> StorageObjectStorageSource::createReadBuffer(
const ObjectInfo & object_info,
const ObjectStoragePtr & object_storage,
const ContextPtr & context_,
const LoggerPtr & log)
const ObjectInfo & object_info, const ObjectStoragePtr & object_storage, const ContextPtr & context_, const LoggerPtr & log)
{
const auto & object_size = object_info.metadata->size_bytes;