Merge pull request #1379 from joto/middle-api-pointer-buffer

lonvia · web-flow · commit 8d06d4986c72 · 2020-12-21T10:36:08.000+01:00
Change middle API: Use pointers instead of references for out params
diff --git a/src/geometry-processor.cpp b/src/geometry-processor.cpp
@@ -88,7 +88,7 @@ size_t relation_helper::set(osmium::Relation const &rel,
     roles.clear();
 
     // get the nodes and roles of the ways
-    return mid->rel_way_members_get(rel, &roles, data);
+    return mid->rel_way_members_get(rel, &roles, &data);
 }
 
 void relation_helper::add_way_locations(middle_query_t const *mid)
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
@@ -138,7 +138,7 @@ inline char const *decode_upto(char const *src, char *dst)
 }
 
 template <typename T>
-void pgsql_parse_tags(char const *string, osmium::memory::Buffer &buffer,
+void pgsql_parse_tags(char const *string, osmium::memory::Buffer *buffer,
                       T &obuilder)
 {
     if (*string++ != '{') {
@@ -147,7 +147,7 @@ void pgsql_parse_tags(char const *string, osmium::memory::Buffer &buffer,
 
     char key[1024];
     char val[1024];
-    osmium::builder::TagListBuilder builder{buffer, &obuilder};
+    osmium::builder::TagListBuilder builder{*buffer, &obuilder};
 
     while (*string != '}') {
         string = decode_upto(string, key);
@@ -162,15 +162,15 @@ void pgsql_parse_tags(char const *string, osmium::memory::Buffer &buffer,
     }
 }
 
-void pgsql_parse_members(char const *string, osmium::memory::Buffer &buffer,
+void pgsql_parse_members(char const *string, osmium::memory::Buffer *buffer,
                          osmium::builder::RelationBuilder &obuilder)
 {
     if (*string++ != '{') {
         return;
     }
 
     char role[1024];
-    osmium::builder::RelationMemberListBuilder builder{buffer, &obuilder};
+    osmium::builder::RelationMemberListBuilder builder{*buffer, &obuilder};
 
     while (*string != '}') {
         char type = string[0];
@@ -186,11 +186,11 @@ void pgsql_parse_members(char const *string, osmium::memory::Buffer &buffer,
     }
 }
 
-void pgsql_parse_nodes(char const *string, osmium::memory::Buffer &buffer,
+void pgsql_parse_nodes(char const *string, osmium::memory::Buffer *buffer,
                        osmium::builder::WayBuilder &builder)
 {
     if (*string++ == '{') {
-        osmium::builder::WayNodeListBuilder wnl_builder{buffer, &builder};
+        osmium::builder::WayNodeListBuilder wnl_builder{*buffer, &builder};
         while (*string != '}') {
             char *ptr = nullptr;
             wnl_builder.add_node_ref(std::strtoll(string, &ptr, 10));
@@ -394,32 +394,36 @@ void middle_pgsql_t::way_set(osmium::Way const &way)
 }
 
 bool middle_query_pgsql_t::way_get(osmid_t id,
-                                   osmium::memory::Buffer &buffer) const
+                                   osmium::memory::Buffer *buffer) const
 {
+    assert(buffer);
+
     auto const res = m_sql_conn.exec_prepared("get_way", id);
 
     if (res.num_tuples() != 1) {
         return false;
     }
 
     {
-        osmium::builder::WayBuilder builder{buffer};
+        osmium::builder::WayBuilder builder{*buffer};
         builder.set_id(id);
 
         pgsql_parse_nodes(res.get_value(0, 0), buffer, builder);
         pgsql_parse_tags(res.get_value(0, 1), buffer, builder);
     }
 
-    buffer.commit();
+    buffer->commit();
 
     return true;
 }
 
 size_t
 middle_query_pgsql_t::rel_way_members_get(osmium::Relation const &rel,
                                           rolelist_t *roles,
-                                          osmium::memory::Buffer &buffer) const
+                                          osmium::memory::Buffer *buffer) const
 {
+    assert(buffer);
+
     util::string_id_list_t id_list;
 
     for (auto const &m : rel.members()) {
@@ -445,14 +449,14 @@ middle_query_pgsql_t::rel_way_members_get(osmium::Relation const &rel,
         for (int j = 0; j < res.num_tuples(); ++j) {
             if (m.ref() == wayidspg[j]) {
                 {
-                    osmium::builder::WayBuilder builder{buffer};
+                    osmium::builder::WayBuilder builder{*buffer};
                     builder.set_id(m.ref());
 
                     pgsql_parse_nodes(res.get_value(j, 1), buffer, builder);
                     pgsql_parse_tags(res.get_value(j, 2), buffer, builder);
                 }
 
-                buffer.commit();
+                buffer->commit();
                 if (roles) {
                     roles->emplace_back(m.role());
                 }
@@ -516,8 +520,10 @@ void middle_pgsql_t::relation_set(osmium::Relation const &rel)
 }
 
 bool middle_query_pgsql_t::relation_get(osmid_t id,
-                                        osmium::memory::Buffer &buffer) const
+                                        osmium::memory::Buffer *buffer) const
 {
+    assert(buffer);
+
     auto const res = m_sql_conn.exec_prepared("get_rel", id);
     // Fields are: members, tags, member_count */
     //
@@ -526,14 +532,14 @@ bool middle_query_pgsql_t::relation_get(osmid_t id,
     }
 
     {
-        osmium::builder::RelationBuilder builder{buffer};
+        osmium::builder::RelationBuilder builder{*buffer};
         builder.set_id(id);
 
         pgsql_parse_members(res.get_value(0, 0), buffer, builder);
         pgsql_parse_tags(res.get_value(0, 1), buffer, builder);
     }
 
-    buffer.commit();
+    buffer->commit();
 
     return true;
 }
diff --git a/src/middle-pgsql.hpp b/src/middle-pgsql.hpp
@@ -30,12 +30,13 @@ class middle_query_pgsql_t : public middle_query_t
 
     size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
 
-    bool way_get(osmid_t id, osmium::memory::Buffer &buffer) const override;
+    bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
+
     size_t rel_way_members_get(osmium::Relation const &rel, rolelist_t *roles,
-                               osmium::memory::Buffer &buffer) const override;
+                               osmium::memory::Buffer *buffer) const override;
 
     bool relation_get(osmid_t id,
-                      osmium::memory::Buffer &buffer) const override;
+                      osmium::memory::Buffer *buffer) const override;
 
     void exec_sql(std::string const &sql_cmd) const;
 
diff --git a/src/middle-ram.cpp b/src/middle-ram.cpp
@@ -64,25 +64,29 @@ size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
     return count;
 }
 
-bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer &buffer) const
+bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer *buffer) const
 {
+    assert(buffer);
+
     auto const *ele = m_ways.get(id);
 
     if (!ele) {
         return false;
     }
 
     using namespace osmium::builder::attr;
-    osmium::builder::add_way(buffer, _id(id), _tags(ele->tags),
+    osmium::builder::add_way(*buffer, _id(id), _tags(ele->tags),
                              _nodes(ele->ndids));
 
     return true;
 }
 
 size_t middle_ram_t::rel_way_members_get(osmium::Relation const &rel,
                                          rolelist_t *roles,
-                                         osmium::memory::Buffer &buffer) const
+                                         osmium::memory::Buffer *buffer) const
 {
+    assert(buffer);
+
     size_t count = 0;
     for (auto const &m : rel.members()) {
         if (m.type() == osmium::item_type::way && way_get(m.ref(), buffer)) {
@@ -97,16 +101,18 @@ size_t middle_ram_t::rel_way_members_get(osmium::Relation const &rel,
 }
 
 bool middle_ram_t::relation_get(osmid_t id,
-                                osmium::memory::Buffer &buffer) const
+                                osmium::memory::Buffer *buffer) const
 {
+    assert(buffer);
+
     auto const *ele = m_rels.get(id);
 
     if (!ele) {
         return false;
     }
 
     using namespace osmium::builder::attr;
-    osmium::builder::add_relation(buffer, _id(id),
+    osmium::builder::add_relation(*buffer, _id(id),
                                   _members(ele->members.for_builder()),
                                   _tags(ele->tags));
 
diff --git a/src/middle-ram.hpp b/src/middle-ram.hpp
@@ -103,12 +103,13 @@ struct middle_ram_t : public middle_t, public middle_query_t
 
     size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
 
-    bool way_get(osmid_t id, osmium::memory::Buffer &buffer) const override;
+    bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
+
     size_t rel_way_members_get(osmium::Relation const &rel, rolelist_t *roles,
-                               osmium::memory::Buffer &buffer) const override;
+                               osmium::memory::Buffer *buffer) const override;
 
     bool relation_get(osmid_t id,
-                      osmium::memory::Buffer &buffer) const override;
+                      osmium::memory::Buffer *buffer) const override;
 
     std::shared_ptr<middle_query_t> get_query_instance() override;
 
diff --git a/src/middle.hpp b/src/middle.hpp
@@ -35,7 +35,7 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
      *
      * \return true if the way was retrieved
      */
-    virtual bool way_get(osmid_t id, osmium::memory::Buffer &buffer) const = 0;
+    virtual bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const = 0;
 
     /**
      * Retrieves the way members of a relation and stores them in
@@ -47,7 +47,7 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
      */
     virtual size_t
     rel_way_members_get(osmium::Relation const &rel, rolelist_t *roles,
-                        osmium::memory::Buffer &buffer) const = 0;
+                        osmium::memory::Buffer *buffer) const = 0;
 
     /**
      * Retrives a single relation from the relation storage
@@ -59,7 +59,7 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
      * \return true if the relation was retrieved
      */
     virtual bool relation_get(osmid_t id,
-                              osmium::memory::Buffer &buffer) const = 0;
+                              osmium::memory::Buffer *buffer) const = 0;
 };
 
 inline middle_query_t::~middle_query_t() = default;
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -992,7 +992,7 @@ output_flex_t::run_transform(geom::osmium_builder_t *builder,
 {
     m_buffer.clear();
     auto const num_ways =
-        m_mid->rel_way_members_get(relation, nullptr, m_buffer);
+        m_mid->rel_way_members_get(relation, nullptr, &m_buffer);
 
     if (num_ways == 0) {
         return {};
@@ -1080,7 +1080,7 @@ void output_flex_t::pending_way(osmid_t id)
     }
 
     m_buffer.clear();
-    if (!m_mid->way_get(id, m_buffer)) {
+    if (!m_mid->way_get(id, &m_buffer)) {
         return;
     }
 
@@ -1164,7 +1164,7 @@ void output_flex_t::select_relation_members(osmid_t id)
         return;
     }
 
-    if (!m_mid->relation_get(id, m_rels_buffer)) {
+    if (!m_mid->relation_get(id, &m_rels_buffer)) {
         return;
     }
 
@@ -1179,7 +1179,7 @@ void output_flex_t::pending_relation(osmid_t id)
         return;
     }
 
-    if (!m_mid->relation_get(id, m_rels_buffer)) {
+    if (!m_mid->relation_get(id, &m_rels_buffer)) {
         return;
     }
     auto const &relation = m_rels_buffer.get<osmium::Relation>(0);
@@ -1202,7 +1202,7 @@ void output_flex_t::pending_relation_stage1c(osmid_t id)
         return;
     }
 
-    if (!m_mid->relation_get(id, m_rels_buffer)) {
+    if (!m_mid->relation_get(id, &m_rels_buffer)) {
         return;
     }
     auto const &relation = m_rels_buffer.get<osmium::Relation>(0);
@@ -1538,7 +1538,7 @@ void output_flex_t::reprocess_marked()
     m_stage2_way_ids->sort_unique();
     for (osmid_t const id : *m_stage2_way_ids) {
         m_buffer.clear();
-        if (!m_mid->way_get(id, m_buffer)) {
+        if (!m_mid->way_get(id, &m_buffer)) {
             continue;
         }
         auto &way = m_buffer.get<osmium::Way>(0);
diff --git a/src/output-gazetteer.cpp b/src/output-gazetteer.cpp
@@ -182,7 +182,7 @@ bool output_gazetteer_t::process_relation(osmium::Relation const &rel)
     /* get the boundary path (ways) */
     m_osmium_buffer.clear();
     auto const num_ways =
-        m_mid->rel_way_members_get(rel, nullptr, m_osmium_buffer);
+        m_mid->rel_way_members_get(rel, nullptr, &m_osmium_buffer);
 
     if (num_ways == 0) {
         return false;
diff --git a/src/output-multi.cpp b/src/output-multi.cpp
@@ -68,7 +68,7 @@ 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)) {
+    if (m_mid->way_get(id, &buffer)) {
         // Output the way
         reprocess_way(&buffer.get<osmium::Way>(0), true);
     }
@@ -78,7 +78,7 @@ 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)) {
+    if (m_mid->relation_get(id, &buffer)) {
         auto const &rel = buffer.get<osmium::Relation>(0);
         process_relation(rel, true);
     }
diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp
@@ -71,7 +71,7 @@ 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 (m_mid->way_get(id, &buffer)) {
         pgsql_delete_way_from_output(id);
 
         taglist_t outtags;
@@ -95,7 +95,7 @@ void output_pgsql_t::pending_relation(osmid_t id)
     // 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 (m_mid->relation_get(id, &rels_buffer)) {
         pgsql_delete_relation_from_output(id);
 
         auto const &rel = rels_buffer.get<osmium::Relation>(0);
@@ -166,7 +166,7 @@ void output_pgsql_t::pgsql_process_relation(osmium::Relation const &rel)
 
     buffer.clear();
     rolelist_t xrole;
-    auto num_ways = m_mid->rel_way_members_get(rel, &xrole, buffer);
+    auto num_ways = m_mid->rel_way_members_get(rel, &xrole, &buffer);
 
     if (num_ways == 0) {
         return;
diff --git a/tests/test-middle.cpp b/tests/test-middle.cpp

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ size_t relation_helper::set(osmium::Relation const &rel,`
`88`	`88`	`roles.clear();`
`89`	`89`
`90`	`90`	`// get the nodes and roles of the ways`
`91`		`- return mid->rel_way_members_get(rel, &roles, data);`
	`91`	`+ return mid->rel_way_members_get(rel, &roles, &data);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`void relation_helper::add_way_locations(middle_query_t const *mid)`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ inline char const decode_upto(char const src, char *dst)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`template <typename T>`
`141`		`-void pgsql_parse_tags(char const *string, osmium::memory::Buffer &buffer,`
	`141`	`+void pgsql_parse_tags(char const string, osmium::memory::Buffer buffer,`
`142`	`142`	`T &obuilder)`
`143`	`143`	`{`
`144`	`144`	`if (*string++ != '{') {`
`@@ -147,7 +147,7 @@ void pgsql_parse_tags(char const *string, osmium::memory::Buffer &buffer,`
`147`	`147`
`148`	`148`	`char key[1024];`
`149`	`149`	`char val[1024];`
`150`		`- osmium::builder::TagListBuilder builder{buffer, &obuilder};`
	`150`	`+ osmium::builder::TagListBuilder builder{*buffer, &obuilder};`
`151`	`151`
`152`	`152`	`while (*string != '}') {`
`153`	`153`	`string = decode_upto(string, key);`
`@@ -162,15 +162,15 @@ void pgsql_parse_tags(char const *string, osmium::memory::Buffer &buffer,`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`165`		`-void pgsql_parse_members(char const *string, osmium::memory::Buffer &buffer,`
	`165`	`+void pgsql_parse_members(char const string, osmium::memory::Buffer buffer,`
`166`	`166`	`osmium::builder::RelationBuilder &obuilder)`
`167`	`167`	`{`
`168`	`168`	`if (*string++ != '{') {`
`169`	`169`	`return;`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`char role[1024];`
`173`		`- osmium::builder::RelationMemberListBuilder builder{buffer, &obuilder};`
	`173`	`+ osmium::builder::RelationMemberListBuilder builder{*buffer, &obuilder};`
`174`	`174`
`175`	`175`	`while (*string != '}') {`
`176`	`176`	`char type = string[0];`
`@@ -186,11 +186,11 @@ void pgsql_parse_members(char const *string, osmium::memory::Buffer &buffer,`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`-void pgsql_parse_nodes(char const *string, osmium::memory::Buffer &buffer,`
	`189`	`+void pgsql_parse_nodes(char const string, osmium::memory::Buffer buffer,`
`190`	`190`	`osmium::builder::WayBuilder &builder)`
`191`	`191`	`{`
`192`	`192`	`if (*string++ == '{') {`
`193`		`- osmium::builder::WayNodeListBuilder wnl_builder{buffer, &builder};`
	`193`	`+ osmium::builder::WayNodeListBuilder wnl_builder{*buffer, &builder};`
`194`	`194`	`while (*string != '}') {`
`195`	`195`	`char *ptr = nullptr;`
`196`	`196`	`wnl_builder.add_node_ref(std::strtoll(string, &ptr, 10));`
`@@ -394,32 +394,36 @@ void middle_pgsql_t::way_set(osmium::Way const &way)`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`bool middle_query_pgsql_t::way_get(osmid_t id,`
`397`		`- osmium::memory::Buffer &buffer) const`
	`397`	`+ osmium::memory::Buffer *buffer) const`
`398`	`398`	`{`
	`399`	`+ assert(buffer);`
	`400`	`+`
`399`	`401`	`auto const res = m_sql_conn.exec_prepared("get_way", id);`
`400`	`402`
`401`	`403`	`if (res.num_tuples() != 1) {`
`402`	`404`	`return false;`
`403`	`405`	`}`
`404`	`406`
`405`	`407`	`{`
`406`		`- osmium::builder::WayBuilder builder{buffer};`
	`408`	`+ osmium::builder::WayBuilder builder{*buffer};`
`407`	`409`	`builder.set_id(id);`
`408`	`410`
`409`	`411`	`pgsql_parse_nodes(res.get_value(0, 0), buffer, builder);`
`410`	`412`	`pgsql_parse_tags(res.get_value(0, 1), buffer, builder);`
`411`	`413`	`}`
`412`	`414`
`413`		`- buffer.commit();`
	`415`	`+ buffer->commit();`
`414`	`416`
`415`	`417`	`return true;`
`416`	`418`	`}`
`417`	`419`
`418`	`420`	`size_t`
`419`	`421`	`middle_query_pgsql_t::rel_way_members_get(osmium::Relation const &rel,`
`420`	`422`	`rolelist_t *roles,`
`421`		`- osmium::memory::Buffer &buffer) const`
	`423`	`+ osmium::memory::Buffer *buffer) const`
`422`	`424`	`{`
	`425`	`+ assert(buffer);`
	`426`	`+`
`423`	`427`	`util::string_id_list_t id_list;`
`424`	`428`
`425`	`429`	`for (auto const &m : rel.members()) {`
`@@ -445,14 +449,14 @@ middle_query_pgsql_t::rel_way_members_get(osmium::Relation const &rel,`
`445`	`449`	`for (int j = 0; j < res.num_tuples(); ++j) {`
`446`	`450`	`if (m.ref() == wayidspg[j]) {`
`447`	`451`	`{`
`448`		`- osmium::builder::WayBuilder builder{buffer};`
	`452`	`+ osmium::builder::WayBuilder builder{*buffer};`
`449`	`453`	`builder.set_id(m.ref());`
`450`	`454`
`451`	`455`	`pgsql_parse_nodes(res.get_value(j, 1), buffer, builder);`
`452`	`456`	`pgsql_parse_tags(res.get_value(j, 2), buffer, builder);`
`453`	`457`	`}`
`454`	`458`
`455`		`- buffer.commit();`
	`459`	`+ buffer->commit();`
`456`	`460`	`if (roles) {`
`457`	`461`	`roles->emplace_back(m.role());`
`458`	`462`	`}`
`@@ -516,8 +520,10 @@ void middle_pgsql_t::relation_set(osmium::Relation const &rel)`
`516`	`520`	`}`
`517`	`521`
`518`	`522`	`bool middle_query_pgsql_t::relation_get(osmid_t id,`
`519`		`- osmium::memory::Buffer &buffer) const`
	`523`	`+ osmium::memory::Buffer *buffer) const`
`520`	`524`	`{`
	`525`	`+ assert(buffer);`
	`526`	`+`
`521`	`527`	`auto const res = m_sql_conn.exec_prepared("get_rel", id);`
`522`	`528`	`// Fields are: members, tags, member_count */`
`523`	`529`	`//`
`@@ -526,14 +532,14 @@ bool middle_query_pgsql_t::relation_get(osmid_t id,`
`526`	`532`	`}`
`527`	`533`
`528`	`534`	`{`
`529`		`- osmium::builder::RelationBuilder builder{buffer};`
	`535`	`+ osmium::builder::RelationBuilder builder{*buffer};`
`530`	`536`	`builder.set_id(id);`
`531`	`537`
`532`	`538`	`pgsql_parse_members(res.get_value(0, 0), buffer, builder);`
`533`	`539`	`pgsql_parse_tags(res.get_value(0, 1), buffer, builder);`
`534`	`540`	`}`
`535`	`541`
`536`		`- buffer.commit();`
	`542`	`+ buffer->commit();`
`537`	`543`
`538`	`544`	`return true;`
`539`	`545`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,25 +64,29 @@ size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const`
`64`	`64`	`return count;`
`65`	`65`	`}`
`66`	`66`
`67`		`-bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer &buffer) const`
	`67`	`+bool middle_ram_t::way_get(osmid_t id, osmium::memory::Buffer *buffer) const`
`68`	`68`	`{`
	`69`	`+ assert(buffer);`
	`70`	`+`
`69`	`71`	`auto const *ele = m_ways.get(id);`
`70`	`72`
`71`	`73`	`if (!ele) {`
`72`	`74`	`return false;`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`using namespace osmium::builder::attr;`
`76`		`- osmium::builder::add_way(buffer, _id(id), _tags(ele->tags),`
	`78`	`+ osmium::builder::add_way(*buffer, _id(id), _tags(ele->tags),`
`77`	`79`	`_nodes(ele->ndids));`
`78`	`80`
`79`	`81`	`return true;`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`size_t middle_ram_t::rel_way_members_get(osmium::Relation const &rel,`
`83`	`85`	`rolelist_t *roles,`
`84`		`- osmium::memory::Buffer &buffer) const`
	`86`	`+ osmium::memory::Buffer *buffer) const`
`85`	`87`	`{`
	`88`	`+ assert(buffer);`
	`89`	`+`
`86`	`90`	`size_t count = 0;`
`87`	`91`	`for (auto const &m : rel.members()) {`
`88`	`92`	`if (m.type() == osmium::item_type::way && way_get(m.ref(), buffer)) {`
`@@ -97,16 +101,18 @@ size_t middle_ram_t::rel_way_members_get(osmium::Relation const &rel,`
`97`	`101`	`}`
`98`	`102`
`99`	`103`	`bool middle_ram_t::relation_get(osmid_t id,`
`100`		`- osmium::memory::Buffer &buffer) const`
	`104`	`+ osmium::memory::Buffer *buffer) const`
`101`	`105`	`{`
	`106`	`+ assert(buffer);`
	`107`	`+`
`102`	`108`	`auto const *ele = m_rels.get(id);`
`103`	`109`
`104`	`110`	`if (!ele) {`
`105`	`111`	`return false;`
`106`	`112`	`}`
`107`	`113`
`108`	`114`	`using namespace osmium::builder::attr;`
`109`		`- osmium::builder::add_relation(buffer, _id(id),`
	`115`	`+ osmium::builder::add_relation(*buffer, _id(id),`
`110`	`116`	`_members(ele->members.for_builder()),`
`111`	`117`	`_tags(ele->tags));`
`112`	`118`
Original file line number	Diff line number	Diff line change
`@@ -992,7 +992,7 @@ output_flex_t::run_transform(geom::osmium_builder_t *builder,`
`992`	`992`	`{`
`993`	`993`	`m_buffer.clear();`
`994`	`994`	`auto const num_ways =`
`995`		`- m_mid->rel_way_members_get(relation, nullptr, m_buffer);`
	`995`	`+ m_mid->rel_way_members_get(relation, nullptr, &m_buffer);`
`996`	`996`
`997`	`997`	`if (num_ways == 0) {`
`998`	`998`	`return {};`
`@@ -1080,7 +1080,7 @@ void output_flex_t::pending_way(osmid_t id)`
`1080`	`1080`	`}`
`1081`	`1081`
`1082`	`1082`	`m_buffer.clear();`
`1083`		`- if (!m_mid->way_get(id, m_buffer)) {`
	`1083`	`+ if (!m_mid->way_get(id, &m_buffer)) {`
`1084`	`1084`	`return;`
`1085`	`1085`	`}`
`1086`	`1086`
`@@ -1164,7 +1164,7 @@ void output_flex_t::select_relation_members(osmid_t id)`
`1164`	`1164`	`return;`
`1165`	`1165`	`}`
`1166`	`1166`
`1167`		`- if (!m_mid->relation_get(id, m_rels_buffer)) {`
	`1167`	`+ if (!m_mid->relation_get(id, &m_rels_buffer)) {`
`1168`	`1168`	`return;`
`1169`	`1169`	`}`
`1170`	`1170`
`@@ -1179,7 +1179,7 @@ void output_flex_t::pending_relation(osmid_t id)`
`1179`	`1179`	`return;`
`1180`	`1180`	`}`
`1181`	`1181`
`1182`		`- if (!m_mid->relation_get(id, m_rels_buffer)) {`
	`1182`	`+ if (!m_mid->relation_get(id, &m_rels_buffer)) {`
`1183`	`1183`	`return;`
`1184`	`1184`	`}`
`1185`	`1185`	`auto const &relation = m_rels_buffer.get<osmium::Relation>(0);`
`@@ -1202,7 +1202,7 @@ void output_flex_t::pending_relation_stage1c(osmid_t id)`
`1202`	`1202`	`return;`
`1203`	`1203`	`}`
`1204`	`1204`
`1205`		`- if (!m_mid->relation_get(id, m_rels_buffer)) {`
	`1205`	`+ if (!m_mid->relation_get(id, &m_rels_buffer)) {`
`1206`	`1206`	`return;`
`1207`	`1207`	`}`
`1208`	`1208`	`auto const &relation = m_rels_buffer.get<osmium::Relation>(0);`
`@@ -1538,7 +1538,7 @@ void output_flex_t::reprocess_marked()`
`1538`	`1538`	`m_stage2_way_ids->sort_unique();`
`1539`	`1539`	`for (osmid_t const id : *m_stage2_way_ids) {`
`1540`	`1540`	`m_buffer.clear();`
`1541`		`- if (!m_mid->way_get(id, m_buffer)) {`
	`1541`	`+ if (!m_mid->way_get(id, &m_buffer)) {`
`1542`	`1542`	`continue;`
`1543`	`1543`	`}`
`1544`	`1544`	`auto &way = m_buffer.get<osmium::Way>(0);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ void output_multi_t::pending_way(osmid_t id)`
`68`	`68`	`{`
`69`	`69`	`// Try to fetch the way from the DB`
`70`	`70`	`buffer.clear();`
`71`		`- if (m_mid->way_get(id, buffer)) {`
	`71`	`+ if (m_mid->way_get(id, &buffer)) {`
`72`	`72`	`// Output the way`
`73`	`73`	`reprocess_way(&buffer.get<osmium::Way>(0), true);`
`74`	`74`	`}`
`@@ -78,7 +78,7 @@ void output_multi_t::pending_relation(osmid_t id)`
`78`	`78`	`{`
`79`	`79`	`// Try to fetch the relation from the DB`
`80`	`80`	`buffer.clear();`
`81`		`- if (m_mid->relation_get(id, buffer)) {`
	`81`	`+ if (m_mid->relation_get(id, &buffer)) {`
`82`	`82`	`auto const &rel = buffer.get<osmium::Relation>(0);`
`83`	`83`	`process_relation(rel, true);`
`84`	`84`	`}`