refactor: replace repeptive instance querying with a function

Drill4J · Jun 19, 2024 · d96c723 · d96c723
1 parent 3c8cbd3
commit d96c723
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/admin-writer/src/main/resources/raw_data/db/migration/R__Metrics_Functions.sql b/admin-writer/src/main/resources/raw_data/db/migration/R__Metrics_Functions.sql
@@ -26,10 +26,7 @@ BEGIN
 RETURN (
     WITH
     InstanceIds AS (
-        SELECT id
-        FROM raw_data.instances
-        WHERE
-            build_id = _build_id
+        SELECT * FROM raw_data.get_instance_ids(_build_id)
     ),
     Methods AS (
         SELECT * FROM raw_data.get_methods(_build_id)
@@ -71,10 +68,7 @@ BEGIN
     RETURN QUERY
     WITH
     InstanceIds AS (
-        SELECT id
-        FROM raw_data.instances
-        WHERE
-            build_id = _build_id
+        SELECT * FROM raw_data.get_instance_ids(_build_id)
     ),
     Classnames AS (
         SELECT classname
@@ -115,10 +109,7 @@ BEGIN
     RETURN QUERY
     WITH
     InstanceIds AS (
-        SELECT id
-        FROM raw_data.instances
-        WHERE
-            build_id = _build_id
+        SELECT * FROM raw_data.get_instance_ids(_build_id)
     ),
     Methods AS (
         SELECT * FROM raw_data.get_methods(_build_id)
@@ -164,10 +155,7 @@ BEGIN
     RETURN QUERY
     WITH
     InstanceIds AS (
-        SELECT id
-        FROM raw_data.instances
-        WHERE
-            build_id = _build_id
+        SELECT * FROM raw_data.get_instance_ids(_build_id)
     ),
     Methods AS (
         SELECT * FROM raw_data.get_methods(_build_id)
@@ -463,10 +451,7 @@ BEGIN
     RETURN QUERY
     WITH
     InstanceIds AS (
-        SELECT id
-        FROM raw_data.instances
-        WHERE
-            build_id = input_build_id
+        SELECT * FROM raw_data.get_instance_ids(input_build_id)
     ),
     Methods AS (
         SELECT * FROM raw_data.get_methods(input_build_id)
@@ -588,3 +573,19 @@ BEGIN
         AND methods.probes_count > 0;
 END;
 $$ LANGUAGE plpgsql;
+
+-----------------------------------------------------------------
+
+-----------------------------------------------------------------
+CREATE OR REPLACE FUNCTION get_instance_ids(input_build_id VARCHAR)
+RETURNS TABLE (
+    id VARCHAR
+)
+AS $$
+BEGIN
+    RETURN QUERY
+    SELECT id
+    FROM raw_data.instances
+    WHERE build_id = input_build_id;
+END;
+$$ LANGUAGE plpgsql;