Merge pull request #1135 from joto/middle-tests-id-tracker

Tests for middle around id-tracker

Author: lonvia

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

@@ -804,7 +804,7 @@ middle_pgsql_t::get_query_instance()
     return std::shared_ptr<middle_query_t>(mid.release());
 }
 
-size_t middle_pgsql_t::pending_count() const
+bool middle_pgsql_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();
 }

src/middle-pgsql.hpp

@@ -83,7 +83,7 @@ struct middle_pgsql_t : public slim_middle_t
     void iterate_ways(middle_t::pending_processor &pf) override;
     void iterate_relations(pending_processor &pf) override;
 
-    size_t pending_count() const override;
+    bool has_pending() const override;
 
     class table_desc
     {

src/middle-ram.cpp

@@ -76,8 +76,6 @@ void middle_ram_t::iterate_relations(pending_processor &pf)
     pf.process_relations();
 }
 
-size_t middle_ram_t::pending_count() const { return 0; }
-
 void middle_ram_t::iterate_ways(middle_t::pending_processor &pf)
 {
     //let the outputs enqueue everything they have the non slim middle

src/middle-ram.hpp

@@ -118,7 +118,7 @@ struct middle_ram_t : public middle_t, public middle_query_t
     void iterate_ways(middle_t::pending_processor &pf) override;
     void iterate_relations(pending_processor &pf) override;
 
-    size_t pending_count() const override;
+    bool has_pending() const override { return false; }
 
     std::shared_ptr<middle_query_t> get_query_instance() override;
 

src/middle.hpp

@@ -133,7 +133,7 @@ struct middle_t
     virtual void iterate_ways(pending_processor &pf) = 0;
     virtual void iterate_relations(pending_processor &pf) = 0;
 
-    virtual size_t pending_count() const = 0;
+    virtual bool has_pending() const = 0;
 
     virtual std::shared_ptr<middle_query_t> get_query_instance() = 0;
 };

src/osmdata.cpp

@@ -403,13 +403,13 @@ struct pending_threaded_processor : public middle_t::pending_processor
  */
 bool osmdata_t::has_pending() const noexcept
 {
-    if (m_mid->pending_count() > 0) {
+    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->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;