Remove second parameter of pending_way/relation

joto · joto · commit d4e2e640da4d · 2020-05-20T09:26:40.000+02:00
diff --git a/src/osmdata.cpp b/src/osmdata.cpp
@@ -195,9 +195,9 @@ struct pending_threaded_processor : public pending_processor
 
             //process it
             if (ways) {
-                outputs.at(job.output_id)->pending_way(job.osm_id, true);
+                outputs.at(job.output_id)->pending_way(job.osm_id);
             } else {
-                outputs.at(job.output_id)->pending_relation(job.osm_id, true);
+                outputs.at(job.output_id)->pending_relation(job.osm_id);
             }
         }
     }
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -1007,7 +1007,7 @@ void output_flex_t::call_process_function(int index,
     }
 }
 
-void output_flex_t::pending_way(osmid_t id, bool exists)
+void output_flex_t::pending_way(osmid_t id)
 {
     if (!m_has_process_way) {
         return;
@@ -1018,9 +1018,7 @@ void output_flex_t::pending_way(osmid_t id, bool exists)
         return;
     }
 
-    if (exists) {
-        way_delete(id);
-    }
+    way_delete(id);
 
     auto &way = m_buffer.get<osmium::Way>(0);
 
@@ -1031,7 +1029,7 @@ void output_flex_t::pending_way(osmid_t id, bool exists)
     m_buffer.clear();
 }
 
-void output_flex_t::pending_relation(osmid_t id, bool exists)
+void output_flex_t::pending_relation(osmid_t id)
 {
     if (!m_has_process_relation) {
         return;
@@ -1045,10 +1043,7 @@ void output_flex_t::pending_relation(osmid_t id, bool exists)
         return;
     }
 
-    // If the flag says this object may exist already, delete it first.
-    if (exists) {
-        delete_from_tables(osmium::item_type::relation, id);
-    }
+    delete_from_tables(osmium::item_type::relation, id);
 
     auto const &relation = m_rels_buffer.get<osmium::Relation>(0);
 
diff --git a/src/output-flex.hpp b/src/output-flex.hpp
@@ -61,8 +61,8 @@ class output_flex_t : public output_t
 
     void stage2_proc() override;
 
-    void pending_way(osmid_t id, bool exists) override;
-    void pending_relation(osmid_t id, bool exists) override;
+    void pending_way(osmid_t id) override;
+    void pending_relation(osmid_t id) override;
 
     void node_add(osmium::Node const &node) override;
     void way_add(osmium::Way *way) override;
diff --git a/src/output-gazetteer.hpp b/src/output-gazetteer.hpp
@@ -47,8 +47,8 @@ class output_gazetteer_t : public output_t
 
     bool need_forward_dependencies() const noexcept override { return false; }
 
-    void pending_way(osmid_t, bool) noexcept override {}
-    void pending_relation(osmid_t, bool) noexcept override {}
+    void pending_way(osmid_t) noexcept override {}
+    void pending_relation(osmid_t) noexcept override {}
 
     void node_add(osmium::Node const &node) override;
     void way_add(osmium::Way *way) override;
diff --git a/src/output-multi.cpp b/src/output-multi.cpp
@@ -65,23 +65,23 @@ void output_multi_t::start()
                    m_options.tblsmain_data);
 }
 
-void output_multi_t::pending_way(osmid_t id, bool exists)
+void output_multi_t::pending_way(osmid_t id)
 {
     // Try to fetch the way from the DB
     buffer.clear();
     if (m_mid->way_get(id, buffer)) {
         // Output the way
-        reprocess_way(&buffer.get<osmium::Way>(0), exists);
+        reprocess_way(&buffer.get<osmium::Way>(0), true);
     }
 }
 
-void output_multi_t::pending_relation(osmid_t id, bool exists)
+void output_multi_t::pending_relation(osmid_t id)
 {
     // Try to fetch the relation from the DB
     buffer.clear();
     if (m_mid->relation_get(id, buffer)) {
         auto const &rel = buffer.get<osmium::Relation>(0);
-        process_relation(rel, exists);
+        process_relation(rel, true);
     }
 }
 
diff --git a/src/output-multi.hpp b/src/output-multi.hpp
@@ -46,8 +46,8 @@ class output_multi_t : public output_t
     void stop(osmium::thread::Pool *pool) override;
     void commit() override;
 
-    void pending_way(osmid_t id, bool exists) override;
-    void pending_relation(osmid_t id, bool exists) override;
+    void pending_way(osmid_t id) override;
+    void pending_relation(osmid_t id) override;
 
     void node_add(osmium::Node const &node) override;
     void way_add(osmium::Way *way) override;
diff --git a/src/output-null.hpp b/src/output-null.hpp
@@ -24,8 +24,8 @@ class output_null_t : public output_t
 
     bool need_forward_dependencies() const noexcept override { return false; }
 
-    void pending_way(osmid_t /*id*/, bool /*exists*/) override {}
-    void pending_relation(osmid_t /*id*/, bool /*exists*/) override {}
+    void pending_way(osmid_t) override {}
+    void pending_relation(osmid_t) override {}
 
     void node_add(osmium::Node const & /*node*/) override {}
     void way_add(osmium::Way * /*way*/) override {}
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
@@ -66,15 +66,12 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
     }
 }
 
-void output_pgsql_t::pending_way(osmid_t id, bool exists)
+void output_pgsql_t::pending_way(osmid_t id)
 {
     // Try to fetch the way from the DB
     buffer.clear();
     if (m_mid->way_get(id, buffer)) {
-        /* If the flag says this object may exist already, delete it first */
-        if (exists) {
-            pgsql_delete_way_from_output(id);
-        }
+        pgsql_delete_way_from_output(id);
 
         taglist_t outtags;
         int polygon;
@@ -90,18 +87,15 @@ void output_pgsql_t::pending_way(osmid_t id, bool exists)
     }
 }
 
-void output_pgsql_t::pending_relation(osmid_t id, bool exists)
+void output_pgsql_t::pending_relation(osmid_t id)
 {
     // Try to fetch the relation from the DB
     // Note that we cannot use the global buffer here because
     // we cannot keep a reference to the relation and an autogrow buffer
     // might be relocated when more data is added.
     rels_buffer.clear();
     if (m_mid->relation_get(id, rels_buffer)) {
-        // If the flag says this object may exist already, delete it first.
-        if (exists) {
-            pgsql_delete_relation_from_output(id);
-        }
+        pgsql_delete_relation_from_output(id);
 
         auto const &rel = rels_buffer.get<osmium::Relation>(0);
         pgsql_process_relation(rel);
diff --git a/src/output-pgsql.hpp b/src/output-pgsql.hpp
@@ -46,8 +46,8 @@ class output_pgsql_t : public output_t
     void stop(osmium::thread::Pool *pool) override;
     void commit() override;
 
-    void pending_way(osmid_t id, bool exists) override;
-    void pending_relation(osmid_t id, bool exists) override;
+    void pending_way(osmid_t id) override;
+    void pending_relation(osmid_t id) override;
 
     void node_add(osmium::Node const &node) override;
     void way_add(osmium::Way *way) override;
diff --git a/src/output.hpp b/src/output.hpp
@@ -40,8 +40,8 @@ class output_t
 
     virtual bool need_forward_dependencies() const noexcept { return true; }
 
-    virtual void pending_way(osmid_t id, bool exists) = 0;
-    virtual void pending_relation(osmid_t id, bool exists) = 0;
+    virtual void pending_way(osmid_t id) = 0;
+    virtual void pending_relation(osmid_t id) = 0;
 
     virtual void node_add(osmium::Node const &node) = 0;
     virtual void way_add(osmium::Way *way) = 0;

Original file line number	Diff line number	Diff line change
`@@ -195,9 +195,9 @@ struct pending_threaded_processor : public pending_processor`
`195`	`195`
`196`	`196`	`//process it`
`197`	`197`	`if (ways) {`
`198`		`- outputs.at(job.output_id)->pending_way(job.osm_id, true);`
	`198`	`+ outputs.at(job.output_id)->pending_way(job.osm_id);`
`199`	`199`	`} else {`
`200`		`- outputs.at(job.output_id)->pending_relation(job.osm_id, true);`
	`200`	`+ outputs.at(job.output_id)->pending_relation(job.osm_id);`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ void output_flex_t::call_process_function(int index,`
`1007`	`1007`	`}`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`		`-void output_flex_t::pending_way(osmid_t id, bool exists)`
	`1010`	`+void output_flex_t::pending_way(osmid_t id)`
`1011`	`1011`	`{`
`1012`	`1012`	`if (!m_has_process_way) {`
`1013`	`1013`	`return;`
`@@ -1018,9 +1018,7 @@ void output_flex_t::pending_way(osmid_t id, bool exists)`
`1018`	`1018`	`return;`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`		`- if (exists) {`
`1022`		`- way_delete(id);`
`1023`		`- }`
	`1021`	`+ way_delete(id);`
`1024`	`1022`
`1025`	`1023`	`auto &way = m_buffer.get<osmium::Way>(0);`
`1026`	`1024`
`@@ -1031,7 +1029,7 @@ void output_flex_t::pending_way(osmid_t id, bool exists)`
`1031`	`1029`	`m_buffer.clear();`
`1032`	`1030`	`}`
`1033`	`1031`
`1034`		`-void output_flex_t::pending_relation(osmid_t id, bool exists)`
	`1032`	`+void output_flex_t::pending_relation(osmid_t id)`
`1035`	`1033`	`{`
`1036`	`1034`	`if (!m_has_process_relation) {`
`1037`	`1035`	`return;`
`@@ -1045,10 +1043,7 @@ void output_flex_t::pending_relation(osmid_t id, bool exists)`
`1045`	`1043`	`return;`
`1046`	`1044`	`}`
`1047`	`1045`
`1048`		`- // If the flag says this object may exist already, delete it first.`
`1049`		`- if (exists) {`
`1050`		`- delete_from_tables(osmium::item_type::relation, id);`
`1051`		`- }`
	`1046`	`+ delete_from_tables(osmium::item_type::relation, id);`
`1052`	`1047`
`1053`	`1048`	`auto const &relation = m_rels_buffer.get<osmium::Relation>(0);`
`1054`	`1049`
Original file line number	Diff line number	Diff line change
`@@ -65,23 +65,23 @@ void output_multi_t::start()`
`65`	`65`	`m_options.tblsmain_data);`
`66`	`66`	`}`
`67`	`67`
`68`		`-void output_multi_t::pending_way(osmid_t id, bool exists)`
	`68`	`+void output_multi_t::pending_way(osmid_t id)`
`69`	`69`	`{`
`70`	`70`	`// Try to fetch the way from the DB`
`71`	`71`	`buffer.clear();`
`72`	`72`	`if (m_mid->way_get(id, buffer)) {`
`73`	`73`	`// Output the way`
`74`		`- reprocess_way(&buffer.get<osmium::Way>(0), exists);`
	`74`	`+ reprocess_way(&buffer.get<osmium::Way>(0), true);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-void output_multi_t::pending_relation(osmid_t id, bool exists)`
	`78`	`+void output_multi_t::pending_relation(osmid_t id)`
`79`	`79`	`{`
`80`	`80`	`// Try to fetch the relation from the DB`
`81`	`81`	`buffer.clear();`
`82`	`82`	`if (m_mid->relation_get(id, buffer)) {`
`83`	`83`	`auto const &rel = buffer.get<osmium::Relation>(0);`
`84`		`- process_relation(rel, exists);`
	`84`	`+ process_relation(rel, true);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,12 @@ void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`-void output_pgsql_t::pending_way(osmid_t id, bool exists)`
	`69`	`+void output_pgsql_t::pending_way(osmid_t id)`
`70`	`70`	`{`
`71`	`71`	`// Try to fetch the way from the DB`
`72`	`72`	`buffer.clear();`
`73`	`73`	`if (m_mid->way_get(id, buffer)) {`
`74`		`- /* If the flag says this object may exist already, delete it first */`
`75`		`- if (exists) {`
`76`		`- pgsql_delete_way_from_output(id);`
`77`		`- }`
	`74`	`+ pgsql_delete_way_from_output(id);`
`78`	`75`
`79`	`76`	`taglist_t outtags;`
`80`	`77`	`int polygon;`
`@@ -90,18 +87,15 @@ void output_pgsql_t::pending_way(osmid_t id, bool exists)`
`90`	`87`	`}`
`91`	`88`	`}`
`92`	`89`
`93`		`-void output_pgsql_t::pending_relation(osmid_t id, bool exists)`
	`90`	`+void output_pgsql_t::pending_relation(osmid_t id)`
`94`	`91`	`{`
`95`	`92`	`// Try to fetch the relation from the DB`
`96`	`93`	`// Note that we cannot use the global buffer here because`
`97`	`94`	`// we cannot keep a reference to the relation and an autogrow buffer`
`98`	`95`	`// might be relocated when more data is added.`
`99`	`96`	`rels_buffer.clear();`
`100`	`97`	`if (m_mid->relation_get(id, rels_buffer)) {`
`101`		`- // If the flag says this object may exist already, delete it first.`
`102`		`- if (exists) {`
`103`		`- pgsql_delete_relation_from_output(id);`
`104`		`- }`
	`98`	`+ pgsql_delete_relation_from_output(id);`
`105`	`99`
`106`	`100`	`auto const &rel = rels_buffer.get<osmium::Relation>(0);`
`107`	`101`	`pgsql_process_relation(rel);`