diff --git a/src/Processors/Formats/IRowOutputFormat.cpp b/src/Processors/Formats/IRowOutputFormat.cpp index 82d83a88cf1431dd07ab661e4455b25de97cc106..b684dd82261dff786179e8a64044a1bc49593cae 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 74b9541d59a6bbeb098ee158e4a9cd43a6eb1037..81922bdde809183a41059f2864bc051bfbfb2e92 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 2f1953149e1e99a69a51b15300dcf4bc23ffd2d9..08370154d9a735d34f45db99a9344d6a05ca8f60 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 ad734c5cfa99503c41a700c9d38b52a8afb43f73..d74a0a075fe668fd447b28e2247dcd31f79a1d09 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 e84676630385001a750b4b788b38bb3a4ddb9d1c..562ed7b18aa85dee247400872058947b410f88d9 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 695ae148749ea49fb9c02f886ed4fabf6b734a27..2d6a49ccb6f939263898070f258e27a792bb0c32 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 3da76f4fee5667269a16513dabed91cdc6617837..55803aeb53e2b37e1763a52dc7edddb6c0445f83 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 a855c7d2215deb3830bf9787f92d8eb8fe77b9ae..e12ca966a93a681d180dd176c0da24e10958eacf 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 5449168a1ec2b47789a349276a6f227558e4fb07..eb426bec15d7c50c9a789c38d6366fb692f19385 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 b9d4a43d36a064578621721f5d336e83e1e5c0bd..97304afbebd9bcfae677b791dc9d24621b055eb7 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 a800537877b3a5d528d9c9e6dbab746c8a55ec32..71ba3579837b7a9cac4bebfd2f9664660d1bd50a 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 5cc14851b285f5e876c64f3d68851ddb90fa7d93..b3b83949642179de6e7e573fbd6e8fd7039e7eb3 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 60cdbcd921eede4f30312a41cd77956035abb35c..bd9cfff68c5befce6f8623d879b68913cb486cc5 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 c73abeaa98a39a6b9aabbd7acd4e6a03718398c4..517f126060ff45b08af6e6a38b2a950847ef9710 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 2861fccdac3fcaa9fc8efd1debee12526f76af8c..88b74afbabdf3d641ea13fe90e886a96e8b1f20b 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 1ca40522048e5cc00c175e3f9b2bf5ced80ef630..51bba07d995c22a5017326d0e8a6ebb131179743 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 0b79e8c42ff43b204438f9caafcce6334df0ec09..6bfb763d818d7edc4c94989052bfa3c781152ba5 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 d42c4f7b00257068454adf82dd3adab9ebe151df..bb20d3d989927550c86f3fcca48853d020e419bd 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 0f91e174367977a6f39bd19dbc4664818acae9f6..b6764ed4a4f403e790c332598a737e8a743dd7b2 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 de213b3a2eaeb411d64b9de0f42c1c9e61d31800..9a4e7a1fbdb172daf85b74333c77203f9c9aa019 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 97f398b082b878ae77ca589dbed08bfaa92ac7a1..740efcfa24c309ba97525bec8b1dbe7272a4a7b0 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 90afb4ced306f5f0b93a04d3e997debc7d098de5..bcee94d8ad5494cc108417541f97fa046c63c694 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 13b526ed8beefc75d41cb9a8952d4f9a0ff261de..6a9a70bb12f861654b557ac4960407cbf8c8bbc6 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 129cb27ce534810723956fd2a660891954a3de12..d65ce95313e53396d3d6e194c77657848891b0db 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 98a5846218ceb2c2b5a155046d4f22b2e097eed9..1b341cbbc72f0126c2bb9aa1394eac6de6dbae8a 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 b8b0dbc0aa6fa9090d8fecb30b87bbadd0ad5c23..6aa7f7bdfadb6342e19db398a40e2d1ad22bca0c 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 f5325b3e86988a2110bf150d73d02b7e771b9763..da8221b11c5f4ffc72b22a21ad1508224d035613 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 3caf1c7003ee1ac21c833fbabb519c139b7d846f..7985d6a1c86dde236fdbb64f1c7fac3e9854f901 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 71dbe4da00c8dc80f83e6f98d1103748a24ee51e..7791e1296e074106a9343cf2b6bb75590f9a2ef5 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 183fd44cb60d1edf57713c7b66a49bd12adc6666..73f91866f4379d21132ca75410e308d176a10d50 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 c6dad4890598480c9fdd5b163a793356af53ba9f..a3c71cbde59010482b9eb243ce5e78bc2cdd62f9 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 364830023254f6d9498a09a13677a1d43326dc77..d372f5f611a0872197a592bad1f662507bbf8dde 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 e36af1610de8d942f3cac78854f174c6a55ee21b..a677d0de9a0376c4d030a62147542d8157df5415 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 91be4db82f9b6494cf72891d6ec682bd2976fc7e..233ee773c1c57b6a33a25147366415daff40dfc5 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"; }