From 618c332f9c4c9213c0f5cd7c0d03c7eed98d2c6d Mon Sep 17 00:00:00 2001 From: kssenii Date: Wed, 10 Nov 2021 07:46:18 +0000 Subject: [PATCH] Rename read_threadpool to threadpool --- src/Core/Settings.h | 2 +- src/Disks/DiskWebServer.cpp | 2 +- src/Disks/HDFS/DiskHDFS.cpp | 2 +- src/Disks/S3/DiskS3.cpp | 2 +- src/IO/ReadBufferFromS3.cpp | 2 +- src/IO/ReadSettings.h | 2 +- .../test_disk_over_web_server/configs/async_read.xml | 2 +- .../test_merge_tree_s3/configs/config.d/async_read.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Core/Settings.h b/src/Core/Settings.h index 3863046b511..b0d5c7abd49 100644 --- a/src/Core/Settings.h +++ b/src/Core/Settings.h @@ -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) \ diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp index 55ea91c40c9..417db4bcc05 100644 --- a/src/Disks/DiskWebServer.cpp +++ b/src/Disks/DiskWebServer.cpp @@ -166,7 +166,7 @@ std::unique_ptr 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(path, url, meta, getContext(), threadpool_read, read_settings); diff --git a/src/Disks/HDFS/DiskHDFS.cpp b/src/Disks/HDFS/DiskHDFS.cpp index bddb5ebefc6..b820fe2fb43 100644 --- a/src/Disks/HDFS/DiskHDFS.cpp +++ b/src/Disks/HDFS/DiskHDFS.cpp @@ -77,7 +77,7 @@ std::unique_ptr DiskHDFS::readFile(const String & path, auto hdfs_impl = std::make_unique(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(reader, read_settings, std::move(hdfs_impl)); diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp index 3e99ca1a886..a9bb8cdd3a7 100644 --- a/src/Disks/S3/DiskS3.cpp +++ b/src/Disks/S3/DiskS3.cpp @@ -230,7 +230,7 @@ std::unique_ptr 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( path, diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp index 78d296be60e..bf1e45c659a 100644 --- a/src/IO/ReadBufferFromS3.cpp +++ b/src/IO/ReadBufferFromS3.cpp @@ -170,7 +170,7 @@ std::unique_ptr 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) diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h index be328e28118..d951eebe7fa 100644 --- a/src/IO/ReadSettings.h +++ b/src/IO/ReadSettings.h @@ -46,7 +46,7 @@ enum class LocalFSReadMethod enum class RemoteFSReadMethod { read, - read_threadpool, + threadpool, }; class MMappedFileCache; diff --git a/tests/integration/test_disk_over_web_server/configs/async_read.xml b/tests/integration/test_disk_over_web_server/configs/async_read.xml index 4449d83779a..09c421e35e4 100644 --- a/tests/integration/test_disk_over_web_server/configs/async_read.xml +++ b/tests/integration/test_disk_over_web_server/configs/async_read.xml @@ -1,7 +1,7 @@ - read_threadpool + threadpool diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml b/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml index 4449d83779a..09c421e35e4 100644 --- a/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml +++ b/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml @@ -1,7 +1,7 @@ - read_threadpool + threadpool