Remove the forward declaration changes

2024-10-04 07:30:52 +00:00 · 2020-12-24 12:09:35 +03:00 · 2020-12-24 12:09:35 +03:00 · c6c2b3ba00
commit c6c2b3ba00
parent 2bb0f5772e
44 changed files with 61 additions and 64 deletions
--- 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);
--- 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;
--- 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;
--- 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);

--- 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);
 }
--- 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;
--- 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: ";
--- 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;
--- 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;
--- 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; }

--- 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);
--- 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;
--- 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';
--- 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; }
--- 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, ' ');

--- 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_);
--- 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;
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@ -61,16 +61,6 @@ public:

 using DataStreams = std::vector<DataStream>;

-// 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<IQueryPlanStep>;
--- 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);
 }
--- 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.
--- 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);
 }
--- 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.
--- 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, ' ');

--- 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;
--- 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';
--- 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
    {
--- 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: ";
--- 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_);
--- 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);
 }
--- 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;
--- 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: ";
--- 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;
--- 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: ";
--- 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_);
--- 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';
 }
--- 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;
--- 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: ";
--- 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_);
--- 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';
--- 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;
--- 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);
 }
--- 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;
--- 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: (";
--- 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;