commit a45f09774c5aebb9d05add4dd0e7f79da410559f
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 20 02:02:39 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 20 02:02:39 2024 +0000
tree 977d3678033333616269c551ec98aaf94fe5eed3
parent e9807b4e88fd7c732e459b3db815ee43d9d59c10
parent d8a389d920b2fb41c07d9c4c7f7cd917a2d4d15f

Merge "Fix incorrect GCA RSS memory calculation" into main

src/trace_processor/metrics/sql/android/android_camera.sql

diff --git a/src/trace_processor/metrics/sql/android/android_camera.sql b/src/trace_processor/metrics/sql/android/android_camera.sql
index 1d54753..c5f2c24 100644
--- a/src/trace_processor/metrics/sql/android/android_camera.sql
+++ b/src/trace_processor/metrics/sql/android/android_camera.sql
@@ -28,8 +28,11 @@
 SELECT ts, dur, rss_val AS gca_rss_val
 FROM rss_and_swap_span
 JOIN (
-  SELECT max(start_ts), upid
+  SELECT max(rss), upid
   FROM process
+  JOIN (
+    SELECT max(rss_val) as rss, upid FROM rss_and_swap_span GROUP BY upid
+  ) USING (upid)
   WHERE name GLOB '*GoogleCamera'
     OR name GLOB '*googlecamera.fishfood'
     OR name GLOB '*GoogleCameraEng'