diff --git a/src/DataStreams/ShellCommandSource.h b/src/DataStreams/ShellCommandSource.h index befdbc796ba..21d0acaf81a 100644 --- a/src/DataStreams/ShellCommandSource.h +++ b/src/DataStreams/ShellCommandSource.h @@ -52,14 +52,12 @@ public: const std::string & format, const Block & sample_block, std::unique_ptr && command_, - Poco::Logger * log_, std::vector && send_data_tasks = {}, const ShellCommandSourceConfiguration & configuration_ = {}, std::shared_ptr process_pool_ = nullptr) : SourceWithProgress(sample_block) , command(std::move(command_)) , configuration(configuration_) - , log(log_) , process_pool(process_pool_) { for (auto && send_data_task : send_data_tasks) @@ -133,7 +131,6 @@ protected: } catch (...) { - tryLogCurrentException(log); command = nullptr; throw; } @@ -176,8 +173,6 @@ private: size_t current_read_rows = 0; - Poco::Logger * log; - std::shared_ptr process_pool; QueryPipeline pipeline; diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp index a274e820e65..ca0c45a9b6c 100644 --- a/src/Dictionaries/ExecutableDictionarySource.cpp +++ b/src/Dictionaries/ExecutableDictionarySource.cpp @@ -72,7 +72,7 @@ Pipe ExecutableDictionarySource::loadAll() ShellCommand::Config config(configuration.command); auto process = ShellCommand::execute(config); - Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process), log)); + Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process))); return pipe; } @@ -91,7 +91,7 @@ Pipe ExecutableDictionarySource::loadUpdatedAll() LOG_TRACE(log, "loadUpdatedAll {}", command_with_update_field); ShellCommand::Config config(command_with_update_field); auto process = ShellCommand::execute(config); - Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process), log)); + Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process))); return pipe; } @@ -126,7 +126,7 @@ Pipe ExecutableDictionarySource::getStreamForBlock(const Block & block) }}; std::vector tasks = {std::move(task)}; - Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process), log, std::move(tasks))); + Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process), std::move(tasks))); if (configuration.implicit_key) pipe.addTransform(std::make_shared(block, pipe.getHeader())); diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp index c5d081bb3e6..160ac022a70 100644 --- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp +++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp @@ -120,7 +120,7 @@ Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block) ShellCommandSourceConfiguration command_configuration; command_configuration.read_fixed_number_of_rows = true; command_configuration.number_of_rows_to_read = rows_to_read; - Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process), log, std::move(tasks), command_configuration, process_pool)); + Pipe pipe(std::make_unique(context, configuration.format, sample_block, std::move(process), std::move(tasks), command_configuration, process_pool)); if (configuration.implicit_key) pipe.addTransform(std::make_shared(block, pipe.getHeader())); diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp index 4b0aaf6caea..3a14c16bae4 100644 --- a/src/Storages/StorageExecutable.cpp +++ b/src/Storages/StorageExecutable.cpp @@ -183,7 +183,7 @@ Pipe StorageExecutable::read( configuration.read_number_of_rows_from_process_output = true; } - Pipe pipe(std::make_unique(context, format, std::move(sample_block), std::move(process), log, std::move(tasks), configuration, process_pool)); + Pipe pipe(std::make_unique(context, format, std::move(sample_block), std::move(process), std::move(tasks), configuration, process_pool)); return pipe; }