Merge pull request #894 from lonvia/sort-out-middle-interfaces

Split middle interface between insert query and insert

Author: lonvia

CMakeLists.txt

@@ -173,7 +173,6 @@ set(osm2pgsql_lib_SOURCES
   id-tracker.cpp
   middle-pgsql.cpp
   middle-ram.cpp
-  middle.cpp
   node-persistent-cache.cpp
   node-ram-cache.cpp
   options.cpp

geometry-processor.cpp

@@ -81,7 +81,8 @@ relation_helper::relation_helper()
 : data(1024, osmium::memory::Buffer::auto_grow::yes)
 {}
 
-size_t relation_helper::set(osmium::Relation const &rel, middle_t const *mid)
+size_t relation_helper::set(osmium::Relation const &rel,
+                            middle_query_t const *mid)
 {
     // cleanup
     data.clear();
@@ -93,7 +94,7 @@ size_t relation_helper::set(osmium::Relation const &rel, middle_t const *mid)
     return num_ways;
 }
 
-void relation_helper::add_way_locations(middle_t const *mid)
+void relation_helper::add_way_locations(middle_query_t const *mid)
 {
     for (auto &w : data.select<osmium::Way>()) {
         mid->nodes_get_list(&(w.nodes()));

geometry-processor.hpp

@@ -13,7 +13,6 @@
 #include "tagtransform.hpp"
 
 struct middle_query_t;
-struct middle_t;
 struct options_t;
 class reprojection;
 
@@ -86,8 +85,8 @@ class relation_helper
 public:
     relation_helper();
 
-    size_t set(osmium::Relation const &rel, middle_t const *mid);
-    void add_way_locations(middle_t const *mid);
+    size_t set(osmium::Relation const &rel, middle_query_t const *mid);
+    void add_way_locations(middle_query_t const *mid);
 
     rolelist_t roles;
     osmium::memory::Buffer data;

middle-pgsql.cpp

@@ -949,10 +949,9 @@ void middle_pgsql_t::analyze()
     }
 }
 
-void middle_pgsql_t::start(const options_t *out_options_)
+void middle_pgsql_t::start(const options_t *options)
 {
-    out_options = out_options_;
-    bool dropcreate = !out_options->append; ///< If tables need to be dropped and created anew
+    out_options = options;
 
     ways_pending_tracker.reset(new id_tracker());
     rels_pending_tracker.reset(new id_tracker());
@@ -983,13 +982,13 @@ void middle_pgsql_t::start(const options_t *out_options_)
     for (auto &table : tables) {
         table.connect(out_options);
 
-        if (dropcreate) {
+        if (!append) {
             pgsql_exec(table.sql_conn, PGRES_COMMAND_OK,
                        "DROP TABLE IF EXISTS %s CASCADE", table.name());
         }
 
         table.begin();
-        if (dropcreate) {
+        if (!append) {
             table.create();
         }
         table.prepare_queries(append);

middle-pgsql.hpp

@@ -17,7 +17,8 @@
 #include "node-ram-cache.hpp"
 #include "pgsql.hpp"
 
-struct middle_pgsql_t : public slim_middle_t {
+struct middle_pgsql_t : public slim_middle_t, public middle_query_t
+{
     middle_pgsql_t();
 
     void start(const options_t *out_options_) override;
@@ -115,6 +116,7 @@ struct middle_pgsql_t : public slim_middle_t {
 
     bool append;
     bool mark_pending;
+    options_t const *out_options;
 
     std::shared_ptr<node_ram_cache> cache;
     std::shared_ptr<node_persistent_cache> persistent_cache;

middle-ram.cpp

@@ -40,12 +40,12 @@ void middle_ram_t::nodes_set(osmium::Node const &node)
 
 void middle_ram_t::ways_set(osmium::Way const &way)
 {
-    ways.set(way.id(), new ramWay(way, out_options->extra_attributes));
+    ways.set(way.id(), new ramWay(way, extra_attributes));
 }
 
 void middle_ram_t::relations_set(osmium::Relation const &rel)
 {
-    rels.set(rel.id(), new ramRel(rel, out_options->extra_attributes));
+    rels.set(rel.id(), new ramRel(rel, extra_attributes));
 }
 
 size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
@@ -155,11 +155,10 @@ void middle_ram_t::analyze(void)
     /* No need */
 }
 
-void middle_ram_t::start(const options_t *out_options_)
+void middle_ram_t::start(const options_t *options)
 {
-    out_options = out_options_;
-    cache.reset(
-        new node_ram_cache(out_options->alloc_chunkwise, out_options->cache));
+    extra_attributes = options->extra_attributes;
+    cache.reset(new node_ram_cache(options->alloc_chunkwise, options->cache));
 }
 
 void middle_ram_t::stop(osmium::thread::Pool &pool)
@@ -196,6 +195,8 @@ idlist_t middle_ram_t::relations_using_way(osmid_t) const
 std::shared_ptr<middle_query_t>
 middle_ram_t::get_query_instance(std::shared_ptr<middle_t> const &mid) const
 {
+    auto me = std::dynamic_pointer_cast<middle_ram_t>(mid);
+    assert(me);
     // No copy here because readonly access is thread safe.
-    return std::static_pointer_cast<middle_query_t>(mid);
+    return std::static_pointer_cast<middle_query_t>(me);
 }

middle-ram.hpp

@@ -9,11 +9,11 @@
 #ifndef MIDDLE_RAM_H
 #define MIDDLE_RAM_H
 
+#include <array>
 #include <memory>
+#include <vector>
 
 #include "middle.hpp"
-#include <vector>
-#include <array>
 
 struct node_ram_cache;
 struct options_t;
@@ -80,11 +80,12 @@ class elem_cache_t
     }
 };
 
-struct middle_ram_t : public middle_t {
+struct middle_ram_t : public middle_t, public middle_query_t
+{
     middle_ram_t();
     virtual ~middle_ram_t();
 
-    void start(const options_t *out_options_) override;
+    void start(const options_t *options) override;
     void stop(osmium::thread::Pool &pool) override;
     void analyze(void) override;
     void commit(void) override;
@@ -152,6 +153,7 @@ struct middle_ram_t : public middle_t {
     elem_cache_t<ramRel, 10> rels;
 
     std::unique_ptr<node_ram_cache> cache;
+    bool extra_attributes;
 
     /* the previous behaviour of iterate_ways was to delete all ways as they
      * were being iterated. this doesn't work now that the output handles its

middle.cpp

@@ -20,10 +20,10 @@
 struct options_t;
 
 /**
- * object which stores OSM node/ways/relations from the input file
+ * Infterface for returning information about raw OSM input data from a cache.
  */
 struct middle_query_t {
-    virtual ~middle_query_t() {}
+    virtual ~middle_query_t() = 0;
 
     /**
      * Retrives node locations for the given node list.
@@ -75,15 +75,16 @@ struct middle_query_t {
     virtual idlist_t relations_using_way(osmid_t way_id) const = 0;
 };
 
+inline middle_query_t::~middle_query_t() = default;
+
 /**
- * A specialized middle backend which is persistent, and supports updates
+ * Interface for storing raw OSM data in an intermediate cache.
  */
-struct middle_t : public middle_query_t {
-    static std::shared_ptr<middle_t> create_middle(bool slim);
-
-    virtual ~middle_t() {}
+struct middle_t
+{
+    virtual ~middle_t() = 0;
 
-    virtual void start(const options_t *out_options_) = 0;
+    virtual void start(options_t const *out_options) = 0;
     virtual void stop(osmium::thread::Pool &pool) = 0;
     virtual void analyze(void) = 0;
     virtual void commit(void) = 0;
@@ -110,12 +111,16 @@ struct middle_t : public middle_query_t {
 
     virtual std::shared_ptr<middle_query_t>
     get_query_instance(std::shared_ptr<middle_t> const &mid) const = 0;
-
-    const options_t* out_options;
 };
 
+inline middle_t::~middle_t() = default;
+
+/**
+ * Extended interface for permanent caching of raw OSM data.
+ * It also allows updates.
+ */
 struct slim_middle_t : public middle_t {
-    virtual ~slim_middle_t() {}
+    virtual ~slim_middle_t() = 0;
 
     virtual void nodes_delete(osmid_t id) = 0;
     virtual void node_changed(osmid_t id) = 0;
@@ -127,4 +132,6 @@ struct slim_middle_t : public middle_t {
     virtual void relation_changed(osmid_t id) = 0;
 };
 
+inline slim_middle_t::~slim_middle_t() = default;
+
 #endif

middle.hpp

@@ -7,13 +7,13 @@
 #else
 #define basename /*SKIP IT*/
 #endif
-#include <stdio.h>
-#include <string.h>
-#include <stdexcept>
-#include <sstream>
-#include <thread> // for number of threads
 #include <boost/format.hpp>
+#include <cstdio>
+#include <cstring>
 #include <osmium/version.hpp>
+#include <sstream>
+#include <stdexcept>
+#include <thread> // for number of threads
 
 #ifdef HAVE_LUA
 extern "C" {