diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp index 8b787859467..e8d4a262366 100644 --- a/src/Processors/QueryPlan/AggregatingStep.cpp +++ b/src/Processors/QueryPlan/AggregatingStep.cpp @@ -156,12 +156,12 @@ void AggregatingStep::transformPipeline(QueryPipeline & pipeline) } } -void AggregatingStep::describeActions(QueryPlanStepFormatSettings & settings) const +void AggregatingStep::describeActions(FormatSettings & settings) const { params.explain(settings.out, settings.offset); } -void AggregatingStep::describePipeline(QueryPlanStepFormatSettings & settings) const +void AggregatingStep::describePipeline(FormatSettings & settings) const { if (!aggregating.empty()) IQueryPlanStep::describePipeline(aggregating, settings); diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h index 3d12e79a662..853173895b3 100644 --- a/src/Processors/QueryPlan/AggregatingStep.h +++ b/src/Processors/QueryPlan/AggregatingStep.h @@ -29,8 +29,8 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings &) const override; - void describePipeline(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings &) const override; + void describePipeline(FormatSettings & settings) const override; private: Aggregator::Params params; diff --git a/src/Processors/QueryPlan/ArrayJoinStep.cpp b/src/Processors/QueryPlan/ArrayJoinStep.cpp index 01cfd7c561a..b71d2176e52 100644 --- a/src/Processors/QueryPlan/ArrayJoinStep.cpp +++ b/src/Processors/QueryPlan/ArrayJoinStep.cpp @@ -69,7 +69,7 @@ void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline) } } -void ArrayJoinStep::describeActions(QueryPlanStepFormatSettings & settings) const +void ArrayJoinStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); bool first = true; diff --git a/src/Processors/QueryPlan/ArrayJoinStep.h b/src/Processors/QueryPlan/ArrayJoinStep.h index 338ec7f0583..92c7e0a1304 100644 --- a/src/Processors/QueryPlan/ArrayJoinStep.h +++ b/src/Processors/QueryPlan/ArrayJoinStep.h @@ -15,7 +15,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; void updateInputStream(DataStream input_stream, Block result_header); diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp index c6b77bc46c3..5868a7045f7 100644 --- a/src/Processors/QueryPlan/CreatingSetsStep.cpp +++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp @@ -47,7 +47,7 @@ void CreatingSetStep::transformPipeline(QueryPipeline & pipeline) pipeline.addCreatingSetsTransform(getOutputStream().header, std::move(subquery_for_set), network_transfer_limits, context); } -void CreatingSetStep::describeActions(QueryPlanStepFormatSettings & settings) const +void CreatingSetStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); @@ -102,7 +102,7 @@ QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines) return main_pipeline; } -void CreatingSetsStep::describePipeline(QueryPlanStepFormatSettings & settings) const +void CreatingSetsStep::describePipeline(FormatSettings & settings) const { IQueryPlanStep::describePipeline(processors, settings); } diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h index f610eeb64d9..ec13ab2052e 100644 --- a/src/Processors/QueryPlan/CreatingSetsStep.h +++ b/src/Processors/QueryPlan/CreatingSetsStep.h @@ -22,7 +22,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: String description; @@ -40,7 +40,7 @@ public: QueryPipelinePtr updatePipeline(QueryPipelines pipelines) override; - void describePipeline(QueryPlanStepFormatSettings & settings) const override; + void describePipeline(FormatSettings & settings) const override; private: Processors processors; diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp index ed2bae002ea..60966b08beb 100644 --- a/src/Processors/QueryPlan/DistinctStep.cpp +++ b/src/Processors/QueryPlan/DistinctStep.cpp @@ -79,7 +79,7 @@ void DistinctStep::transformPipeline(QueryPipeline & pipeline) }); } -void DistinctStep::describeActions(QueryPlanStepFormatSettings & settings) const +void DistinctStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Columns: "; diff --git a/src/Processors/QueryPlan/DistinctStep.h b/src/Processors/QueryPlan/DistinctStep.h index 901e199ca39..4bfd73ce044 100644 --- a/src/Processors/QueryPlan/DistinctStep.h +++ b/src/Processors/QueryPlan/DistinctStep.h @@ -20,7 +20,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: SizeLimits set_size_limits; diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp index 028c9502c71..f7ca0a972dc 100644 --- a/src/Processors/QueryPlan/ExpressionStep.cpp +++ b/src/Processors/QueryPlan/ExpressionStep.cpp @@ -87,7 +87,7 @@ void ExpressionStep::transformPipeline(QueryPipeline & pipeline) } } -void ExpressionStep::describeActions(QueryPlanStepFormatSettings & settings) const +void ExpressionStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); bool first = true; diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h index 2519765dbae..60f186688b0 100644 --- a/src/Processors/QueryPlan/ExpressionStep.h +++ b/src/Processors/QueryPlan/ExpressionStep.h @@ -26,7 +26,7 @@ public: void updateInputStream(DataStream input_stream, bool keep_header); - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; const ActionsDAGPtr & getExpression() const { return actions_dag; } diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp index 18c71b89601..1a8fba97ee2 100644 --- a/src/Processors/QueryPlan/FillingStep.cpp +++ b/src/Processors/QueryPlan/FillingStep.cpp @@ -43,7 +43,7 @@ void FillingStep::transformPipeline(QueryPipeline & pipeline) }); } -void FillingStep::describeActions(QueryPlanStepFormatSettings & settings) const +void FillingStep::describeActions(FormatSettings & settings) const { settings.out << String(settings.offset, ' '); dumpSortDescription(sort_description, input_streams.front().header, settings.out); diff --git a/src/Processors/QueryPlan/FillingStep.h b/src/Processors/QueryPlan/FillingStep.h index a7836e4de68..85736464a6c 100644 --- a/src/Processors/QueryPlan/FillingStep.h +++ b/src/Processors/QueryPlan/FillingStep.h @@ -15,7 +15,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: SortDescription sort_description; diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp index 98f111a1529..8fb405e685b 100644 --- a/src/Processors/QueryPlan/FilterStep.cpp +++ b/src/Processors/QueryPlan/FilterStep.cpp @@ -80,7 +80,7 @@ void FilterStep::transformPipeline(QueryPipeline & pipeline) } } -void FilterStep::describeActions(QueryPlanStepFormatSettings & settings) const +void FilterStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Filter column: " << filter_column_name << '\n'; diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h index 561fbf347da..72b02624faa 100644 --- a/src/Processors/QueryPlan/FilterStep.h +++ b/src/Processors/QueryPlan/FilterStep.h @@ -22,7 +22,7 @@ public: void updateInputStream(DataStream input_stream, bool keep_header); - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; const ActionsDAGPtr & getExpression() const { return actions_dag; } const String & getFilterColumnName() const { return filter_column_name; } diff --git a/src/Processors/QueryPlan/FinishSortingStep.cpp b/src/Processors/QueryPlan/FinishSortingStep.cpp index 7af8fad2980..d883bd0e0dd 100644 --- a/src/Processors/QueryPlan/FinishSortingStep.cpp +++ b/src/Processors/QueryPlan/FinishSortingStep.cpp @@ -85,7 +85,7 @@ void FinishSortingStep::transformPipeline(QueryPipeline & pipeline) } } -void FinishSortingStep::describeActions(QueryPlanStepFormatSettings & settings) const +void FinishSortingStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); diff --git a/src/Processors/QueryPlan/FinishSortingStep.h b/src/Processors/QueryPlan/FinishSortingStep.h index 25dc0b78bda..4bb62037faa 100644 --- a/src/Processors/QueryPlan/FinishSortingStep.h +++ b/src/Processors/QueryPlan/FinishSortingStep.h @@ -20,7 +20,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; /// Add limit or change it to lower value. void updateLimit(size_t limit_); diff --git a/src/Processors/QueryPlan/IQueryPlanStep.cpp b/src/Processors/QueryPlan/IQueryPlanStep.cpp index a864043ddcb..f06897e8488 100644 --- a/src/Processors/QueryPlan/IQueryPlanStep.cpp +++ b/src/Processors/QueryPlan/IQueryPlanStep.cpp @@ -18,8 +18,7 @@ const DataStream & IQueryPlanStep::getOutputStream() const return *output_stream; } -static void doDescribeHeader(const Block & header, size_t count, - QueryPlanStepFormatSettings & settings) +static void doDescribeHeader(const Block & header, size_t count, IQueryPlanStep::FormatSettings & settings) { String prefix(settings.offset, settings.indent_char); prefix += "Header"; @@ -53,8 +52,7 @@ static void doDescribeHeader(const Block & header, size_t count, } } -static void doDescribeProcessor(const IProcessor & processor, size_t count, - QueryPlanStepFormatSettings & settings) +static void doDescribeProcessor(const IProcessor & processor, size_t count, IQueryPlanStep::FormatSettings & settings) { settings.out << String(settings.offset, settings.indent_char) << processor.getName(); if (count > 1) @@ -91,7 +89,7 @@ static void doDescribeProcessor(const IProcessor & processor, size_t count, settings.offset += settings.indent; } -void IQueryPlanStep::describePipeline(const Processors & processors, QueryPlanStepFormatSettings & settings) +void IQueryPlanStep::describePipeline(const Processors & processors, FormatSettings & settings) { const IProcessor * prev = nullptr; size_t count = 0; diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h index 1de1bbc438f..dfdbc9df442 100644 --- a/src/Processors/QueryPlan/IQueryPlanStep.h +++ b/src/Processors/QueryPlan/IQueryPlanStep.h @@ -61,16 +61,6 @@ public: using DataStreams = std::vector; -// Not a nested class so that we can forward declare it. -struct QueryPlanStepFormatSettings -{ - WriteBuffer & out; - size_t offset = 0; - const size_t indent = 2; - const char indent_char = ' '; - const bool write_header = false; -}; - /// Single step of query plan. class IQueryPlanStep { @@ -96,11 +86,20 @@ public: const std::string & getStepDescription() const { return step_description; } void setStepDescription(std::string description) { step_description = std::move(description); } + struct FormatSettings + { + WriteBuffer & out; + size_t offset = 0; + const size_t indent = 2; + const char indent_char = ' '; + const bool write_header = false; + }; + /// Get detailed description of step actions. This is shown in EXPLAIN query with options `actions = 1`. - virtual void describeActions(QueryPlanStepFormatSettings & /*settings*/) const {} + virtual void describeActions(FormatSettings & /*settings*/) const {} /// Get description of processors added in current step. Should be called after updatePipeline(). - virtual void describePipeline(QueryPlanStepFormatSettings & /*settings*/) const {} + virtual void describePipeline(FormatSettings & /*settings*/) const {} protected: DataStreams input_streams; @@ -109,7 +108,7 @@ protected: /// Text description about what current step does. std::string step_description; - static void describePipeline(const Processors & processors, QueryPlanStepFormatSettings & settings); + static void describePipeline(const Processors & processors, FormatSettings & settings); }; using QueryPlanStepPtr = std::unique_ptr; diff --git a/src/Processors/QueryPlan/ISourceStep.cpp b/src/Processors/QueryPlan/ISourceStep.cpp index 367be8e8ea5..1796f033896 100644 --- a/src/Processors/QueryPlan/ISourceStep.cpp +++ b/src/Processors/QueryPlan/ISourceStep.cpp @@ -19,7 +19,7 @@ QueryPipelinePtr ISourceStep::updatePipeline(QueryPipelines) return pipeline; } -void ISourceStep::describePipeline(QueryPlanStepFormatSettings & settings) const +void ISourceStep::describePipeline(FormatSettings & settings) const { IQueryPlanStep::describePipeline(processors, settings); } diff --git a/src/Processors/QueryPlan/ISourceStep.h b/src/Processors/QueryPlan/ISourceStep.h index 050e39ac11b..fdb3dd566cb 100644 --- a/src/Processors/QueryPlan/ISourceStep.h +++ b/src/Processors/QueryPlan/ISourceStep.h @@ -14,7 +14,7 @@ public: virtual void initializePipeline(QueryPipeline & pipeline) = 0; - void describePipeline(QueryPlanStepFormatSettings & settings) const override; + void describePipeline(FormatSettings & settings) const override; protected: /// We collect processors got after pipeline transformation. diff --git a/src/Processors/QueryPlan/ITransformingStep.cpp b/src/Processors/QueryPlan/ITransformingStep.cpp index 5430bafa27a..cb27bf38278 100644 --- a/src/Processors/QueryPlan/ITransformingStep.cpp +++ b/src/Processors/QueryPlan/ITransformingStep.cpp @@ -65,7 +65,7 @@ void ITransformingStep::updateDistinctColumns(const Block & res_header, NameSet } } -void ITransformingStep::describePipeline(QueryPlanStepFormatSettings & settings) const +void ITransformingStep::describePipeline(FormatSettings & settings) const { IQueryPlanStep::describePipeline(processors, settings); } diff --git a/src/Processors/QueryPlan/ITransformingStep.h b/src/Processors/QueryPlan/ITransformingStep.h index b1bfebd4571..bd99478ec37 100644 --- a/src/Processors/QueryPlan/ITransformingStep.h +++ b/src/Processors/QueryPlan/ITransformingStep.h @@ -55,7 +55,7 @@ public: const TransformTraits & getTransformTraits() const { return transform_traits; } const DataStreamTraits & getDataStreamTraits() const { return data_stream_traits; } - void describePipeline(QueryPlanStepFormatSettings & settings) const override; + void describePipeline(FormatSettings & settings) const override; protected: /// Clear distinct_columns if res_header doesn't contain all of them. diff --git a/src/Processors/QueryPlan/LimitByStep.cpp b/src/Processors/QueryPlan/LimitByStep.cpp index 15c64fcea44..9fcf5b60164 100644 --- a/src/Processors/QueryPlan/LimitByStep.cpp +++ b/src/Processors/QueryPlan/LimitByStep.cpp @@ -46,7 +46,7 @@ void LimitByStep::transformPipeline(QueryPipeline & pipeline) }); } -void LimitByStep::describeActions(QueryPlanStepFormatSettings & settings) const +void LimitByStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); diff --git a/src/Processors/QueryPlan/LimitByStep.h b/src/Processors/QueryPlan/LimitByStep.h index 01dcff5c912..9320735640c 100644 --- a/src/Processors/QueryPlan/LimitByStep.h +++ b/src/Processors/QueryPlan/LimitByStep.h @@ -16,7 +16,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: size_t group_length; diff --git a/src/Processors/QueryPlan/LimitStep.cpp b/src/Processors/QueryPlan/LimitStep.cpp index 38ec9265d4e..565d05956e5 100644 --- a/src/Processors/QueryPlan/LimitStep.cpp +++ b/src/Processors/QueryPlan/LimitStep.cpp @@ -50,7 +50,7 @@ void LimitStep::transformPipeline(QueryPipeline & pipeline) pipeline.addTransform(std::move(transform)); } -void LimitStep::describeActions(QueryPlanStepFormatSettings & settings) const +void LimitStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Limit " << limit << '\n'; diff --git a/src/Processors/QueryPlan/LimitStep.h b/src/Processors/QueryPlan/LimitStep.h index a95bf28f896..eea186fea4a 100644 --- a/src/Processors/QueryPlan/LimitStep.h +++ b/src/Processors/QueryPlan/LimitStep.h @@ -20,7 +20,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; size_t getLimitForSorting() const { diff --git a/src/Processors/QueryPlan/MergeSortingStep.cpp b/src/Processors/QueryPlan/MergeSortingStep.cpp index e2af023f598..b30286130b1 100644 --- a/src/Processors/QueryPlan/MergeSortingStep.cpp +++ b/src/Processors/QueryPlan/MergeSortingStep.cpp @@ -73,7 +73,7 @@ void MergeSortingStep::transformPipeline(QueryPipeline & pipeline) }); } -void MergeSortingStep::describeActions(QueryPlanStepFormatSettings & settings) const +void MergeSortingStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Sort description: "; diff --git a/src/Processors/QueryPlan/MergeSortingStep.h b/src/Processors/QueryPlan/MergeSortingStep.h index c41c209dd55..a385a8a3e93 100644 --- a/src/Processors/QueryPlan/MergeSortingStep.h +++ b/src/Processors/QueryPlan/MergeSortingStep.h @@ -26,7 +26,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; /// Add limit or change it to lower value. void updateLimit(size_t limit_); diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.cpp b/src/Processors/QueryPlan/MergingAggregatedStep.cpp index 2fddc88bbc1..85bbbeab59a 100644 --- a/src/Processors/QueryPlan/MergingAggregatedStep.cpp +++ b/src/Processors/QueryPlan/MergingAggregatedStep.cpp @@ -63,7 +63,7 @@ void MergingAggregatedStep::transformPipeline(QueryPipeline & pipeline) } } -void MergingAggregatedStep::describeActions(QueryPlanStepFormatSettings & settings) const +void MergingAggregatedStep::describeActions(FormatSettings & settings) const { return params->params.explain(settings.out, settings.offset); } diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.h b/src/Processors/QueryPlan/MergingAggregatedStep.h index 2d9d902a294..5ffceb7f938 100644 --- a/src/Processors/QueryPlan/MergingAggregatedStep.h +++ b/src/Processors/QueryPlan/MergingAggregatedStep.h @@ -23,7 +23,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: AggregatingTransformParamsPtr params; diff --git a/src/Processors/QueryPlan/MergingFinal.cpp b/src/Processors/QueryPlan/MergingFinal.cpp index 46431e0c767..c1dec231f11 100644 --- a/src/Processors/QueryPlan/MergingFinal.cpp +++ b/src/Processors/QueryPlan/MergingFinal.cpp @@ -153,7 +153,7 @@ void MergingFinal::transformPipeline(QueryPipeline & pipeline) }); } -void MergingFinal::describeActions(QueryPlanStepFormatSettings & settings) const +void MergingFinal::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Sort description: "; diff --git a/src/Processors/QueryPlan/MergingFinal.h b/src/Processors/QueryPlan/MergingFinal.h index 207c191c9cb..c01f5c7f9a1 100644 --- a/src/Processors/QueryPlan/MergingFinal.h +++ b/src/Processors/QueryPlan/MergingFinal.h @@ -22,7 +22,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: size_t num_output_streams; diff --git a/src/Processors/QueryPlan/MergingSortedStep.cpp b/src/Processors/QueryPlan/MergingSortedStep.cpp index a1249ef412f..c59540b009f 100644 --- a/src/Processors/QueryPlan/MergingSortedStep.cpp +++ b/src/Processors/QueryPlan/MergingSortedStep.cpp @@ -62,7 +62,7 @@ void MergingSortedStep::transformPipeline(QueryPipeline & pipeline) } } -void MergingSortedStep::describeActions(QueryPlanStepFormatSettings & settings) const +void MergingSortedStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Sort description: "; diff --git a/src/Processors/QueryPlan/MergingSortedStep.h b/src/Processors/QueryPlan/MergingSortedStep.h index 0c91d505f3d..483cfa5e8a7 100644 --- a/src/Processors/QueryPlan/MergingSortedStep.h +++ b/src/Processors/QueryPlan/MergingSortedStep.h @@ -21,7 +21,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; /// Add limit or change it to lower value. void updateLimit(size_t limit_); diff --git a/src/Processors/QueryPlan/OffsetStep.cpp b/src/Processors/QueryPlan/OffsetStep.cpp index 1a06f2ba05e..7ac3d3f2110 100644 --- a/src/Processors/QueryPlan/OffsetStep.cpp +++ b/src/Processors/QueryPlan/OffsetStep.cpp @@ -36,7 +36,7 @@ void OffsetStep::transformPipeline(QueryPipeline & pipeline) pipeline.addTransform(std::move(transform)); } -void OffsetStep::describeActions(QueryPlanStepFormatSettings & settings) const +void OffsetStep::describeActions(FormatSettings & settings) const { settings.out << String(settings.offset, ' ') << "Offset " << offset << '\n'; } diff --git a/src/Processors/QueryPlan/OffsetStep.h b/src/Processors/QueryPlan/OffsetStep.h index 18ea58635af..17949371edf 100644 --- a/src/Processors/QueryPlan/OffsetStep.h +++ b/src/Processors/QueryPlan/OffsetStep.h @@ -15,7 +15,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: size_t offset; diff --git a/src/Processors/QueryPlan/PartialSortingStep.cpp b/src/Processors/QueryPlan/PartialSortingStep.cpp index 072217b4d0d..ce34eca9112 100644 --- a/src/Processors/QueryPlan/PartialSortingStep.cpp +++ b/src/Processors/QueryPlan/PartialSortingStep.cpp @@ -70,7 +70,7 @@ void PartialSortingStep::transformPipeline(QueryPipeline & pipeline) }); } -void PartialSortingStep::describeActions(QueryPlanStepFormatSettings & settings) const +void PartialSortingStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Sort description: "; diff --git a/src/Processors/QueryPlan/PartialSortingStep.h b/src/Processors/QueryPlan/PartialSortingStep.h index 6d9dbe2b9d8..172ef25c300 100644 --- a/src/Processors/QueryPlan/PartialSortingStep.h +++ b/src/Processors/QueryPlan/PartialSortingStep.h @@ -20,7 +20,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; /// Add limit or change it to lower value. void updateLimit(size_t limit_); diff --git a/src/Processors/QueryPlan/TotalsHavingStep.cpp b/src/Processors/QueryPlan/TotalsHavingStep.cpp index 310f657b39d..9947875e679 100644 --- a/src/Processors/QueryPlan/TotalsHavingStep.cpp +++ b/src/Processors/QueryPlan/TotalsHavingStep.cpp @@ -74,7 +74,7 @@ static String totalsModeToString(TotalsMode totals_mode, double auto_include_thr __builtin_unreachable(); } -void TotalsHavingStep::describeActions(QueryPlanStepFormatSettings & settings) const +void TotalsHavingStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Filter column: " << filter_column_name << '\n'; diff --git a/src/Processors/QueryPlan/TotalsHavingStep.h b/src/Processors/QueryPlan/TotalsHavingStep.h index 88fd9bbb597..7c1638013e5 100644 --- a/src/Processors/QueryPlan/TotalsHavingStep.h +++ b/src/Processors/QueryPlan/TotalsHavingStep.h @@ -26,7 +26,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: bool overflow_row; diff --git a/src/Processors/QueryPlan/UnionStep.cpp b/src/Processors/QueryPlan/UnionStep.cpp index 413b52c69c2..630ff53f47d 100644 --- a/src/Processors/QueryPlan/UnionStep.cpp +++ b/src/Processors/QueryPlan/UnionStep.cpp @@ -36,7 +36,7 @@ QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines) return pipeline; } -void UnionStep::describePipeline(QueryPlanStepFormatSettings & settings) const +void UnionStep::describePipeline(FormatSettings & settings) const { IQueryPlanStep::describePipeline(processors, settings); } diff --git a/src/Processors/QueryPlan/UnionStep.h b/src/Processors/QueryPlan/UnionStep.h index aeac7fa54ff..e2e1f2c9efa 100644 --- a/src/Processors/QueryPlan/UnionStep.h +++ b/src/Processors/QueryPlan/UnionStep.h @@ -15,7 +15,7 @@ public: QueryPipelinePtr updatePipeline(QueryPipelines pipelines) override; - void describePipeline(QueryPlanStepFormatSettings & settings) const override; + void describePipeline(FormatSettings & settings) const override; private: Block header; diff --git a/src/Processors/QueryPlan/WindowStep.cpp b/src/Processors/QueryPlan/WindowStep.cpp index d2d24985937..82c589b8b20 100644 --- a/src/Processors/QueryPlan/WindowStep.cpp +++ b/src/Processors/QueryPlan/WindowStep.cpp @@ -71,7 +71,7 @@ void WindowStep::transformPipeline(QueryPipeline & pipeline) "WindowStep transform for '" + window_description.window_name + "'"); } -void WindowStep::describeActions(QueryPlanStepFormatSettings & settings) const +void WindowStep::describeActions(FormatSettings & settings) const { String prefix(settings.offset, ' '); settings.out << prefix << "Window: ("; diff --git a/src/Processors/QueryPlan/WindowStep.h b/src/Processors/QueryPlan/WindowStep.h index 25194820a0d..069d02c655c 100644 --- a/src/Processors/QueryPlan/WindowStep.h +++ b/src/Processors/QueryPlan/WindowStep.h @@ -22,7 +22,7 @@ public: void transformPipeline(QueryPipeline & pipeline) override; - void describeActions(QueryPlanStepFormatSettings & settings) const override; + void describeActions(FormatSettings & settings) const override; private: WindowDescription window_description;