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

Fix error

Browse Source
This commit is contained in:
Alexey Milovidov 2021-07-05 23:17:53 +03:00
parent 21fb6ddea5
commit f29eb11e6c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IO/ReadBufferFromFile.cpp
View File

@ -38,6 +38,8 @@ ReadBufferFromFile::ReadBufferFromFile(
if (o_direct)
flags = flags & ~O_DIRECT;
#endif
std::cerr << flags << ", " << (flags & O_DIRECT) << "\n";
fd = ::open(file_name.c_str(), flags == -1 ? O_RDONLY | O_CLOEXEC : flags | O_CLOEXEC);
if (-1 == fd)

13
src/IO/createReadBufferFromFileBase.cpp
View File

@ -17,9 +17,9 @@ namespace DB
{
std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
const std::string & filename_,
const std::string & filename,
size_t estimated_size, size_t direct_io_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache,
size_t buffer_size_, int flags_, char * existing_memory_, size_t alignment)
size_t buffer_size, int flags, char * existing_memory, size_t alignment)
{
#if defined(OS_LINUX) || defined(__FreeBSD__)
if (direct_io_threshold && estimated_size >= direct_io_threshold)
@ -44,7 +44,8 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
/// Attempt to open a file with O_DIRECT
try
{
auto res = std::make_unique<ReadBufferFromFile>(filename_, buffer_size_, flags_ | O_DIRECT, existing_memory_, alignment);
auto res = std::make_unique<ReadBufferFromFile>(
filename, buffer_size, flags == -1 ? O_RDONLY | O_CLOEXEC : flags | O_DIRECT, existing_memory, alignment);
ProfileEvents::increment(ProfileEvents::CreatedReadBufferDirectIO);
return res;
}
@ -59,11 +60,11 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
(void)estimated_size;
#endif
if (!existing_memory_ && mmap_threshold && mmap_cache && estimated_size >= mmap_threshold)
if (!existing_memory && mmap_threshold && mmap_cache && estimated_size >= mmap_threshold)
{
try
{
auto res = std::make_unique<MMapReadBufferFromFileWithCache>(*mmap_cache, filename_, 0);
auto res = std::make_unique<MMapReadBufferFromFileWithCache>(*mmap_cache, filename, 0);
ProfileEvents::increment(ProfileEvents::CreatedReadBufferMMap);
return res;
}
@ -75,7 +76,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
}
ProfileEvents::increment(ProfileEvents::CreatedReadBufferOrdinary);
return std::make_unique<ReadBufferFromFile>(filename_, buffer_size_, flags_, existing_memory_, alignment);
return std::make_unique<ReadBufferFromFile>(filename, buffer_size, flags, existing_memory, alignment);
}
}

6
src/IO/createReadBufferFromFileBase.h
View File

@ -19,14 +19,14 @@ class MMappedFileCache;
* Otherwise, the read operations are performed asynchronously.
*/
std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
const std::string & filename_,
const std::string & filename,
size_t estimated_size,
size_t direct_io_threshold,
size_t mmap_threshold,
MMappedFileCache * mmap_cache,
size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
size_t buffer_size = DBMS_DEFAULT_BUFFER_SIZE,
int flags_ = -1,
char * existing_memory_ = nullptr,
char * existing_memory = nullptr,
size_t alignment = 0);
}