Replace pending_count() function by has_pending() in output

Author: joto

src/id-tracker.cpp

@@ -185,6 +185,7 @@ osmid_t id_tracker::pop_mark()
 }
 
 size_t id_tracker::size() const { return impl->count; }
+bool id_tracker::empty() const { return impl->count == 0; }
 
 osmid_t id_tracker::last_returned() const { return impl->old_id; }
 

src/id-tracker.hpp

@@ -37,6 +37,7 @@ struct id_tracker
      */
     osmid_t pop_mark();
     size_t size() const;
+    bool empty() const;
     osmid_t last_returned() const;
 
     static bool is_valid(osmid_t);

src/middle-pgsql.cpp

@@ -806,6 +806,5 @@ middle_pgsql_t::get_query_instance()
 
 bool middle_pgsql_t::has_pending() const
 {
-    return (m_ways_pending_tracker->size() > 0) ||
-           (m_rels_pending_tracker->size() > 0);
+    return !m_ways_pending_tracker->empty() || !m_rels_pending_tracker->empty();
 }

src/osmdata.cpp

@@ -409,7 +409,7 @@ bool osmdata_t::has_pending() const noexcept
 
     return std::any_of(m_outs.cbegin(), m_outs.cend(),
                        [](std::shared_ptr<output_t> const &out) {
-                           return out->pending_count() > 0;
+                           return out->has_pending();
                        });
 }
 

src/output-flex.cpp

@@ -1412,15 +1412,15 @@ void output_flex_t::init_lua(std::string const &filename)
     lua_remove(lua_state(), 1); // global "osm2pgsql"
 }
 
-std::size_t output_flex_t::pending_count() const
+bool output_flex_t::has_pending() const
 {
-    return m_ways_pending_tracker.size() + m_rels_pending_tracker.size();
+    return !m_ways_pending_tracker.empty() || !m_rels_pending_tracker.empty();
 }
 
 void output_flex_t::stage2_proc()
 {
-    bool const has_marked_ways = m_stage2_ways_tracker->size() > 0;
-    bool const has_marked_rels = m_stage2_rels_tracker->size() > 0;
+    bool const has_marked_ways = !m_stage2_ways_tracker->empty();
+    bool const has_marked_rels = !m_stage2_rels_tracker->empty();
 
     if (!has_marked_ways && !has_marked_rels) {
         fmt::print(stderr, "Skipping stage 2 (no marked objects).\n");

src/output-flex.hpp

@@ -81,7 +81,7 @@ class output_flex_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    std::size_t pending_count() const 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

@@ -70,9 +70,9 @@ void output_multi_t::start()
                    m_options.tblsmain_data);
 }
 
-size_t output_multi_t::pending_count() const
+bool output_multi_t::has_pending() const
 {
-    return ways_pending_tracker.size() + rels_pending_tracker.size();
+    return !ways_pending_tracker.empty() || !rels_pending_tracker.empty();
 }
 
 void output_multi_t::enqueue_ways(pending_queue_t &job_queue, osmid_t id,

src/output-multi.hpp

@@ -66,7 +66,7 @@ class output_multi_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    size_t pending_count() const 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

@@ -510,9 +510,9 @@ output_pgsql_t::output_pgsql_t(
 
 output_pgsql_t::~output_pgsql_t() = default;
 
-size_t output_pgsql_t::pending_count() const
+bool output_pgsql_t::has_pending() const
 {
-    return ways_pending_tracker.size() + rels_pending_tracker.size();
+    return !ways_pending_tracker.empty() || !rels_pending_tracker.empty();
 }
 
 void output_pgsql_t::merge_pending_relations(output_t *other)

src/output-pgsql.hpp

@@ -66,7 +66,7 @@ class output_pgsql_t : public output_t
     void way_delete(osmid_t id) override;
     void relation_delete(osmid_t id) override;
 
-    size_t pending_count() const override;
+    bool has_pending() const override;
 
     void merge_pending_relations(output_t *other) override;
     void merge_expire_trees(output_t *other) override;