Skip to content

Commit 92d7fd5

Browse files
committed
In middle-ram iterate_ways/relations can now be empty
We don't need to track any objects in create mode and middle-ram does not support append mode.
1 parent 13b448e commit 92d7fd5

File tree

4 files changed

+4
-26
lines changed

4 files changed

+4
-26
lines changed

src/middle-pgsql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ void middle_pgsql_t::way_delete(osmid_t osm_id)
439439
m_db_copy.delete_object(osm_id);
440440
}
441441

442-
void middle_pgsql_t::iterate_ways(middle_t::pending_processor &pf)
442+
void middle_pgsql_t::iterate_ways(pending_processor &pf)
443443
{
444444
// enqueue the jobs
445445
osmid_t id;

src/middle-pgsql.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct middle_pgsql_t : public slim_middle_t
8080

8181
void flush() override;
8282

83-
void iterate_ways(middle_t::pending_processor &pf) override;
83+
void iterate_ways(pending_processor &pf) override;
8484
void iterate_relations(pending_processor &pf) override;
8585

8686
bool has_pending() const override;

src/middle-ram.cpp

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,6 @@ size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
6464
return count;
6565
}
6666

67-
void middle_ram_t::iterate_relations(pending_processor &pf)
68-
{
69-
//TODO: just dont do anything
70-
71-
//let the outputs enqueue everything they have the non slim middle
72-
//has nothing of its own to enqueue as it doesnt have pending anything
73-
pf.enqueue_relations(id_tracker::max());
74-
75-
//let the threads process the relations
76-
pf.process_relations();
77-
}
78-
79-
void middle_ram_t::iterate_ways(middle_t::pending_processor &pf)
80-
{
81-
//let the outputs enqueue everything they have the non slim middle
82-
//has nothing of its own to enqueue as it doesnt have pending anything
83-
pf.enqueue_ways(id_tracker::max());
84-
85-
//let the threads process the ways
86-
pf.process_ways();
87-
}
88-
8967
void middle_ram_t::release_relations() { m_rels.clear(); }
9068

9169
void middle_ram_t::release_ways() { m_ways.clear(); }

src/middle-ram.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ struct middle_ram_t : public middle_t, public middle_query_t
115115

116116
idlist_t relations_using_way(osmid_t way_id) const override;
117117

118-
void iterate_ways(middle_t::pending_processor &pf) override;
119-
void iterate_relations(pending_processor &pf) override;
118+
void iterate_ways(pending_processor &) override {}
119+
void iterate_relations(pending_processor &) override {}
120120

121121
bool has_pending() const override { return false; }
122122

0 commit comments

Comments
 (0)