versions

Author: max-ostapenko

definitions/output/reports/tech_report_versions.js

@@ -5,61 +5,16 @@ publish('tech_report_versions', {
   type: 'table',
   tags: ['tech_report']
 }).query(ctx => `
-WITH pages AS (
-  SELECT DISTINCT
-    client,
-    root_page,
-    tech.technology,
-    REGEXP_EXTRACT(version, r'\\d+(?:\\.\\d+)?') AS version
-  FROM ${ctx.ref('crawl', 'pages')} AS pages
-  INNER JOIN pages.technologies AS tech
-  LEFT JOIN tech.info AS version
-  WHERE
-    date = '${pastMonth}'
-    ${constants.devRankFilter} AND
-    tech.technology IS NOT NULL
-),
-
-version_origins AS (
-  SELECT
-    client,
-    technology,
-    version,
-    COUNT(DISTINCT root_page) AS origins
-  FROM pages
-  WHERE version IS NOT NULL
-  GROUP BY
-    client,
-    technology,
-    version
-),
-
-total_origins AS (
-  SELECT
-    client,
-    technology,
-    COUNT(DISTINCT root_page) AS origins
-  FROM pages
-  GROUP BY
-    client,
-    technology
-)
-
 SELECT
-  client,
   technology,
   version,
-  origins
-FROM version_origins
-
-UNION ALL
-
-SELECT
-  client,
-  technology,
-  'ALL' AS version,
-  origins
-FROM total_origins
+  adoption AS origins
+FROM ${ctx.ref('reports', 'tech_report_adoption')}
+WHERE
+  date = '${pastMonth}'
+  AND rank = 'ALL'
+  AND geo = 'ALL'
+  ${constants.devRankFilter}
 `).postOps(ctx => `
   SELECT
     reports.run_export_job(