Merged in feature/mockserver (pull request #135)

Single Mock Server

* mockserver

* mockserver

* reqs

* mockserver

* slowrunner

* someoptimisedqueries

* passedfullsuite

* passedfullsuite

internal/database/migrations/00000000000101_collector_views.up.sql

@@ -1,12 +1,17 @@
-CREATE VIEW collectorCurrentActiveVersions as
-SELECT DISTINCT
-        j.clientId,
-        coalesce(
-            (FIRST_VALUE(v.versionId) OVER (PARTITION BY j.clientId ORDER BY v.id DESC)),
-            0
-        )::int as activeVersion
-    FROM clients as j
-    LEFT JOIN collectorActiveVersions as v on v.clientId = j.clientId;
+CREATE VIEW collectorCurrentActiveVersions AS
+SELECT
+    c.clientId,
+    COALESCE(v.versionId, 0)::int AS activeVersion
+FROM
+    clients c
+LEFT JOIN (
+    SELECT DISTINCT ON (clientId)
+        clientId,
+        versionId
+    FROM
+        collectorActiveVersions
+    ORDER BY clientId, id DESC
+) v ON c.clientId = v.clientId;
 
 CREATE VIEW collectorLatestVersions as
     SELECT
@@ -75,3 +80,44 @@ CREATE VIEW collectorQueryDependencyTree AS
         FROM collectorQueryDependencyTree as ct
         JOIN queryCurrentActiveVersions as av on ct.queryId = av.queryId
         JOIN queries as q on q.queryId = ct.queryId;
+
+
+CREATE OR REPLACE FUNCTION collectorQueryDependencyTreeByClient(
+    _clientId varchar(255)
+)
+RETURNS TABLE (
+    clientId varchar(255),
+    queryId uuid,
+    queryType queryType,
+    queryVersion int,
+    requiredIds uuid[]
+) AS $$
+BEGIN
+    RETURN QUERY
+    WITH clientQueries as (
+        SELECT q.clientId, q.queryId
+        FROM currentCollectorQueries as q
+        WHERE q.clientId = _clientId
+    ),
+    dependencyTree as (
+        WITH RECURSIVE collectorQueryDependencyTree AS (
+            SELECT cq.clientId, cq.queryId, ri.requiredIds
+            FROM clientQueries as cq
+            JOIN queryCurrentRequiredIdsAGG as ri on cq.queryId = ri.queryId
+
+            UNION ALL
+
+            SELECT acq.clientId, q.queryId, q.requiredIds
+            FROM queryCurrentRequiredIdsAGG as q
+            JOIN collectorQueryDependencyTree as acq on q.queryId = ANY(acq.requiredIds)
+        )
+        SELECT DISTINCT ct.clientId, ct.queryId, q.queryType, av.activeVersion as queryVersion, ct.requiredIds
+            FROM collectorQueryDependencyTree as ct
+            JOIN queryCurrentActiveVersions as av on ct.queryId = av.queryId
+            JOIN queries as q on q.queryId = ct.queryId
+    )
+    SELECT t.clientId, t.queryId, t.queryType, t.queryVersion, t.requiredIds
+        FROM dependencyTree as t
+    WHERE t.clientID is not null;
+END;
+$$ LANGUAGE plpgsql;

internal/database/migrations/00000000000102_document_views.up.sql

@@ -116,8 +116,8 @@ BEGIN
     ),
     tree as (
         select q.queryId, q.requiredIds, q.clientId, q.queryVersion
-            from collectorQueryDependencyTree as q
-            join docs as d on q.clientId = d.clientId
+            from docs,
+                LATERAL collectorQueryDependencyTreeByClient(docs.clientId) AS q
     ),
     query_dependency_tree AS (
         WITH RECURSIVE query_deps AS (
@@ -135,7 +135,6 @@ BEGIN
             FROM query_deps qd
             JOIN tree q ON qd.requiredId = q.queryId
             WHERE array_length(q.requiredIds, 1) > 0
-
         )
         SELECT
         query_deps.queryId,