Update sampling portion of query to be more concise.

sql/telemetry_derived/clients_daily_histogram_aggregates_v1.sql.py

@@ -119,16 +119,10 @@ def generate_sql(opts, additional_queries, windowed_clause, select_clause, json_
           WHERE
             channel IN ("nightly", "beta")
             OR (channel = "release" AND os != "Windows")
-          UNION ALL
-          SELECT
-            *
-          FROM
-            filtered
-          WHERE
-            channel = 'release'
-            AND os = 'Windows'
-            AND sample_id >= @min_sample_id
-            AND sample_id <= @max_sample_id
+            OR (channel = "release" AND
+                    os = "Windows" AND
+                    sample_id >= @min_sample_id AND
+                    sample_id <= @max_sample_id)
         ),
 
         {additional_queries}

sql/telemetry_derived/clients_daily_histogram_aggregates_v1/query.sql

@@ -101,16 +101,12 @@ sampled_data AS (
   WHERE
     channel IN ("nightly", "beta")
     OR (channel = "release" AND os != "Windows")
-  UNION ALL
-  SELECT
-    *
-  FROM
-    filtered
-  WHERE
-    channel = 'release'
-    AND os = 'Windows'
-    AND sample_id >= @min_sample_id
-    AND sample_id <= @max_sample_id
+    OR (
+      channel = "release"
+      AND os = "Windows"
+      AND sample_id >= @min_sample_id
+      AND sample_id <= @max_sample_id
+    )
 ),
 histograms AS (
   SELECT

sql/telemetry_derived/clients_daily_keyed_boolean_aggregates_v1/query.sql

@@ -88,16 +88,12 @@ sampled_data AS (
   WHERE
     channel IN ("nightly", "beta")
     OR (channel = "release" AND os != "Windows")
-  UNION ALL
-  SELECT
-    *
-  FROM
-    flattened_metrics
-  WHERE
-    channel = 'release'
-    AND os = 'Windows'
-    AND sample_id >= @min_sample_id
-    AND sample_id <= @max_sample_id
+    OR (
+      channel = "release"
+      AND os = "Windows"
+      AND sample_id >= @min_sample_id
+      AND sample_id <= @max_sample_id
+    )
 ),
 -- Using `min` for when `agg_type` is `count` returns null when all rows are null
 aggregated AS (

sql/telemetry_derived/clients_daily_keyed_histogram_aggregates_v1/query.sql

@@ -101,16 +101,12 @@ sampled_data AS (
   WHERE
     channel IN ("nightly", "beta")
     OR (channel = "release" AND os != "Windows")
-  UNION ALL
-  SELECT
-    *
-  FROM
-    filtered
-  WHERE
-    channel = 'release'
-    AND os = 'Windows'
-    AND sample_id >= @min_sample_id
-    AND sample_id <= @max_sample_id
+    OR (
+      channel = "release"
+      AND os = "Windows"
+      AND sample_id >= @min_sample_id
+      AND sample_id <= @max_sample_id
+    )
 ),
 grouped_metrics AS (
   SELECT

sql/telemetry_derived/clients_daily_keyed_scalar_aggregates_v1/query.sql

@@ -354,16 +354,12 @@ sampled_data AS (
   WHERE
     channel IN ("nightly", "beta")
     OR (channel = "release" AND os != "Windows")
-  UNION ALL
-  SELECT
-    *
-  FROM
-    flattened_metrics
-  WHERE
-    channel = 'release'
-    AND os = 'Windows'
-    AND sample_id >= @min_sample_id
-    AND sample_id <= @max_sample_id
+    OR (
+      channel = "release"
+      AND os = "Windows"
+      AND sample_id >= @min_sample_id
+      AND sample_id <= @max_sample_id
+    )
 ),
 -- Using `min` for when `agg_type` is `count` returns null when all rows are null
 aggregated AS (

sql/telemetry_derived/clients_daily_scalar_aggregates_v1.sql.py

@@ -73,15 +73,10 @@ def generate_sql(
             FROM {querying_table}
             WHERE channel IN ("nightly", "beta")
                 OR (channel = "release" AND os != "Windows")
-
-            UNION ALL
-
-            SELECT *
-            FROM {querying_table}
-            WHERE channel = 'release'
-                AND os = 'Windows'
-                AND sample_id >= @min_sample_id
-                AND sample_id <= @max_sample_id
+                OR (channel = "release" AND
+                    os = "Windows" AND
+                    sample_id >= @min_sample_id AND
+                    sample_id <= @max_sample_id)
         ),
 
         -- Using `min` for when `agg_type` is `count` returns null when all rows are null

sql/telemetry_derived/clients_daily_scalar_aggregates_v1/query.sql

@@ -23,16 +23,12 @@ sampled_data AS (
   WHERE
     channel IN ("nightly", "beta")
     OR (channel = "release" AND os != "Windows")
-  UNION ALL
-  SELECT
-    *
-  FROM
-    filtered
-  WHERE
-    channel = 'release'
-    AND os = 'Windows'
-    AND sample_id >= @min_sample_id
-    AND sample_id <= @max_sample_id
+    OR (
+      channel = "release"
+      AND os = "Windows"
+      AND sample_id >= @min_sample_id
+      AND sample_id <= @max_sample_id
+    )
 ),
 -- Using `min` for when `agg_type` is `count` returns null when all rows are null
 aggregated AS (