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

Rename read_threadpool to threadpool

Browse Source
This commit is contained in:
kssenii 2021-11-10 07:46:18 +00:00
parent a1d7e08f4f
commit 618c332f9c
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Settings.h
View File

@ -508,7 +508,7 @@ class IColumn;
M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable' - use short-circuit function evaluation for functions that are suitable for it, 'disable' - disable short-circuit function evaluation, 'force_enable' - use short-circuit function evaluation for all functions.", 0) \
\
M(String, local_filesystem_read_method, "pread", "Method of reading data from local filesystem, one of: read, pread, mmap, pread_threadpool.", 0) \
M(String, remote_filesystem_read_method, "read", "Method of reading data from remote filesystem, one of: read, read_threadpool.", 0) \
M(String, remote_filesystem_read_method, "read", "Method of reading data from remote filesystem, one of: read, threadpool.", 0) \
M(Bool, local_filesystem_read_prefetch, false, "Should use prefetching when reading data from local filesystem.", 0) \
M(Bool, remote_filesystem_read_prefetch, true, "Should use prefetching when reading data from remote filesystem.", 0) \
M(Int64, read_priority, 0, "Priority to read data from local filesystem. Only supported for 'pread_threadpool' method.", 0) \

2
src/Disks/DiskWebServer.cpp
View File

@ -166,7 +166,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & p
RemoteMetadata meta(path, remote_path);
meta.remote_fs_objects.emplace_back(std::make_pair(remote_path, iter->second.size));
bool threadpool_read = read_settings.remote_fs_method == RemoteFSReadMethod::read_threadpool;
bool threadpool_read = read_settings.remote_fs_method == RemoteFSReadMethod::threadpool;
auto web_impl = std::make_unique<ReadBufferFromWebServerGather>(path, url, meta, getContext(), threadpool_read, read_settings);

2
src/Disks/HDFS/DiskHDFS.cpp
View File

@ -77,7 +77,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskHDFS::readFile(const String & path,
auto hdfs_impl = std::make_unique<ReadBufferFromHDFSGather>(path, config, remote_fs_root_path, metadata, read_settings.remote_fs_buffer_size);
if (read_settings.remote_fs_method == RemoteFSReadMethod::read_threadpool)
if (read_settings.remote_fs_method == RemoteFSReadMethod::threadpool)
{
auto reader = getThreadPoolReader();
return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(hdfs_impl));

2
src/Disks/S3/DiskS3.cpp
View File

@ -230,7 +230,7 @@ std::unique_ptr<ReadBufferFromFileBase> DiskS3::readFile(const String & path, co
LOG_TRACE(log, "Read from file by path: {}. Existing S3 objects: {}",
backQuote(metadata_path + path), metadata.remote_fs_objects.size());
bool threadpool_read = read_settings.remote_fs_method == RemoteFSReadMethod::read_threadpool;
bool threadpool_read = read_settings.remote_fs_method == RemoteFSReadMethod::threadpool;
auto s3_impl = std::make_unique<ReadBufferFromS3Gather>(
path,

2
src/IO/ReadBufferFromS3.cpp
View File

@ -170,7 +170,7 @@ std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize()
req.SetKey(key);
/**
* If remote_filesystem_read_method = 'read_threadpool', then for MergeTree family tables
* If remote_filesystem_read_method = 'threadpool', then for MergeTree family tables
* exact byte ranges to read are always passed here.
*/
if (read_until_position)

2
src/IO/ReadSettings.h
View File

@ -46,7 +46,7 @@ enum class LocalFSReadMethod
enum class RemoteFSReadMethod
{
read,
read_threadpool,
threadpool,
};
class MMappedFileCache;

2
tests/integration/test_disk_over_web_server/configs/async_read.xml
View File

@ -1,7 +1,7 @@
<yandex>
<profiles>
<default>
<remote_filesystem_read_method>read_threadpool</remote_filesystem_read_method>
<remote_filesystem_read_method>threadpool</remote_filesystem_read_method>
</default>
</profiles>
</yandex>

2
tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml
View File

@ -1,7 +1,7 @@
<yandex>
<profiles>
<default>
<remote_filesystem_read_method>read_threadpool</remote_filesystem_read_method>
<remote_filesystem_read_method>threadpool</remote_filesystem_read_method>
</default>
</profiles>
</yandex>