Merge pull request #1924 from joto/move-expire-table-create

Move table creation for expire tables where it belongs

Author: lonvia

src/expire-output.cpp

@@ -69,3 +69,14 @@ expire_output_t::output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
 
     return count;
 }
+
+void expire_output_t::create_output_table(pg_conn_t const &connection) const
+{
+    auto const qn = qualified_name(m_schema, m_table);
+    connection.exec("CREATE TABLE IF NOT EXISTS {} ("
+                    " zoom int4 NOT NULL,"
+                    " x int4 NOT NULL,"
+                    " y int4 NOT NULL,"
+                    " PRIMARY KEY (zoom, x, y))",
+                    qn);
+}

src/expire-output.hpp

@@ -15,6 +15,8 @@
 #include <string>
 #include <utility>
 
+class pg_conn_t;
+
 /**
  * Output for tile expiry.
  */
@@ -70,6 +72,11 @@ class expire_output_t
     std::size_t output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
                                       std::string const &conninfo) const;
 
+    /**
+     * Create table for tiles.
+     */
+    void create_output_table(pg_conn_t const &connection) const;
+
 private:
     /// The internal (unique) name of the output
     std::string m_name;

src/output-flex.cpp

@@ -1275,14 +1275,7 @@ create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
     connection.exec("SET client_min_messages = WARNING");
     for (auto &expire_output : expire_outputs) {
         if (!expire_output.table().empty()) {
-            auto const qn =
-                qualified_name(expire_output.schema(), expire_output.table());
-            connection.exec("CREATE TABLE IF NOT EXISTS {} ("
-                            " zoom int4 NOT NULL,"
-                            " x int4 NOT NULL,"
-                            " y int4 NOT NULL,"
-                            " PRIMARY KEY (zoom, x, y))",
-                            qn);
+            expire_output.create_output_table(connection);
         }
     }
 }