tp: small fixes to whitespace, COALESCE in SQL

Change-Id: I20794354730f3bc0ca587cb0afe7ebe8564e4094
diff --git a/src/trace_processor/metrics/sql/android/android_batt.sql b/src/trace_processor/metrics/sql/android/android_batt.sql
index ff38549..196873d 100644
--- a/src/trace_processor/metrics/sql/android/android_batt.sql
+++ b/src/trace_processor/metrics/sql/android/android_batt.sql
@@ -75,7 +75,7 @@
                     ORDER BY ts
                     ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
                 ) < ts,
-                true
+                TRUE
             ) AS new_group
         FROM slice
         WHERE slice.name GLOB 'WakeLock *' AND dur != -1
diff --git a/src/trace_processor/metrics/sql/android/android_dvfs.sql b/src/trace_processor/metrics/sql/android/android_dvfs.sql
index 69b47a9..8a44207 100644
--- a/src/trace_processor/metrics/sql/android/android_dvfs.sql
+++ b/src/trace_processor/metrics/sql/android/android_dvfs.sql
@@ -22,7 +22,7 @@
     ts,
     value AS freq_value,
     LEAD(ts, 1, (SELECT end_ts + 1 FROM trace_bounds))
-      OVER (PARTITION BY track.id ORDER BY ts)  - ts AS duration
+      OVER (PARTITION BY track.id ORDER BY ts) - ts AS duration
   FROM counter
   LEFT JOIN track ON counter.track_id = track.id
   WHERE track.name GLOB "* Frequency"
diff --git a/src/trace_processor/metrics/sql/android/android_netperf.sql b/src/trace_processor/metrics/sql/android/android_netperf.sql
index f3e744f..e57f34a 100644
--- a/src/trace_processor/metrics/sql/android/android_netperf.sql
+++ b/src/trace_processor/metrics/sql/android/android_netperf.sql
@@ -163,7 +163,7 @@
             'gro_aggregation_ratio', (
               SELECT
                 CASE
-                  WHEN packets > 0 THEN '1:' || CAST( (cnt * 1.0 / packets) AS text)
+                  WHEN packets > 0 THEN '1:' || CAST((cnt * 1.0 / packets) AS text)
                   ELSE '0:' || cnt
                END
               FROM gro_rx_packet_count
@@ -278,14 +278,14 @@
 
 DROP VIEW IF EXISTS activated_cores_net_rx;
 CREATE VIEW activated_cores_net_rx AS
- SELECT
-   DISTINCT cpu
+ SELECT DISTINCT
+   cpu
  FROM net_rx_actions;
 
 DROP VIEW IF EXISTS activated_cores_net_tx;
 CREATE VIEW activated_cores_net_tx AS
- SELECT
-   DISTINCT cpu
+ SELECT DISTINCT
+   cpu
  FROM net_tx_actions;
 
 DROP VIEW IF EXISTS per_core_net_rx_action_statistic;
diff --git a/src/trace_processor/metrics/sql/android/android_simpleperf.sql b/src/trace_processor/metrics/sql/android/android_simpleperf.sql
index 5047eee..46a27ba 100644
--- a/src/trace_processor/metrics/sql/android/android_simpleperf.sql
+++ b/src/trace_processor/metrics/sql/android/android_simpleperf.sql
@@ -39,7 +39,7 @@
 CREATE VIEW simpleperf_event_raw AS
 SELECT
   SUBSTR(name, 0, tid_pos) AS name,
-  CAST(SUBSTR(name, tid_pos + 4, cpu_pos - tid_pos - 4) AS INT)  AS tid,
+  CAST(SUBSTR(name, tid_pos + 4, cpu_pos - tid_pos - 4) AS INT) AS tid,
   CAST(SUBSTR(name, cpu_pos + 4) AS INT) AS cpu,
   total
 FROM (
diff --git a/src/trace_processor/metrics/sql/android/android_startup.sql b/src/trace_processor/metrics/sql/android/android_startup.sql
index 98b6cee..fea5399 100644
--- a/src/trace_processor/metrics/sql/android/android_startup.sql
+++ b/src/trace_processor/metrics/sql/android/android_startup.sql
@@ -158,10 +158,10 @@
           MAIN_THREAD_TIME_FOR_LAUNCH_AND_STATE(launches.id, 'S'), 0
         ),
         'uninterruptible_io_sleep_dur_ns', IFNULL(
-          MAIN_THREAD_TIME_FOR_LAUNCH_STATE_AND_IO_WAIT(launches.id, 'D*', true), 0
+          MAIN_THREAD_TIME_FOR_LAUNCH_STATE_AND_IO_WAIT(launches.id, 'D*', TRUE), 0
         ),
         'uninterruptible_non_io_sleep_dur_ns', IFNULL(
-          MAIN_THREAD_TIME_FOR_LAUNCH_STATE_AND_IO_WAIT(launches.id, 'D*', false), 0
+          MAIN_THREAD_TIME_FOR_LAUNCH_STATE_AND_IO_WAIT(launches.id, 'D*', FALSE), 0
         )
 
       ),
@@ -327,7 +327,7 @@
 
         UNION ALL
         SELECT 'Main Thread - Time spent in Blocking I/O'
-        WHERE MAIN_THREAD_TIME_FOR_LAUNCH_STATE_AND_IO_WAIT(launches.id, 'D*', true) > 300e6
+        WHERE MAIN_THREAD_TIME_FOR_LAUNCH_STATE_AND_IO_WAIT(launches.id, 'D*', TRUE) > 300e6
 
         UNION ALL
         SELECT 'Time spent in OpenDexFilesFromOat*'
diff --git a/src/trace_processor/metrics/sql/android/android_sysui_cuj.sql b/src/trace_processor/metrics/sql/android/android_sysui_cuj.sql
index 39c4541..091886c 100644
--- a/src/trace_processor/metrics/sql/android/android_sysui_cuj.sql
+++ b/src/trace_processor/metrics/sql/android/android_sysui_cuj.sql
@@ -368,7 +368,8 @@
     STR_SPLIT(remainder, ",", 0) AS jank_cause,
     TRIM(SUBSTR(remainder, INSTR(remainder, ",") + 1)) AS remainder
     FROM split_jank_type
-    WHERE remainder <> "")
+    WHERE remainder <> ""
+)
   SELECT frame_number, jank_cause
   FROM split_jank_type
   WHERE jank_cause NOT IN ('', 'App Deadline Missed', 'None', 'Buffer Stuffing')
diff --git a/src/trace_processor/metrics/sql/android/jank/cujs_boundaries.sql b/src/trace_processor/metrics/sql/android/jank/cujs_boundaries.sql
index e0eebfa..ed280f7 100644
--- a/src/trace_processor/metrics/sql/android/jank/cujs_boundaries.sql
+++ b/src/trace_processor/metrics/sql/android/jank/cujs_boundaries.sql
@@ -78,7 +78,8 @@
   JOIN actual_frame_timeline_slice a
     ON e.upid = a.upid
     AND e.name = a.name
-  GROUP BY cuj_id, e.vsync, e.ts),
+  GROUP BY cuj_id, e.vsync, e.ts
+),
 -- Orders do_frame slices by vsync to calculate the ts_end of the previous frame
 -- android_jank_cuj_do_frame_slice only contains frames within the CUJ so
 -- the ts_prev_do_frame_end is always missing for the very first frame
@@ -179,7 +180,8 @@
   JOIN android_jank_cuj_do_frame_slice do_frame USING (cuj_id, vsync)
   JOIN descendant_slice(do_frame.id) post_and_wait
   WHERE post_and_wait.name = 'postAndWait'
-  GROUP BY draw_frame.cuj_id, draw_frame.utid, draw_frame.vsync)
+  GROUP BY draw_frame.cuj_id, draw_frame.utid, draw_frame.vsync
+)
 SELECT
   *,
   ts_end - ts AS dur
@@ -225,7 +227,8 @@
     -- In that case we compute the boundary based on the last doFrame and the
     -- CUJ markers.
     AND vsync_max = CAST(timeline_slice.name AS INTEGER)
-  GROUP BY cuj_id, cuj.upid, main_thread_boundary.ts)
+  GROUP BY cuj_id, cuj.upid, main_thread_boundary.ts
+)
 SELECT
   *,
   ts_end - ts AS dur
diff --git a/src/trace_processor/metrics/sql/android/jank/internal/derived_events.sql b/src/trace_processor/metrics/sql/android/jank/internal/derived_events.sql
index 8b2e8a7..822bbc6 100644
--- a/src/trace_processor/metrics/sql/android/jank/internal/derived_events.sql
+++ b/src/trace_processor/metrics/sql/android/jank/internal/derived_events.sql
@@ -22,7 +22,7 @@
   cuj.cuj_name AS track_name,
   boundary.ts,
   boundary.dur,
-  cuj.cuj_name || ' (adjusted, id=' || cuj_id || ') '  AS slice_name,
+  cuj.cuj_name || ' (adjusted, id=' || cuj_id || ') ' AS slice_name,
   'CUJ Boundaries' AS group_name
 FROM android_jank_cuj cuj
 JOIN android_jank_cuj_boundary boundary USING (cuj_id)
diff --git a/src/trace_processor/metrics/sql/android/mem_stats_priority_breakdown.sql b/src/trace_processor/metrics/sql/android/mem_stats_priority_breakdown.sql
index 645b8bb..0cc7221 100644
--- a/src/trace_processor/metrics/sql/android/mem_stats_priority_breakdown.sql
+++ b/src/trace_processor/metrics/sql/android/mem_stats_priority_breakdown.sql
@@ -31,16 +31,16 @@
     WHEN oom_score_val < -900 THEN 'native'
     WHEN oom_score_val < -800 THEN 'system'
     WHEN oom_score_val < -700 THEN 'persistent'
-    WHEN oom_score_val <  0   THEN 'persistent_service'
-    WHEN oom_score_val <  100 THEN 'foreground'
-    WHEN oom_score_val <  200 THEN 'visible'
-    WHEN oom_score_val <  300 THEN 'perceptible'
-    WHEN oom_score_val <  400 THEN 'backup'
-    WHEN oom_score_val <  500 THEN 'heavy_weight'
-    WHEN oom_score_val <  600 THEN 'service_a'
-    WHEN oom_score_val <  700 THEN 'home'
-    WHEN oom_score_val <  800 THEN 'prev'
-    WHEN oom_score_val <  900 THEN 'service_b'
+    WHEN oom_score_val < 0 THEN 'persistent_service'
+    WHEN oom_score_val < 100 THEN 'foreground'
+    WHEN oom_score_val < 200 THEN 'visible'
+    WHEN oom_score_val < 300 THEN 'perceptible'
+    WHEN oom_score_val < 400 THEN 'backup'
+    WHEN oom_score_val < 500 THEN 'heavy_weight'
+    WHEN oom_score_val < 600 THEN 'service_a'
+    WHEN oom_score_val < 700 THEN 'home'
+    WHEN oom_score_val < 800 THEN 'prev'
+    WHEN oom_score_val < 900 THEN 'service_b'
     ELSE 'cached'
   END AS priority,
   MIN(span.{{table_name}}_val) AS min_value,
diff --git a/src/trace_processor/metrics/sql/chrome/chrome_input_to_browser_intervals_template.sql b/src/trace_processor/metrics/sql/chrome/chrome_input_to_browser_intervals_template.sql
index e028f1fd..3cc2087 100644
--- a/src/trace_processor/metrics/sql/chrome/chrome_input_to_browser_intervals_template.sql
+++ b/src/trace_processor/metrics/sql/chrome/chrome_input_to_browser_intervals_template.sql
@@ -188,9 +188,7 @@
 AS
 SELECT
   *,
-  CASE
-    WHEN
-      (
+  NOT COALESCE((
         SELECT
           COUNT()
         FROM
@@ -200,10 +198,7 @@
           -- and is not a fling generated by the viz compositor thread(GPU process).
           ancestor_slices.name = "sendTouchEvent"
       )
-      = 1
-      THEN FALSE
-    ELSE TRUE
-    END AS blocked_gesture
+      = 1, FALSE) AS blocked_gesture
 FROM
   chrome_first_flow_per_gesture;
 
diff --git a/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_caused_by_scheduling.sql b/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_caused_by_scheduling.sql
index e1a6046..de38760 100644
--- a/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_caused_by_scheduling.sql
+++ b/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_caused_by_scheduling.sql
@@ -54,7 +54,7 @@
     SELECT * FROM (
       SELECT
         chrome_tasks.full_name AS full_name,
-        chrome_tasks.dur  AS dur,
+        chrome_tasks.dur AS dur,
         chrome_tasks.thread_dur AS thread_dur,
         chrome_tasks.ts AS ts,
         chrome_tasks.id,
diff --git a/src/trace_processor/metrics/sql/chrome/cpu_time_by_category.sql b/src/trace_processor/metrics/sql/chrome/cpu_time_by_category.sql
index 2981ebd..8bd8319 100644
--- a/src/trace_processor/metrics/sql/chrome/cpu_time_by_category.sql
+++ b/src/trace_processor/metrics/sql/chrome/cpu_time_by_category.sql
@@ -21,7 +21,7 @@
 -- category: name of the category column in the input table, which will be
 --   preserved in the output
 
-SELECT RUN_METRIC('chrome/chrome_processes.sql') ;
+SELECT RUN_METRIC('chrome/chrome_processes.sql');
 
 -- CPU time slices for Chrome threads.
 DROP VIEW IF EXISTS chrome_cpu_slices;
diff --git a/src/trace_processor/metrics/sql/chrome/event_latency_scroll_jank.sql b/src/trace_processor/metrics/sql/chrome/event_latency_scroll_jank.sql
index 6f151a6..ff48af7 100644
--- a/src/trace_processor/metrics/sql/chrome/event_latency_scroll_jank.sql
+++ b/src/trace_processor/metrics/sql/chrome/event_latency_scroll_jank.sql
@@ -81,7 +81,7 @@
   event_latency_with_track.dur,
  EXTRACT_ARG(event_latency_with_track.arg_set_id, "event_latency.event_type") AS event_type
 FROM event_latency_with_track INNER JOIN not_coalesced_event_latency
-ON event_latency_with_track.id =  not_coalesced_event_latency.event_latency_id
+ON event_latency_with_track.id = not_coalesced_event_latency.event_latency_id
 WHERE
   event_type IN (
     "GESTURE_SCROLL_BEGIN", "GESTURE_SCROLL_UPDATE",
diff --git a/src/trace_processor/metrics/sql/chrome/gesture_flow_event.sql b/src/trace_processor/metrics/sql/chrome/gesture_flow_event.sql
index 6a56d42..42a5d91 100644
--- a/src/trace_processor/metrics/sql/chrome/gesture_flow_event.sql
+++ b/src/trace_processor/metrics/sql/chrome/gesture_flow_event.sql
@@ -195,7 +195,8 @@
     curr.ancestor_ts,
     curr.ancestor_dur,
     curr.ancestor_ts + curr.ancestor_dur AS ancestor_end,
-    CASE WHEN curr.step IS NULL THEN
+    COALESCE(
+      curr.step,
       CASE WHEN
           prev.{{id_field}} != curr.{{id_field}}
           OR prev.trace_id != curr.trace_id
@@ -212,7 +213,7 @@
          'Unknown'
         END
       END
-    ELSE curr.step END AS step
+    ) AS step
   FROM
     {{prefix}}_latency_info_flow_step_filtered curr LEFT JOIN
     {{prefix}}_latency_info_flow_step_filtered prev ON
diff --git a/src/trace_processor/metrics/sql/chrome/rail_modes.sql b/src/trace_processor/metrics/sql/chrome/rail_modes.sql
index 725ea7e..ca7e3fa 100644
--- a/src/trace_processor/metrics/sql/chrome/rail_modes.sql
+++ b/src/trace_processor/metrics/sql/chrome/rail_modes.sql
@@ -336,10 +336,10 @@
 FROM (
     SELECT ts,
       SUM(scroll_increment) OVER(ROWS UNBOUNDED PRECEDING) AS scroll_total,
-      SUM(pinch_increment)  OVER(ROWS UNBOUNDED PRECEDING) AS pinch_total,
-      SUM(touch_increment)  OVER(ROWS UNBOUNDED PRECEDING) AS touch_total,
-      SUM(fling_increment)  OVER(ROWS UNBOUNDED PRECEDING) AS fling_total,
-      SUM(pointer_increment)  OVER(ROWS UNBOUNDED PRECEDING) AS pointer_total
+      SUM(pinch_increment) OVER(ROWS UNBOUNDED PRECEDING) AS pinch_total,
+      SUM(touch_increment) OVER(ROWS UNBOUNDED PRECEDING) AS touch_total,
+      SUM(fling_increment) OVER(ROWS UNBOUNDED PRECEDING) AS fling_total,
+      SUM(pointer_increment) OVER(ROWS UNBOUNDED PRECEDING) AS pointer_total
     FROM input_begin_end_slices
   );
 
@@ -512,7 +512,8 @@
 WITH const (end_ts) AS (SELECT ts + dur
               FROM unmerged_modified_rail_slices
               ORDER BY ts DESC
-              LIMIT 1)
+              LIMIT 1
+)
 SELECT ROW_NUMBER() OVER () AS id, lag(next_ts) OVER() AS ts,
   ts + dur - lag(next_ts) OVER() AS dur,
   mode AS mode
diff --git a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause.sql b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause.sql
index 2b66ada..291fa90 100644
--- a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause.sql
+++ b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause.sql
@@ -62,16 +62,10 @@
     THEN
       FALSE
     ELSE
-      CASE WHEN
-        blocking_touch_move
+      COALESCE(blocking_touch_move
         OR blocked_by_language_detection
         OR blocked_by_copy_request
-        OR blocked_by_bitmap
-      THEN
-        TRUE
-      ELSE
-        FALSE
-      END
+        OR blocked_by_bitmap, FALSE)
     END AS explained_jank,
     jank.*
   FROM scroll_jank_cause_joined jank;
diff --git a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_blocking_task.sql b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_blocking_task.sql
index 1efae94..d8b71ae 100644
--- a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_blocking_task.sql
+++ b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_blocking_task.sql
@@ -198,23 +198,11 @@
   copy.dur,
   copy.track_id,
   CASE WHEN copy.track_id = scroll.browser_track_id THEN
-    CASE WHEN copy.ts < scroll.browser_flow_ts THEN
-      TRUE
-    ELSE
-      FALSE
-    END
+    COALESCE(copy.ts < scroll.browser_flow_ts, FALSE)
   WHEN copy.track_id = scroll.viz_track_id THEN
-    CASE WHEN copy.ts < scroll.viz_flow_ts THEN
-      TRUE
-    ELSE
-      FALSE
-    END
+    COALESCE(copy.ts < scroll.viz_flow_ts, FALSE)
   WHEN copy.track_id = scroll.gpu_track_id THEN
-    CASE WHEN copy.ts < scroll.gpu_flow_ts THEN
-      TRUE
-    ELSE
-      FALSE
-    END
+    COALESCE(copy.ts < scroll.gpu_flow_ts, FALSE)
   ELSE
     FALSE
   END AS blocked_by_copy
@@ -260,11 +248,7 @@
   lang.dur,
   lang.track_id,
   CASE WHEN lang.track_id = scroll.browser_track_id THEN
-    CASE WHEN lang.ts < scroll.browser_flow_ts THEN
-      TRUE
-    ELSE
-      FALSE
-    END
+    COALESCE(lang.ts < scroll.browser_flow_ts, FALSE)
   END AS blocked_by_language_detection
 FROM
   scroll_with_browser_gpu_and_viz_flows scroll JOIN
diff --git a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_get_bitmap.sql b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_get_bitmap.sql
index 6cac479..47406cd 100644
--- a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_get_bitmap.sql
+++ b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_get_bitmap.sql
@@ -141,29 +141,14 @@
   bitmap.ts,
   bitmap.dur,
   bitmap.track_id,
-  CASE WHEN
-      bitmap.track_id = scroll.browser_track_id
-      AND bitmap.ts < scroll.browser_flow_ts THEN
-    TRUE
-  ELSE
-    FALSE
-  END AS blocked_by_bitmap,
-  CASE WHEN
-      bitmap.track_id = scroll.browser_track_id
+  COALESCE(bitmap.track_id = scroll.browser_track_id
+      AND bitmap.ts < scroll.browser_flow_ts, FALSE) AS blocked_by_bitmap,
+  COALESCE(bitmap.track_id = scroll.browser_track_id
       AND bitmap.toolbar_id IS NOT NULL
-      AND bitmap.ts < scroll.browser_flow_ts THEN
-    TRUE
-  ELSE
-    FALSE
-  END AS blocked_by_toolbar,
-  CASE WHEN
-      bitmap.track_id = scroll.browser_track_id
+      AND bitmap.ts < scroll.browser_flow_ts, FALSE) AS blocked_by_toolbar,
+  COALESCE(bitmap.track_id = scroll.browser_track_id
       AND bitmap.toolbar_id IS NULL
-      AND bitmap.ts < scroll.browser_flow_ts THEN
-    TRUE
-  ELSE
-    FALSE
-  END AS blocked_by_bitmap_no_toolbar
+      AND bitmap.ts < scroll.browser_flow_ts, FALSE) AS blocked_by_bitmap_no_toolbar
 FROM
   scroll_with_browser_flows scroll JOIN
   get_bitmaps_and_toolbar bitmap ON
diff --git a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql
index 9c95d47..dc62e79 100644
--- a/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql
+++ b/src/trace_processor/metrics/sql/chrome/scroll_jank_cause_queuing_delay.sql
@@ -256,22 +256,22 @@
         descendant_id
       ELSE
         NULL
-      END
-    , "-") AS descendant_id,
+      END,
+    "-") AS descendant_id,
     GROUP_CONCAT(
       CASE WHEN descendant_depth < invalid_depth OR descendant_major_slice THEN
         descendant_ts
       ELSE
         NULL
-      END
-    , "-") AS descendant_ts,
+      END,
+    "-") AS descendant_ts,
     GROUP_CONCAT(
       CASE WHEN descendant_depth < invalid_depth OR descendant_major_slice THEN
         descendant_dur
       ELSE
         NULL
-      END
-    , "-") AS descendant_dur,
+      END,
+    "-") AS descendant_dur,
     GROUP_CONCAT(
       CASE WHEN descendant_depth < invalid_depth OR descendant_major_slice THEN
         descendant_name
@@ -283,22 +283,22 @@
         descendant_thread_dur
       ELSE
         NULL
-      END
-    , "-") AS descendant_thread_dur,
+      END,
+    "-") AS descendant_thread_dur,
     GROUP_CONCAT(
       CASE WHEN descendant_depth < invalid_depth OR descendant_major_slice THEN
         descendant_cpu_percentage
       ELSE
         NULL
-      END
-    , "-") AS descendant_cpu_time,
+      END,
+    "-") AS descendant_cpu_time,
     GROUP_CONCAT(
       CASE WHEN descendant_category = "mojom" THEN
         descendant_name
       ELSE
         NULL
-      END
-    , "-") AS mojom_name,
+      END,
+    "-") AS mojom_name,
     -- All ipc_hashes should be equal so just select the first non-null one.
     MIN(descendant_ipc_hash) AS mojom_ipc_hash,
     GROUP_CONCAT(
@@ -308,15 +308,15 @@
           descendant_name
       ELSE
           NULL
-      END
-    , "-") AS toplevel_name,
+      END,
+    "-") AS toplevel_name,
     GROUP_CONCAT(
       CASE WHEN descendant_category = "Java" THEN
         descendant_name
       ELSE
         NULL
-      END
-    , "-") AS java_name
+      END,
+    "-") AS java_name
   FROM
     blocking_tasks_queuing_delay_with_invalid_depth
   GROUP BY 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20
diff --git a/src/trace_processor/metrics/sql/webview/webview_power_usage.sql b/src/trace_processor/metrics/sql/webview/webview_power_usage.sql
index f74709d..71e8e2a 100644
--- a/src/trace_processor/metrics/sql/webview/webview_power_usage.sql
+++ b/src/trace_processor/metrics/sql/webview/webview_power_usage.sql
@@ -177,7 +177,7 @@
 FROM host_app_threads
   WHERE name GLOB 'Chrome*' OR name GLOB 'CookieMonster*'
   OR name GLOB 'CompositorTileWorker*' OR name GLOB 'ThreadPool*ground*'
-  OR NAME GLOB 'ThreadPoolService*' OR  name GLOB 'VizCompositorThread*'
+  OR NAME GLOB 'ThreadPoolService*' OR name GLOB 'VizCompositorThread*'
   OR name IN ('AudioThread', 'DedicatedWorker thread', 'GpuMemoryThread',
   'JavaBridge', 'LevelDBEnv.IDB', 'MemoryInfra', 'NetworkService', 'VizWebView');