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

Merge pull request #65940 from ClickHouse/add_table_name_to_mt_source_spans

Browse Source 
Add table name to MergeTreeSource spans
This commit is contained in:
Nikita Taranov 2024-07-03 12:26:09 +00:00 committed by GitHub
commit 36e557652f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Processors/QueryPlan/ReadFromMergeTree.cpp
View File

@ -383,7 +383,7 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
pool, std::move(algorithm), prewhere_info, pool, std::move(algorithm), prewhere_info,
actions_settings, block_size_copy, reader_settings); actions_settings, block_size_copy, reader_settings);
auto source = std::make_shared<MergeTreeSource>(std::move(processor)); auto source = std::make_shared<MergeTreeSource>(std::move(processor), data.getLogName());
pipes.emplace_back(std::move(source)); pipes.emplace_back(std::move(source));
} }
@ -482,7 +482,7 @@ Pipe ReadFromMergeTree::readFromPool(
pool, std::move(algorithm), prewhere_info, pool, std::move(algorithm), prewhere_info,
actions_settings, block_size_copy, reader_settings); actions_settings, block_size_copy, reader_settings);
auto source = std::make_shared<MergeTreeSource>(std::move(processor)); auto source = std::make_shared<MergeTreeSource>(std::move(processor), data.getLogName());
if (i == 0) if (i == 0)
source->addTotalRowsApprox(total_rows); source->addTotalRowsApprox(total_rows);
@ -595,7 +595,7 @@ Pipe ReadFromMergeTree::readInOrder(
processor->addPartLevelToChunk(isQueryWithFinal()); processor->addPartLevelToChunk(isQueryWithFinal());
auto source = std::make_shared<MergeTreeSource>(std::move(processor)); auto source = std::make_shared<MergeTreeSource>(std::move(processor), data.getLogName());
if (set_total_rows_approx) if (set_total_rows_approx)
source->addTotalRowsApprox(total_rows); source->addTotalRowsApprox(total_rows);

9
src/Storages/MergeTree/MergeTreeSource.cpp
View File

@ -133,9 +133,8 @@ private:
}; };
#endif #endif
MergeTreeSource::MergeTreeSource(MergeTreeSelectProcessorPtr processor_) MergeTreeSource::MergeTreeSource(MergeTreeSelectProcessorPtr processor_, const std::string & log_name_)
: ISource(processor_->getHeader()) : ISource(processor_->getHeader()), processor(std::move(processor_)), log_name(log_name_)
, processor(std::move(processor_))
{ {
#if defined(OS_LINUX) #if defined(OS_LINUX)
if (processor->getSettings().use_asynchronous_read_from_pool) if (processor->getSettings().use_asynchronous_read_from_pool)
@ -207,7 +206,7 @@ std::optional<Chunk> MergeTreeSource::tryGenerate()
try try
{ {
OpenTelemetry::SpanHolder span{"MergeTreeSource::tryGenerate()"}; OpenTelemetry::SpanHolder span{fmt::format("MergeTreeSource({})::tryGenerate", log_name)};
holder->setResult(processor->read()); holder->setResult(processor->read());
} }
catch (...) catch (...)
@ -222,7 +221,7 @@ std::optional<Chunk> MergeTreeSource::tryGenerate()
} }
#endif #endif
OpenTelemetry::SpanHolder span{"MergeTreeSource::tryGenerate()"}; OpenTelemetry::SpanHolder span{fmt::format("MergeTreeSource({})::tryGenerate", log_name)};
return processReadResult(processor->read()); return processReadResult(processor->read());
} }

3
src/Storages/MergeTree/MergeTreeSource.h
View File

@ -12,7 +12,7 @@ struct ChunkAndProgress;
class MergeTreeSource final : public ISource class MergeTreeSource final : public ISource
{ {
public: public:
explicit MergeTreeSource(MergeTreeSelectProcessorPtr processor_); explicit MergeTreeSource(MergeTreeSelectProcessorPtr processor_, const std::string & log_name_);
~MergeTreeSource() override; ~MergeTreeSource() override;
std::string getName() const override; std::string getName() const override;
@ -30,6 +30,7 @@ protected:
private: private:
MergeTreeSelectProcessorPtr processor; MergeTreeSelectProcessorPtr processor;
const std::string log_name;
#if defined(OS_LINUX) #if defined(OS_LINUX)
struct AsyncReadingState; struct AsyncReadingState;