Merge remote-tracking branch 'origin/main' into balanced-owl

HTTPArchive · Jan 20, 2025 · b1812df · b1812df
2 parents 861376a + 295a45d
commit b1812df
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/definitions/declarations/httparchive.js b/definitions/declarations/httparchive.js
@@ -8,5 +8,10 @@ for (const table of stagingTables) {
 
 declare({
   schema: 'wappalyzer',
-  name: 'apps'
+  name: 'technologies'
+})
+
+declare({
+  schema: 'wappalyzer',
+  name: 'categories'
 })
diff --git a/definitions/output/reports/cwv_tech_categories.js b/definitions/output/reports/cwv_tech_categories.js
@@ -15,9 +15,12 @@ WITH pages AS (
   WHERE
     date = '${pastMonth}'
     ${constants.devRankFilter}
-),
-
-categories AS (
+), categories AS (
+  SELECT
+    name AS category,
+    description
+  FROM ${ctx.ref('wappalyzer', 'categories')}
+), category_stats AS (
   SELECT
     client,
     category,
@@ -30,7 +33,7 @@ categories AS (
     category
 ),
 
-technologies AS (
+technology_stats AS (
   SELECT
     category,
     technology,
@@ -43,15 +46,20 @@ technologies AS (
 
 SELECT
   category,
+  description,
   STRUCT(
     COALESCE(MAX(IF(categories.client = 'desktop', categories.origins, 0))) AS desktop,
     COALESCE(MAX(IF(categories.client = 'mobile', categories.origins, 0))) AS mobile
   ) AS origins,
-  ARRAY_AGG(technology IGNORE NULLS ORDER BY total_origins DESC) AS technologies
-FROM categories
-INNER JOIN technologies
+  ARRAY_AGG(technology IGNORE NULLS ORDER BY technology_stats.origins DESC) AS technologies
+FROM category_stats
+INNER JOIN technology_stats
+USING (category)
+LEFT JOIN categories
 USING (category)
 GROUP BY
-  category
+  category,
+  description,
+  origins
 ORDER BY category ASC
 `)
diff --git a/definitions/output/reports/cwv_tech_technologies.js b/definitions/output/reports/cwv_tech_technologies.js
@@ -15,7 +15,7 @@ SELECT
   NULL AS similar_technologies,
   origins
 FROM ${ctx.ref('core_web_vitals', 'technologies')}
-LEFT JOIN ${ctx.ref('wappalyzer', 'apps')}
+LEFT JOIN ${ctx.ref('wappalyzer', 'technologies')}
 ON app = name
 WHERE date = '${pastMonth}' AND
   geo = 'ALL' AND

diff --git a/definitions/output/wappalyzer/tech_detections.js b/definitions/output/wappalyzer/tech_detections.js
@@ -112,7 +112,7 @@ tech_deprecated_gone_origins AS (
 -- aggregation of technology adoption/deprecation metrics
 SELECT
   DATE('${constants.currentMonth}') AS date,
-  COALESCE(before_summary.technology, tech_adopted_existing_origins.technology, tech_adopted_new_origins.technology, apps.name) AS technology,
+  COALESCE(before_summary.technology, tech_adopted_existing_origins.technology, tech_adopted_new_origins.technology, technologies.name) AS technology,
 
   -- origins summary
   0-COALESCE(total_origins_deprecated_existing, 0) AS total_origins_deprecated_existing,
@@ -139,6 +139,6 @@ LEFT JOIN tech_deprecated_existing_origins
   ON before_summary.technology = tech_deprecated_existing_origins.technology
 LEFT JOIN tech_deprecated_gone_origins
   ON before_summary.technology = tech_deprecated_gone_origins.technology
-FULL OUTER JOIN wappalyzer.apps
-  ON before_summary.technology = apps.name
+FULL OUTER JOIN wappalyzer.technologies
+  ON before_summary.technology = technologies.name
 `)