Merge pull request #2080 from joto/timestamps-in-expire-tables

Add first/last timestamps to expire tables

Author: lonvia

src/expire-output.cpp

@@ -59,10 +59,22 @@ expire_output_t::output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
 
     pg_conn_t connection{conninfo};
 
-    connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
-                    " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
-                    " ON CONFLICT DO NOTHING",
-                    qn);
+    auto const result = connection.exec("SELECT * FROM {} LIMIT 1", qn);
+
+    if (result.num_fields() == 3) {
+        // old format with fields: zoom, x, y
+        connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
+                        " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
+                        " ON CONFLICT DO NOTHING",
+                        qn);
+    } else {
+        // new format with fields: zoom, x, y, first, last
+        connection.exec("PREPARE insert_tiles(int4, int4, int4) AS"
+                        " INSERT INTO {} (zoom, x, y) VALUES ($1, $2, $3)"
+                        " ON CONFLICT (zoom, x, y)"
+                        " DO UPDATE SET last = CURRENT_TIMESTAMP(0)",
+                        qn);
+    }
 
     auto const count = for_each_tile(
         tiles_at_maxzoom, m_minzoom, m_maxzoom, [&](tile_t const &tile) {
@@ -76,10 +88,13 @@ expire_output_t::output_tiles_to_table(quadkey_list_t const &tiles_at_maxzoom,
 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);
+    connection.exec(
+        "CREATE TABLE IF NOT EXISTS {} ("
+        " zoom int4 NOT NULL,"
+        " x int4 NOT NULL,"
+        " y int4 NOT NULL,"
+        " first timestamp with time zone DEFAULT CURRENT_TIMESTAMP(0),"
+        " last timestamp with time zone DEFAULT CURRENT_TIMESTAMP(0),"
+        " PRIMARY KEY (zoom, x, y))",
+        qn);
 }