From 7fb329713a6619aaf2e8efa68733ea723c499217 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Wed, 7 Oct 2020 20:51:10 +0200 Subject: [PATCH] Avoid shadowing class member, set first_row flag after write --- src/Processors/Formats/IRowOutputFormat.cpp | 2 +- src/Processors/Formats/Impl/AvroRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/AvroRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/BinaryRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/CSVRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/CSVRowOutputFormat.h | 2 +- .../Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp | 4 ++-- .../Formats/Impl/JSONCompactEachRowRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/JSONRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/JSONRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/MarkdownRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/MsgPackRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp | 6 +++--- src/Processors/Formats/Impl/ProtobufRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/TSKVRowOutputFormat.h | 2 +- .../Formats/Impl/TabSeparatedRawRowOutputFormat.h | 4 ++-- src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/ValuesRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/VerticalRowOutputFormat.h | 2 +- src/Processors/Formats/Impl/XMLRowOutputFormat.cpp | 4 ++-- src/Processors/Formats/Impl/XMLRowOutputFormat.h | 2 +- 34 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Processors/Formats/IRowOutputFormat.cpp b/src/Processors/Formats/IRowOutputFormat.cpp index 82d83a88cf..b684dd8226 100644 --- a/src/Processors/Formats/IRowOutputFormat.cpp +++ b/src/Processors/Formats/IRowOutputFormat.cpp @@ -21,9 +21,9 @@ void IRowOutputFormat::consume(DB::Chunk chunk) { if (!first_row) writeRowBetweenDelimiter(); - first_row = false; write(columns, row); + first_row = false; if (params.callback) params.callback(columns, row); diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp index 74b9541d59..81922bdde8 100644 --- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp @@ -347,8 +347,8 @@ static avro::Codec getCodec(const std::string & codec_name) } AvroRowOutputFormat::AvroRowOutputFormat( - WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & settings_) - : IRowOutputFormat(header_, out_, params) + WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & settings_) + : IRowOutputFormat(header_, out_, params_) , settings(settings_) , serializer(header_.getColumnsWithTypeAndName()) , file_writer( diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.h b/src/Processors/Formats/Impl/AvroRowOutputFormat.h index 2f1953149e..08370154d9 100644 --- a/src/Processors/Formats/Impl/AvroRowOutputFormat.h +++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.h @@ -43,7 +43,7 @@ private: class AvroRowOutputFormat : public IRowOutputFormat { public: - AvroRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & settings_); + AvroRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & settings_); virtual ~AvroRowOutputFormat() override; String getName() const override { return "AvroRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp index ad734c5cfa..d74a0a075f 100644 --- a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp @@ -9,8 +9,8 @@ namespace DB { -BinaryRowOutputFormat::BinaryRowOutputFormat(WriteBuffer & out_, const Block & header, bool with_names_, bool with_types_, const RowOutputFormatParams & params) - : IRowOutputFormat(header, out_, params), with_names(with_names_), with_types(with_types_) +BinaryRowOutputFormat::BinaryRowOutputFormat(WriteBuffer & out_, const Block & header, bool with_names_, bool with_types_, const RowOutputFormatParams & params_) + : IRowOutputFormat(header, out_, params_), with_names(with_names_), with_types(with_types_) { } diff --git a/src/Processors/Formats/Impl/BinaryRowOutputFormat.h b/src/Processors/Formats/Impl/BinaryRowOutputFormat.h index e846766303..562ed7b18a 100644 --- a/src/Processors/Formats/Impl/BinaryRowOutputFormat.h +++ b/src/Processors/Formats/Impl/BinaryRowOutputFormat.h @@ -17,7 +17,7 @@ class WriteBuffer; class BinaryRowOutputFormat: public IRowOutputFormat { public: - BinaryRowOutputFormat(WriteBuffer & out_, const Block & header, bool with_names_, bool with_types_, const RowOutputFormatParams & params); + BinaryRowOutputFormat(WriteBuffer & out_, const Block & header, bool with_names_, bool with_types_, const RowOutputFormatParams & params_); String getName() const override { return "BinaryRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp b/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp index 695ae14874..2d6a49ccb6 100644 --- a/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp @@ -8,8 +8,8 @@ namespace DB { -CSVRowOutputFormat::CSVRowOutputFormat(WriteBuffer & out_, const Block & header_, bool with_names_, const RowOutputFormatParams & params, const FormatSettings & format_settings_) - : IRowOutputFormat(header_, out_, params), with_names(with_names_), format_settings(format_settings_) +CSVRowOutputFormat::CSVRowOutputFormat(WriteBuffer & out_, const Block & header_, bool with_names_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_) + : IRowOutputFormat(header_, out_, params_), with_names(with_names_), format_settings(format_settings_) { const auto & sample = getPort(PortKind::Main).getHeader(); size_t columns = sample.columns(); diff --git a/src/Processors/Formats/Impl/CSVRowOutputFormat.h b/src/Processors/Formats/Impl/CSVRowOutputFormat.h index 3da76f4fee..55803aeb53 100644 --- a/src/Processors/Formats/Impl/CSVRowOutputFormat.h +++ b/src/Processors/Formats/Impl/CSVRowOutputFormat.h @@ -20,7 +20,7 @@ public: /** with_names - output in the first line a header with column names * with_types - output in the next line header with the names of the types */ - CSVRowOutputFormat(WriteBuffer & out_, const Block & header_, bool with_names_, const RowOutputFormatParams & params, const FormatSettings & format_settings_); + CSVRowOutputFormat(WriteBuffer & out_, const Block & header_, bool with_names_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_); String getName() const override { return "CSVRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp index a855c7d221..e12ca966a9 100644 --- a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp @@ -10,11 +10,11 @@ namespace DB JSONCompactEachRowRowOutputFormat::JSONCompactEachRowRowOutputFormat(WriteBuffer & out_, const Block & header_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool with_names_, bool yield_strings_) - : IRowOutputFormat(header_, out_, params), settings(settings_), with_names(with_names_), yield_strings(yield_strings_) + : IRowOutputFormat(header_, out_, params_), settings(settings_), with_names(with_names_), yield_strings(yield_strings_) { const auto & sample = getPort(PortKind::Main).getHeader(); NamesAndTypesList columns(sample.getNamesAndTypesList()); diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h index 5449168a1e..eb426bec15 100644 --- a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h +++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.h @@ -18,7 +18,7 @@ public: JSONCompactEachRowRowOutputFormat( WriteBuffer & out_, const Block & header_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool with_names_, bool yield_strings_); diff --git a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp index b9d4a43d36..97304afbeb 100644 --- a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp @@ -10,10 +10,10 @@ namespace DB JSONCompactRowOutputFormat::JSONCompactRowOutputFormat( WriteBuffer & out_, const Block & header, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool yield_strings_) - : JSONRowOutputFormat(out_, header, params, settings_, yield_strings_) + : JSONRowOutputFormat(out_, header, params_, settings_, yield_strings_) { } diff --git a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h index a800537877..71ba357983 100644 --- a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h +++ b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.h @@ -19,7 +19,7 @@ public: JSONCompactRowOutputFormat( WriteBuffer & out_, const Block & header, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool yield_strings_); diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp index 5cc14851b2..b3b8394964 100644 --- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp @@ -11,10 +11,10 @@ namespace DB JSONEachRowRowOutputFormat::JSONEachRowRowOutputFormat( WriteBuffer & out_, const Block & header_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool yield_strings_) - : IRowOutputFormat(header_, out_, params), settings(settings_), yield_strings(yield_strings_) + : IRowOutputFormat(header_, out_, params_), settings(settings_), yield_strings(yield_strings_) { const auto & sample = getPort(PortKind::Main).getHeader(); size_t columns = sample.columns(); diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h index 60cdbcd921..bd9cfff68c 100644 --- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h +++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.h @@ -18,7 +18,7 @@ public: JSONEachRowRowOutputFormat( WriteBuffer & out_, const Block & header_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool yield_strings_); diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp index c73abeaa98..517f126060 100644 --- a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp @@ -10,10 +10,10 @@ namespace DB JSONRowOutputFormat::JSONRowOutputFormat( WriteBuffer & out_, const Block & header, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool yield_strings_) - : IRowOutputFormat(header, out_, params), settings(settings_), yield_strings(yield_strings_) + : IRowOutputFormat(header, out_, params_), settings(settings_), yield_strings(yield_strings_) { const auto & sample = getPort(PortKind::Main).getHeader(); NamesAndTypesList columns(sample.getNamesAndTypesList()); diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.h b/src/Processors/Formats/Impl/JSONRowOutputFormat.h index 2861fccdac..88b74afbab 100644 --- a/src/Processors/Formats/Impl/JSONRowOutputFormat.h +++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.h @@ -19,7 +19,7 @@ public: JSONRowOutputFormat( WriteBuffer & out_, const Block & header, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & settings_, bool yield_strings_); diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp index 1ca4052204..51bba07d99 100644 --- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp @@ -5,8 +5,8 @@ namespace DB { -MarkdownRowOutputFormat::MarkdownRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_) - : IRowOutputFormat(header_, out_, params), format_settings(format_settings_) {} +MarkdownRowOutputFormat::MarkdownRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_) + : IRowOutputFormat(header_, out_, params_), format_settings(format_settings_) {} void MarkdownRowOutputFormat::writePrefix() { diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h index 0b79e8c42f..6bfb763d81 100644 --- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h +++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.h @@ -12,7 +12,7 @@ class ReadBuffer; class MarkdownRowOutputFormat : public IRowOutputFormat { public: - MarkdownRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_); + MarkdownRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_); /// Write higher part of markdown table like this: /// |columnName1|columnName2|...|columnNameN| diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp index d42c4f7b00..bb20d3d989 100644 --- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp @@ -24,8 +24,8 @@ namespace ErrorCodes extern const int ILLEGAL_COLUMN; } -MsgPackRowOutputFormat::MsgPackRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params) - : IRowOutputFormat(header_, out_, params), packer(out_) {} +MsgPackRowOutputFormat::MsgPackRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_) + : IRowOutputFormat(header_, out_, params_), packer(out_) {} void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr data_type, size_t row_num) { diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h index 0f91e17436..b6764ed4a4 100644 --- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h +++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h @@ -20,7 +20,7 @@ namespace DB class MsgPackRowOutputFormat : public IRowOutputFormat { public: - MsgPackRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params); + MsgPackRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_); String getName() const override { return "MsgPackRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp index de213b3a2e..9a4e7a1fbd 100644 --- a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp @@ -21,13 +21,13 @@ namespace ErrorCodes ProtobufRowOutputFormat::ProtobufRowOutputFormat( WriteBuffer & out_, const Block & header, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSchemaInfo & format_schema, const bool use_length_delimiters_) - : IRowOutputFormat(header, out_, params) + : IRowOutputFormat(header, out_, params_) , data_types(header.getDataTypes()) , writer(out, ProtobufSchemas::instance().getMessageTypeForFormatSchema(format_schema), header.getNames(), use_length_delimiters_) - , throw_on_multiple_rows_undelimited(!use_length_delimiters_ && !params.ignore_no_row_delimiter) + , throw_on_multiple_rows_undelimited(!use_length_delimiters_ && !params_.ignore_no_row_delimiter) { value_indices.resize(header.columns()); } diff --git a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h index 97f398b082..740efcfa24 100644 --- a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h +++ b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h @@ -39,7 +39,7 @@ public: ProtobufRowOutputFormat( WriteBuffer & out_, const Block & header, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSchemaInfo & format_schema, const bool use_length_delimiters_); diff --git a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp index 90afb4ced3..bcee94d8ad 100644 --- a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp @@ -9,8 +9,8 @@ namespace DB RawBLOBRowOutputFormat::RawBLOBRowOutputFormat( WriteBuffer & out_, const Block & header_, - const RowOutputFormatParams & params) - : IRowOutputFormat(header_, out_, params) + const RowOutputFormatParams & params_) + : IRowOutputFormat(header_, out_, params_) { } diff --git a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h index 13b526ed8b..6a9a70bb12 100644 --- a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h +++ b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.h @@ -30,7 +30,7 @@ public: RawBLOBRowOutputFormat( WriteBuffer & out_, const Block & header_, - const RowOutputFormatParams & params); + const RowOutputFormatParams & params_); String getName() const override { return "RawBLOBRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp index 129cb27ce5..d65ce95313 100644 --- a/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp @@ -7,8 +7,8 @@ namespace DB { -TSKVRowOutputFormat::TSKVRowOutputFormat(WriteBuffer & out_, const Block & header, const RowOutputFormatParams & params, const FormatSettings & format_settings_) - : TabSeparatedRowOutputFormat(out_, header, false, false, params, format_settings_) +TSKVRowOutputFormat::TSKVRowOutputFormat(WriteBuffer & out_, const Block & header, const RowOutputFormatParams & params_, const FormatSettings & format_settings_) + : TabSeparatedRowOutputFormat(out_, header, false, false, params_, format_settings_) { const auto & sample = getPort(PortKind::Main).getHeader(); NamesAndTypesList columns(sample.getNamesAndTypesList()); diff --git a/src/Processors/Formats/Impl/TSKVRowOutputFormat.h b/src/Processors/Formats/Impl/TSKVRowOutputFormat.h index 98a5846218..1b341cbbc7 100644 --- a/src/Processors/Formats/Impl/TSKVRowOutputFormat.h +++ b/src/Processors/Formats/Impl/TSKVRowOutputFormat.h @@ -14,7 +14,7 @@ namespace DB class TSKVRowOutputFormat: public TabSeparatedRowOutputFormat { public: - TSKVRowOutputFormat(WriteBuffer & out_, const Block & header, const RowOutputFormatParams & params, const FormatSettings & format_settings); + TSKVRowOutputFormat(WriteBuffer & out_, const Block & header, const RowOutputFormatParams & params_, const FormatSettings & format_settings); String getName() const override { return "TSKVRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h index b8b0dbc0aa..6aa7f7bdfa 100644 --- a/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h +++ b/src/Processors/Formats/Impl/TabSeparatedRawRowOutputFormat.h @@ -18,9 +18,9 @@ public: const Block & header_, bool with_names_, bool with_types_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & format_settings_) - : TabSeparatedRowOutputFormat(out_, header_, with_names_, with_types_, params, format_settings_) + : TabSeparatedRowOutputFormat(out_, header_, with_names_, with_types_, params_, format_settings_) { } diff --git a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp index f5325b3e86..da8221b11c 100644 --- a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp @@ -11,9 +11,9 @@ TabSeparatedRowOutputFormat::TabSeparatedRowOutputFormat( const Block & header_, bool with_names_, bool with_types_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & format_settings_) - : IRowOutputFormat(header_, out_, params), with_names(with_names_), with_types(with_types_), format_settings(format_settings_) + : IRowOutputFormat(header_, out_, params_), with_names(with_names_), with_types(with_types_), format_settings(format_settings_) { } diff --git a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h index 3caf1c7003..7985d6a1c8 100644 --- a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h +++ b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h @@ -23,7 +23,7 @@ public: const Block & header_, bool with_names_, bool with_types_, - const RowOutputFormatParams & params, + const RowOutputFormatParams & params_, const FormatSettings & format_settings_); String getName() const override { return "TabSeparatedRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp index 71dbe4da00..7791e1296e 100644 --- a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp @@ -10,8 +10,8 @@ namespace DB { -ValuesRowOutputFormat::ValuesRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_) - : IRowOutputFormat(header_, out_, params), format_settings(format_settings_) +ValuesRowOutputFormat::ValuesRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_) + : IRowOutputFormat(header_, out_, params_), format_settings(format_settings_) { } diff --git a/src/Processors/Formats/Impl/ValuesRowOutputFormat.h b/src/Processors/Formats/Impl/ValuesRowOutputFormat.h index 183fd44cb6..73f91866f4 100644 --- a/src/Processors/Formats/Impl/ValuesRowOutputFormat.h +++ b/src/Processors/Formats/Impl/ValuesRowOutputFormat.h @@ -15,7 +15,7 @@ class WriteBuffer; class ValuesRowOutputFormat : public IRowOutputFormat { public: - ValuesRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_); + ValuesRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_); String getName() const override { return "ValuesRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp index c6dad48905..a3c71cbde5 100644 --- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp @@ -11,8 +11,8 @@ namespace DB { VerticalRowOutputFormat::VerticalRowOutputFormat( - WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_) - : IRowOutputFormat(header_, out_, params), format_settings(format_settings_) + WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_) + : IRowOutputFormat(header_, out_, params_), format_settings(format_settings_) { const auto & sample = getPort(PortKind::Main).getHeader(); size_t columns = sample.columns(); diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.h b/src/Processors/Formats/Impl/VerticalRowOutputFormat.h index 3648300232..d372f5f611 100644 --- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.h +++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.h @@ -18,7 +18,7 @@ class Context; class VerticalRowOutputFormat : public IRowOutputFormat { public: - VerticalRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_); + VerticalRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_); String getName() const override { return "VerticalRowOutputFormat"; } diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp index e36af1610d..a677d0de9a 100644 --- a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp +++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp @@ -7,8 +7,8 @@ namespace DB { -XMLRowOutputFormat::XMLRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_) - : IRowOutputFormat(header_, out_, params), format_settings(format_settings_) +XMLRowOutputFormat::XMLRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_) + : IRowOutputFormat(header_, out_, params_), format_settings(format_settings_) { const auto & sample = getPort(PortKind::Main).getHeader(); NamesAndTypesList columns(sample.getNamesAndTypesList()); diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.h b/src/Processors/Formats/Impl/XMLRowOutputFormat.h index 91be4db82f..233ee773c1 100644 --- a/src/Processors/Formats/Impl/XMLRowOutputFormat.h +++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.h @@ -16,7 +16,7 @@ namespace DB class XMLRowOutputFormat : public IRowOutputFormat { public: - XMLRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params, const FormatSettings & format_settings_); + XMLRowOutputFormat(WriteBuffer & out_, const Block & header_, const RowOutputFormatParams & params_, const FormatSettings & format_settings_); String getName() const override { return "XMLRowOutputFormat"; } -- GitLab