View SQL Query accounts for normalization (#2878)

mozilla · Jun 26, 2024 · 7edbab6 · 7edbab6
1 parent 44f43bd
commit 7edbab6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/src/components/SqlModal.svelte b/src/components/SqlModal.svelte
@@ -103,6 +103,7 @@
         : `AND normalized_os="${$store.productDimensions.os}"`;
 
     const buildId = $store.ref || $store.defaultRef;
+    const normalized = $store.productDimensions.normalizationType === "normalized";
 
     return _.template(sqlTemplate)({
       metric: $store.probe.name,
@@ -111,6 +112,7 @@
       telemetryPath,
       osFilter,
       buildId,
+      normalized,
     });
   }
 

diff --git a/src/stringTemplates/desktop-distribution.tpl b/src/stringTemplates/desktop-distribution.tpl
@@ -8,17 +8,23 @@ WITH per_build_client_day AS (
   SELECT
     PARSE_DATETIME("%Y%m%d%H%M%S", application.build_id) AS build_id,
     client_id,
-    mozfun.hist.normalize(
+    <% if(normalized) { %>mozfun.hist.normalize(
       mozfun.hist.merge(
         ARRAY_AGG(
           mozfun.hist.extract(
             ${ telemetryPath }
           ) IGNORE NULLS
         )
       )
-  ) AS  ${ metric }
+    )<% } else { %>mozfun.hist.merge(
+      ARRAY_AGG(
+        mozfun.hist.extract(
+          ${ telemetryPath }
+        ) IGNORE NULLS
+      )
+    )<% } %> AS ${ metric }
   FROM
-    telemetry.${ table }
+    moz-fx-data-shared-prod.telemetry.${ table }
   WHERE
     normalized_channel = '${ channel }'
     ${ osFilter }
@@ -69,12 +75,12 @@ as_struct AS (
     build_id,
     ARRAY_AGG(STRUCT(key_string, value))AS merged_${ metric }
   FROM filtered
-  GROUP by 
+  GROUP by
     build_id
 )
 
-SELECT build_id, 
-  key_string as key, 
+SELECT build_id,
+  key_string as key,
   value as bucket
 FROM as_struct
   CROSS JOIN

diff --git a/src/stringTemplates/desktop-histogram-proportions.tpl b/src/stringTemplates/desktop-histogram-proportions.tpl
@@ -8,17 +8,23 @@ WITH per_build_client_day AS (
   SELECT
     PARSE_DATETIME("%Y%m%d%H%M%S", application.build_id) AS build_id,
     client_id,
-    mozfun.hist.normalize(
+    <% if(normalized) { %>mozfun.hist.normalize(
       mozfun.hist.merge(
         ARRAY_AGG(
           mozfun.hist.extract(
             ${ telemetryPath }
           ) IGNORE NULLS
         )
       )
-  ) AS ${ metric }
+    )<% } else { %>mozfun.hist.merge(
+      ARRAY_AGG(
+        mozfun.hist.extract(
+          ${ telemetryPath }
+        ) IGNORE NULLS
+      )
+    )<% } %> AS ${ metric }
   FROM
-    telemetry.${ table }
+    moz-fx-data-shared-prod.telemetry.${ table }
   WHERE
     normalized_channel = '${ channel }'
     ${ osFilter }
@@ -84,4 +90,4 @@ FROM
   proportions
 ORDER BY
   build_id desc,
-  KEY ASC;
+  KEY ASC;
diff --git a/src/stringTemplates/desktop-telemetry.tpl b/src/stringTemplates/desktop-telemetry.tpl
@@ -11,17 +11,23 @@ WITH per_build_client_day AS (
   SELECT
     PARSE_DATETIME("%Y%m%d%H%M%S", application.build_id) AS build_id,
     client_id,
-    mozfun.hist.normalize(
+    <% if(normalized) { %>mozfun.hist.normalize(
       mozfun.hist.merge(
         ARRAY_AGG(
           mozfun.hist.extract(
             ${ telemetryPath }
           ) IGNORE NULLS
         )
       )
-  ) AS ${ metric }
+    )<% } else { %>mozfun.hist.merge(
+      ARRAY_AGG(
+        mozfun.hist.extract(
+          ${ telemetryPath }
+        ) IGNORE NULLS
+      )
+    )<% } %> AS ${ metric }
   FROM
-    telemetry.${ table }
+    moz-fx-data-shared-prod.telemetry.${ table }
   WHERE
     normalized_channel = '${ channel }'
     ${ osFilter }