chore: improve instruments view performance

USACE · Jan 4, 2025 · 14d6e6b · 14d6e6b
1 parent dfe6082
commit 14d6e6b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 30 deletions.
diff --git a/api/internal/db/instrument.sql_gen.go b/api/internal/db/instrument.sql_gen.go
diff --git a/api/internal/db/models.go b/api/internal/db/models.go
diff --git a/api/migrations/repeat/0040__views_instruments.sql b/api/migrations/repeat/0040__views_instruments.sql
@@ -10,7 +10,7 @@ CREATE OR REPLACE VIEW v_instrument_telemetry AS (
     LEFT JOIN telemetry_iridium ti ON a.telemetry_id = ti.id
 );
 
-CREATE OR REPLACE VIEW v_instrument AS (
+CREATE OR REPLACE VIEW v_instrument_raw AS (
     SELECT
         i.id,
         s.status_id,
@@ -22,7 +22,8 @@ CREATE OR REPLACE VIEW v_instrument AS (
         i.show_cwms_tab,
         t.name "type",
         t.icon,
-        ST_AsGeoJSON(i.geometry)::json geometry,
+        i.geometry,
+        i.geometry_3857,
         i.station,
         i.station_offset "offset",
         i.created_by,
@@ -129,7 +130,7 @@ CREATE OR REPLACE VIEW v_instrument AS (
     WHERE NOT i.deleted
 );
 
-CREATE OR REPLACE VIEW v_instrument_geojson AS (
+CREATE OR REPLACE VIEW v_instrument AS (
     SELECT
         id,
         status_id,
@@ -139,9 +140,9 @@ CREATE OR REPLACE VIEW v_instrument_geojson AS (
         name,
         type_id,
         show_cwms_tab,
-        name "type",
+        "type",
         icon,
-        ST_GeomFromGeoJSON(geometry) "geometry",
+        ST_AsGeoJSON("geometry") "geometry",
         station,
         "offset",
         created_by,
@@ -157,7 +158,7 @@ CREATE OR REPLACE VIEW v_instrument_geojson AS (
         groups,
         alert_configs,
         opts
-    FROM v_instrument
+    FROM v_instrument_raw
 );
 
 CREATE OR REPLACE VIEW v_instrument_group AS (

diff --git a/api/migrations/schema/V1.33.00__instrument_stored_transform.sql b/api/migrations/schema/V1.33.00__instrument_stored_transform.sql
@@ -0,0 +1,2 @@
+ALTER TABLE instrument ADD COLUMN geometry_3857 geometry(Point, 3857) GENERATED ALWAYS AS
+(ST_Transform("geometry", 3857)) STORED;
diff --git a/api/queries/instrument.sql b/api/queries/instrument.sql
@@ -34,11 +34,11 @@ with bbox as (
 mvtgeom as (
     select
 		row_number() over(order by id) as fid,
-		ST_AsMVTGeom(ST_Transform(t.geometry, 3857), bbox.tile_env::box2d, 4096, 256, false) as geometry,
+		ST_AsMVTGeom(t.geometry_3857, bbox.tile_env::box2d, 4096, 256, false) as geometry,
 		t.*,
 		ST_AsGeoJSON(t.geometry) as geometry
-    from v_instrument_geojson t, bbox
-    where ST_Intersects(ST_Transform(t.geometry, 3857), bbox.tile_env)
+    from v_instrument_raw t, bbox
+    where ST_Intersects(t.geometry_3857, bbox.tile_env)
 )
 select ST_AsMVT(mvtgeom.*)::bytea from mvtgeom;
 
@@ -58,7 +58,7 @@ select json_build_object(
 	'features', coalesce(json_agg(ST_AsGeoJSON(features.*)::json), '[]')
 	)
 from (
-	select t.* from v_instrument_geojson t, bounds
+	select t.* from v_instrument_raw t, bounds
 	where ((sqlc.narg(project_id)::uuid is null) or (sqlc.narg(project_id)::uuid = any(
 		select project_id from project_instrument where instrument_id = t.id
 	)))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE instrument ADD COLUMN geometry_3857 geometry(Point, 3857) GENERATED ALWAYS AS
		(ST_Transform("geometry", 3857)) STORED;