technologies

Author: max-ostapenko

definitions/output/reports/tech_report_technologies.js

@@ -5,36 +5,17 @@ publish('tech_report_technologies', {
   type: 'table',
   tags: ['tech_report']
 }).query(ctx => `
-WITH pages AS (
-  SELECT DISTINCT
-    client,
-    root_page,
-    tech.technology
-  FROM ${ctx.ref('crawl', 'pages')} AS pages
-  INNER JOIN pages.technologies AS tech
-  WHERE
-    date = '${pastMonth}'
-    ${constants.devRankFilter}
-),
-
-tech_origins AS (
+WITH tech_origins AS (
   SELECT
-    technology,
-    STRUCT(
-      MAX(IF(client = 'desktop', origins, 0)) AS desktop,
-      MAX(IF(client = 'mobile', origins, 0)) AS mobile
-    ) AS origins
-  FROM (
-    SELECT
-      client,
-      technology,
-      COUNT(DISTINCT root_page) AS origins
-    FROM pages
-    GROUP BY
-      client,
-      technology
-  )
-  GROUP BY technology
+  technology,
+  adoption AS origins
+FROM ${ctx.ref('reports', 'tech_report_adoption')}
+WHERE
+  date = '${pastMonth}'
+  AND rank = 'ALL'
+  AND geo = 'ALL'
+  AND version = 'ALL'
+  ${constants.devRankFilter}
 ),
 
 technologies AS (
@@ -51,14 +32,6 @@ technologies AS (
     description,
     categories,
     icon
-),
-
-total_pages AS (
-  SELECT
-    client,
-    COUNT(DISTINCT root_page) AS origins
-  FROM pages
-  GROUP BY client
 )
 
 SELECT
@@ -75,16 +48,14 @@ USING(technology)
 UNION ALL
 
 SELECT
-  'ALL' AS technology,
+  technology,
   NULL AS description,
   NULL AS icon,
   NULL AS category,
   NULL AS category_obj,
-  STRUCT(
-    MAX(IF(client = 'desktop', origins, 0)) AS desktop,
-    MAX(IF(client = 'mobile', origins, 0)) AS mobile
-  ) AS origins
-FROM total_pages
+  origins
+FROM tech_origins
+WHERE technology = 'ALL'
 `).postOps(ctx => `
   SELECT
     reports.run_export_job(