Make more simple incremental update (#944)
Replacing update on the whole table with an update only on changed rows. The goal is to update more quickly by just updating the changing content. The update now focus on osm_id of changed rows, it use index. Add a where clause tags != update_tags(tags, geometry) en ensure only update when changed. It requires one more trigger and a table to store changed osm_id. The UPDATE is keep in a function to be reusable for initial setup and trigger update. I try many code layout before done it in this way with the goal to keep the code for initial pass and for update. It should have low impact on initial data load. Better performance for row update can be achieve with BEFORE UPDATE, but require to duplicate the logic. It is not based on the already merged https://github.com/openmaptiles/openmaptiles/pull/896 because calling and update within a function for each updated row was not efficient for larger table (like housenumber). It addresses #814. * Remake update_peak_point use incremental update #814 * Make update_aerodrome_label_point use incremental update #814 * Make housenumber_centroid use incremental update #814 * Make update_continent_point use incremental update #814 * Make update_island_point use incremental update #814 * Make update_island_polygon use incremental update #814 * Remove dead code in update_state_point.sql * Make update_state_point use incremental update #814 * Remove dead code in update_country_point.sql * Make update_country_point use incremental update #814 * Make osm_poi_polygon use incremental update #814 Thanks @frodrigo
This commit is contained in:
@@ -1,16 +1,19 @@
|
||||
DROP TRIGGER IF EXISTS trigger_flag ON osm_state_point;
|
||||
DROP TRIGGER IF EXISTS trigger_store ON osm_state_point;
|
||||
DROP TRIGGER IF EXISTS trigger_refresh ON place_state.updates;
|
||||
|
||||
ALTER TABLE osm_state_point
|
||||
DROP CONSTRAINT IF EXISTS osm_state_point_rank_constraint;
|
||||
CREATE SCHEMA IF NOT EXISTS place_state;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS place_state.osm_ids
|
||||
(
|
||||
osm_id bigint
|
||||
);
|
||||
|
||||
-- etldoc: ne_10m_admin_1_states_provinces -> osm_state_point
|
||||
-- etldoc: osm_state_point -> osm_state_point
|
||||
|
||||
CREATE OR REPLACE FUNCTION update_osm_state_point() RETURNS void AS
|
||||
CREATE OR REPLACE FUNCTION update_osm_state_point(full_update boolean) RETURNS void AS
|
||||
$$
|
||||
BEGIN
|
||||
|
||||
WITH important_state_point AS (
|
||||
SELECT osm.geometry,
|
||||
osm.osm_id,
|
||||
@@ -33,30 +36,45 @@ BEGIN
|
||||
-- Normalize both scalerank and labelrank into a ranking system from 1 to 6.
|
||||
SET "rank" = LEAST(6, CEILING((scalerank + labelrank + datarank) / 3.0))
|
||||
FROM important_state_point AS ne
|
||||
WHERE osm.osm_id = ne.osm_id;
|
||||
WHERE (full_update OR osm.osm_id IN (SELECT osm_id FROM place_state.osm_ids))
|
||||
AND rank IS NULL
|
||||
AND osm.osm_id = ne.osm_id;
|
||||
|
||||
-- TODO: This shouldn't be necessary? The rank function makes something wrong...
|
||||
UPDATE osm_state_point AS osm
|
||||
SET "rank" = 1
|
||||
WHERE "rank" = 0;
|
||||
WHERE (full_update OR osm_id IN (SELECT osm_id FROM place_state.osm_ids))
|
||||
AND "rank" = 0;
|
||||
|
||||
DELETE FROM osm_state_point WHERE "rank" IS NULL;
|
||||
DELETE FROM osm_state_point
|
||||
WHERE (full_update OR osm_id IN (SELECT osm_id FROM place_state.osm_ids))
|
||||
AND "rank" IS NULL;
|
||||
|
||||
UPDATE osm_state_point
|
||||
SET tags = update_tags(tags, geometry)
|
||||
WHERE COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL;
|
||||
WHERE (full_update OR osm_id IN (SELECT osm_id FROM place_state.osm_ids))
|
||||
AND COALESCE(tags->'name:latin', tags->'name:nonlatin', tags->'name_int') IS NULL
|
||||
AND tags != update_tags(tags, geometry);
|
||||
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
$$ LANGUAGE SQL;
|
||||
|
||||
SELECT update_osm_state_point();
|
||||
SELECT update_osm_state_point(true);
|
||||
|
||||
-- ALTER TABLE osm_state_point ADD CONSTRAINT osm_state_point_rank_constraint CHECK("rank" BETWEEN 1 AND 6);
|
||||
CREATE INDEX IF NOT EXISTS osm_state_point_rank_idx ON osm_state_point ("rank");
|
||||
|
||||
-- Handle updates
|
||||
|
||||
CREATE SCHEMA IF NOT EXISTS place_state;
|
||||
CREATE OR REPLACE FUNCTION place_state.store() RETURNS trigger AS
|
||||
$$
|
||||
BEGIN
|
||||
IF (tg_op = 'DELETE') THEN
|
||||
INSERT INTO place_state.osm_ids VALUES (OLD.osm_id);
|
||||
ELSE
|
||||
INSERT INTO place_state.osm_ids VALUES (NEW.osm_id);
|
||||
END IF;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS place_state.updates
|
||||
(
|
||||
@@ -76,13 +94,21 @@ CREATE OR REPLACE FUNCTION place_state.refresh() RETURNS trigger AS
|
||||
$$
|
||||
BEGIN
|
||||
RAISE LOG 'Refresh place_state rank';
|
||||
PERFORM update_osm_state_point();
|
||||
PERFORM update_osm_state_point(false);
|
||||
-- noinspection SqlWithoutWhere
|
||||
DELETE FROM place_state.osm_ids;
|
||||
-- noinspection SqlWithoutWhere
|
||||
DELETE FROM place_state.updates;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
CREATE TRIGGER trigger_store
|
||||
AFTER INSERT OR UPDATE OR DELETE
|
||||
ON osm_state_point
|
||||
FOR EACH ROW
|
||||
EXECUTE PROCEDURE place_state.store();
|
||||
|
||||
CREATE TRIGGER trigger_flag
|
||||
AFTER INSERT OR UPDATE OR DELETE
|
||||
ON osm_state_point
|
||||
|
||||
Reference in New Issue
Block a user