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

Fix error

Browse Source
This commit is contained in:
Alexey Milovidov 2021-08-27 04:45:14 +03:00
parent 7df2532d60
commit b1478368cd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/IO/createReadBufferFromFileBase.cpp
View File

@ -82,6 +82,9 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
return res;
};
if (flags == -1)
flags = O_RDONLY | O_CLOEXEC;
#if defined(OS_LINUX) || defined(__FreeBSD__)
if (settings.direct_io_threshold && estimated_size >= settings.direct_io_threshold)
{
@ -115,10 +118,6 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
buffer_size = align_up(buffer_size);
}
if (flags == -1)
flags = O_RDONLY | O_CLOEXEC;
flags |= O_DIRECT;
if (reinterpret_cast<uintptr_t>(existing_memory) % min_alignment)
{
existing_memory = nullptr; /// Cannot reuse existing memory is it has unaligned offset.
@ -127,7 +126,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
/// Attempt to open a file with O_DIRECT
try
{
std::unique_ptr<ReadBufferFromFileBase> res = create(buffer_size, flags);
std::unique_ptr<ReadBufferFromFileBase> res = create(buffer_size, flags | O_DIRECT);
ProfileEvents::increment(ProfileEvents::CreatedReadBufferDirectIO);
return res;
}