diff options
author | Guilhem Moulin <guilhem@fripost.org> | 2025-04-19 13:27:49 +0200 |
---|---|---|
committer | Guilhem Moulin <guilhem@fripost.org> | 2025-04-23 12:09:24 +0200 |
commit | e5e8a6548ef156b785aae1b8a37fe71f26146061 (patch) | |
tree | ff774b2dbccb133f0f75d4731de9e302dfcc59bf /schema.sql | |
parent | c33799f69e7eb42cb0ab4735c7e878d74faca16a (diff) |
webmap-import: Add a cache layer and store the source file's last modification time.
That way we can avoid the expensive unpack+import when the source
file(s) have not been updated since the last run. The check can be
bypassed with a new flag `--force`.
We use a sequence for the FID:s (primary key) and a UNIQUE constraint on
triplets (source_path, archive_member, layername) as GDAL doesn't
support multicolumns primary keys.
To avoid races between the stat(2) calls, gdal.OpenEx() and updates via
`webmap-download` runs we place a shared lock on the downloaded files.
One could resort to some tricks to eliminate the race between the first
two, but there is also some value in having consistency during the
entire execution of the script (a single source file can be used by
multiple layers for instance, and it makes sense to use the very same
file for all layers in that case).
We also intersperse dso.FlushCache() calls between _importSource() calls
in order to force the PG driver to call EndCopy() to detect errors and
trigger a rollback when _importSource() fails.
Diffstat (limited to 'schema.sql')
-rw-r--r-- | schema.sql | 84 |
1 files changed, 82 insertions, 2 deletions
@@ -2,8 +2,8 @@ -- PostgreSQL database dump -- --- Dumped from database version 15.8 (Debian 15.8-0+deb12u1) --- Dumped by pg_dump version 15.8 (Debian 15.8-0+deb12u1) +-- Dumped from database version 15.12 (Debian 15.12-0+deb12u2) +-- Dumped by pg_dump version 15.12 (Debian 15.12-0+deb12u2) SET statement_timeout = 0; SET lock_timeout = 0; @@ -2756,6 +2756,49 @@ ALTER SEQUENCE postgis."vbk:vindkraftverk_ogc_fid_seq" OWNED BY postgis."vbk:vin -- +-- Name: sourcecache; Type: TABLE; Schema: public; Owner: webmap_import +-- + +CREATE TABLE public.sourcecache ( + ogc_fid bigint NOT NULL, + source_path character varying(2047) NOT NULL, + archive_member character varying(2047) NOT NULL, + layername character varying(255) NOT NULL, + mtime_ns bigint +); + + +ALTER TABLE public.sourcecache OWNER TO webmap_import; + +-- +-- Name: TABLE sourcecache; Type: COMMENT; Schema: public; Owner: webmap_import +-- + +COMMENT ON TABLE public.sourcecache IS 'Metadata cache for sources files'; + + +-- +-- Name: sourcecache_ogc_fid_seq; Type: SEQUENCE; Schema: public; Owner: webmap_import +-- + +CREATE SEQUENCE public.sourcecache_ogc_fid_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +ALTER TABLE public.sourcecache_ogc_fid_seq OWNER TO webmap_import; + +-- +-- Name: sourcecache_ogc_fid_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: webmap_import +-- + +ALTER SEQUENCE public.sourcecache_ogc_fid_seq OWNED BY public.sourcecache.ogc_fid; + + +-- -- Name: dammar ogc_fid; Type: DEFAULT; Schema: postgis; Owner: webmap_import -- @@ -3127,6 +3170,13 @@ ALTER TABLE ONLY postgis."vbk:vindkraftverk" ALTER COLUMN ogc_fid SET DEFAULT ne -- +-- Name: sourcecache ogc_fid; Type: DEFAULT; Schema: public; Owner: webmap_import +-- + +ALTER TABLE ONLY public.sourcecache ALTER COLUMN ogc_fid SET DEFAULT nextval('public.sourcecache_ogc_fid_seq'::regclass); + + +-- -- Name: dammar dammar_DammID_key; Type: CONSTRAINT; Schema: postgis; Owner: webmap_import -- @@ -4007,6 +4057,22 @@ ALTER TABLE ONLY postgis."vbk:vindkraftverk" -- +-- Name: sourcecache sourcecache_pkey; Type: CONSTRAINT; Schema: public; Owner: webmap_import +-- + +ALTER TABLE ONLY public.sourcecache + ADD CONSTRAINT sourcecache_pkey PRIMARY KEY (ogc_fid); + + +-- +-- Name: sourcecache sourcecache_source_path_archive_member_layername_key; Type: CONSTRAINT; Schema: public; Owner: webmap_import +-- + +ALTER TABLE ONLY public.sourcecache + ADD CONSTRAINT sourcecache_source_path_archive_member_layername_key UNIQUE (source_path, archive_member, layername); + + +-- -- Name: dammar_wkb_geometry_geom_idx; Type: INDEX; Schema: postgis; Owner: webmap_import -- @@ -5157,6 +5223,20 @@ GRANT SELECT,USAGE ON SEQUENCE postgis."vbk:vindkraftverk_ogc_fid_seq" TO webmap -- +-- Name: TABLE sourcecache; Type: ACL; Schema: public; Owner: webmap_import +-- + +GRANT SELECT ON TABLE public.sourcecache TO webmap_guest; + + +-- +-- Name: SEQUENCE sourcecache_ogc_fid_seq; Type: ACL; Schema: public; Owner: webmap_import +-- + +GRANT SELECT,USAGE ON SEQUENCE public.sourcecache_ogc_fid_seq TO webmap_guest; + + +-- -- PostgreSQL database dump complete -- |