Remove copy_thread parameter from output constructors

The output derived classes can create the copy_thread themselves. They
just need the options which they have anyway.

Author: joto

src/output-flex.cpp

@@ -1997,11 +1997,11 @@ output_flex_t::clone(std::shared_ptr<middle_query_t> const &mid,
     return std::make_shared<output_flex_t>(this, mid, copy_thread);
 }
 
-output_flex_t::output_flex_t(
-    std::shared_ptr<middle_query_t> const &mid,
-    std::shared_ptr<thread_pool_t> thread_pool, options_t const &o,
-    std::shared_ptr<db_copy_thread_t> const &copy_thread)
-: output_t(mid, std::move(thread_pool), o), m_copy_thread(copy_thread),
+output_flex_t::output_flex_t(std::shared_ptr<middle_query_t> const &mid,
+                             std::shared_ptr<thread_pool_t> thread_pool,
+                             options_t const &o)
+: output_t(mid, std::move(thread_pool), o),
+  m_copy_thread(std::make_shared<db_copy_thread_t>(get_options()->conninfo)),
   m_expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection)
 {
     init_lua(get_options()->style);

src/output-flex.hpp

@@ -99,10 +99,9 @@ class output_flex_t : public output_t
 {
 public:
     /// Constructor for new objects
-    output_flex_t(
-        std::shared_ptr<middle_query_t> const &mid,
-        std::shared_ptr<thread_pool_t> thread_pool, options_t const &options,
-        std::shared_ptr<db_copy_thread_t> const &copy_thread);
+    output_flex_t(std::shared_ptr<middle_query_t> const &mid,
+                  std::shared_ptr<thread_pool_t> thread_pool,
+                  options_t const &options);
 
     /// Constructor for cloned objects
     output_flex_t(output_flex_t const *other,

src/output-gazetteer.hpp

@@ -32,9 +32,9 @@ class output_gazetteer_t : public output_t
     /// Constructor for new objects
     output_gazetteer_t(std::shared_ptr<middle_query_t> const &mid,
                        std::shared_ptr<thread_pool_t> thread_pool,
-                       options_t const &options,
-                       std::shared_ptr<db_copy_thread_t> const &copy_thread)
-    : output_t(mid, std::move(thread_pool), options), m_copy(copy_thread),
+                       options_t const &options)
+    : output_t(mid, std::move(thread_pool), options),
+      m_copy(std::make_shared<db_copy_thread_t>(get_options()->conninfo)),
       m_proj(options.projection)
     {
         m_style.load_style(options.style);

src/output-pgsql.cpp

@@ -418,10 +418,9 @@ std::shared_ptr<output_t> output_pgsql_t::clone(
     return std::make_shared<output_pgsql_t>(this, mid, copy_thread);
 }
 
-output_pgsql_t::output_pgsql_t(
-    std::shared_ptr<middle_query_t> const &mid,
-    std::shared_ptr<thread_pool_t> thread_pool, options_t const &o,
-    std::shared_ptr<db_copy_thread_t> const &copy_thread)
+output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
+                               std::shared_ptr<thread_pool_t> thread_pool,
+                               options_t const &o)
 : output_t(mid, std::move(thread_pool), o), m_proj(o.projection),
   m_expire(o.expire_tiles_zoom, o.expire_tiles_max_bbox, o.projection),
   m_buffer(32768, osmium::memory::Buffer::auto_grow::yes),
@@ -436,6 +435,9 @@ output_pgsql_t::output_pgsql_t(
 
     m_tagtransform = tagtransform_t::make_tagtransform(get_options(), exlist);
 
+    auto copy_thread =
+        std::make_shared<db_copy_thread_t>(get_options()->conninfo);
+
     //for each table
     for (size_t i = 0; i < t_MAX; ++i) {
 

src/output-pgsql.hpp

@@ -40,8 +40,7 @@ class output_pgsql_t : public output_t
     /// Constructor for new objects
     output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
                    std::shared_ptr<thread_pool_t> thread_pool,
-                   options_t const &options,
-                   std::shared_ptr<db_copy_thread_t> const &copy_thread);
+                   options_t const &options);
 
     /// Constructor for cloned objects
     output_pgsql_t(output_pgsql_t const *other,

src/output.cpp

@@ -30,23 +30,21 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
                         std::shared_ptr<thread_pool_t> thread_pool,
                         options_t const &options)
 {
-    auto copy_thread = std::make_shared<db_copy_thread_t>(options.conninfo);
-
     if (options.output_backend == "pgsql") {
         return std::make_shared<output_pgsql_t>(mid, std::move(thread_pool),
-                                                options, copy_thread);
+                                                options);
     }
 
 #ifdef HAVE_LUA
     if (options.output_backend == "flex") {
         return std::make_shared<output_flex_t>(mid, std::move(thread_pool),
-                                               options, copy_thread);
+                                               options);
     }
 #endif
 
     if (options.output_backend == "gazetteer") {
         return std::make_shared<output_gazetteer_t>(mid, std::move(thread_pool),
-                                                    options, copy_thread);
+                                                    options);
     }
 
     if (options.output_backend == "null") {