Avoid shadowing class member, set first_row flag after write

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);

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(

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

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_)
 {
 }
 

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

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();

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

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());

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_);

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_)
 {
 }
 

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_);
 

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();

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_);
 

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());

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_);
 

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()
 {

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|

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)
 {

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

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());
 }

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_);
 

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_)
 {
 }
 

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

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());

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

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_)
     {
     }
 

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_)
 {
 }
 

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

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_)
 {
 }
 

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

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();

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

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());

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