Miscellaneous #2702

dbms/src/Formats/ValuesRowInputStream.cpp

@@ -30,9 +30,8 @@ namespace ErrorCodes
 
 
 ValuesRowInputStream::ValuesRowInputStream(ReadBuffer & istr_, const Block & header_, const Context & context_, const FormatSettings & format_settings)
-    : istr(istr_), header(header_), format_settings(format_settings)
+    : istr(istr_), header(header_), context(std::make_unique<Context>(context_)), format_settings(format_settings)
 {
-    context = std::make_unique<Context>(context_);
     /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
     skipBOMIfExists(istr);
 }

dbms/src/Formats/ValuesRowInputStream.h

@@ -28,7 +28,7 @@ public:
 private:
     ReadBuffer & istr;
     Block header;
-    std::unique_ptr<Context> context;
+    std::unique_ptr<Context> context;   /// pimpl
     const FormatSettings format_settings;
 };