Remove now unused has_pending() function in outputs

Author: joto

src/osmdata.cpp

@@ -401,21 +401,6 @@ struct pending_threaded_processor : public middle_t::pending_processor
 
 } // anonymous namespace
 
-/**
- * Is there any pending work in the middle or one of the outputs?
- */
-bool osmdata_t::has_pending() const noexcept
-{
-    if (m_mid->has_pending()) {
-        return true;
-    }
-
-    return std::any_of(m_outs.cbegin(), m_outs.cend(),
-                       [](std::shared_ptr<output_t> const &out) {
-                           return out->has_pending();
-                       });
-}
-
 void osmdata_t::stop() const
 {
     /* Commit the transactions, so that multiple processes can
@@ -432,7 +417,7 @@ void osmdata_t::stop() const
     auto const *opts = m_outs[0]->get_options();
 
     // are there any objects left pending?
-    if (has_pending()) {
+    if (m_mid->has_pending()) {
         //threaded pending processing
         pending_threaded_processor ptp(m_mid, m_outs, opts->num_procs,
                                        opts->append);

src/osmdata.hpp

@@ -34,7 +34,6 @@ class osmdata_t
 
 private:
     slim_middle_t &slim_middle() const noexcept;
-    bool has_pending() const noexcept;
 
     std::shared_ptr<middle_t> m_mid;
     std::vector<std::shared_ptr<output_t>> m_outs;

src/output-flex.cpp

@@ -1334,11 +1334,6 @@ void output_flex_t::init_lua(std::string const &filename)
     lua_remove(lua_state(), 1); // global "osm2pgsql"
 }
 
-bool output_flex_t::has_pending() const
-{
-    return false;
-}
-
 void output_flex_t::stage2_proc()
 {
     bool const has_marked_ways = !m_stage2_ways_tracker->empty();

src/output-flex.hpp

@@ -79,8 +79,6 @@ class output_flex_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    bool has_pending() const override;
-
     void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;
 

src/output-multi.cpp

@@ -65,11 +65,6 @@ void output_multi_t::start()
                    m_options.tblsmain_data);
 }
 
-bool output_multi_t::has_pending() const
-{
-    return false;
-}
-
 void output_multi_t::pending_way(osmid_t id, int exists)
 {
     // Try to fetch the way from the DB

src/output-multi.hpp

@@ -64,8 +64,6 @@ class output_multi_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    bool has_pending() const override;
-
     void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;
 

src/output-pgsql.cpp

@@ -425,11 +425,6 @@ output_pgsql_t::output_pgsql_t(
 
 output_pgsql_t::~output_pgsql_t() = default;
 
-bool output_pgsql_t::has_pending() const
-{
-    return false;
-}
-
 void output_pgsql_t::merge_pending_relations(output_t *)
 {
 }

src/output-pgsql.hpp

@@ -64,8 +64,6 @@ class output_pgsql_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    bool has_pending() const override;
-
     void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;
 

src/output.cpp

@@ -197,8 +197,6 @@ output_t::output_t(std::shared_ptr<middle_query_t> const &mid,
 
 output_t::~output_t() = default;
 
-bool output_t::has_pending() const { return false; }
-
 options_t const *output_t::get_options() const { return &m_options; }
 
 void output_t::merge_pending_relations(output_t *) {}

src/output.hpp

@@ -73,8 +73,6 @@ class output_t
     virtual void way_delete(osmid_t id) = 0;
     virtual void relation_delete(osmid_t id) = 0;
 
-    virtual bool has_pending() const;
-
     const options_t *get_options() const;
 
     virtual void merge_pending_relations(output_t *other);