commit 00537760e451a2441306f4deca264a16022683b7
author Hector Dearman <hjd@google.com> Tue May 25 09:08:06 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 25 09:08:06 2021 +0000
tree 7cb58dba3cd6cd8bfc16ee114f54a5dc7896238d
parent d8838a4b169dda670d3a9c95e47574109c9663b0
parent d6fe0ee983df18d1f3be8a0d0b37cda6200e986f

Merge "ui: Convert cpu_profile to new query API"

ui/src/tracks/cpu_profile/controller.ts

diff --git a/ui/src/tracks/cpu_profile/controller.ts b/ui/src/tracks/cpu_profile/controller.ts
index 070cedb..0042888 100644
--- a/ui/src/tracks/cpu_profile/controller.ts
+++ b/ui/src/tracks/cpu_profile/controller.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {slowlyCountRows} from '../../common/query_iterator';
+import {iter, NUM, slowlyCountRows} from '../../common/query_iterator';
 import {
   TrackController,
   trackControllerRegistry
@@ -28,9 +28,13 @@
   static readonly kind = CPU_PROFILE_TRACK_KIND;
   async onBoundsChange(start: number, end: number, resolution: number):
       Promise<Data> {
-    const query = `select id, ts, callsite_id from cpu_profile_stack_sample
-        where utid = ${this.config.utid}
-        order by ts`;
+    const query = `select
+        id,
+        ts,
+        callsite_id as callsiteId
+      from cpu_profile_stack_sample
+      where utid = ${this.config.utid}
+      order by ts`;
 
     const result = await this.query(query);
 
@@ -45,10 +49,11 @@
       callsiteId: new Uint32Array(numRows),
     };
 
-    for (let row = 0; row < numRows; row++) {
-      data.ids[row] = +result.columns[0].longValues![row];
-      data.tsStarts[row] = +result.columns[1].longValues![row];
-      data.callsiteId[row] = +result.columns[2].longValues![row];
+    const it = iter({id: NUM, ts: NUM, callsiteId: NUM}, result);
+    for (let i = 0; it.valid(); it.next(), ++i) {
+      data.ids[i] = it.row.id;
+      data.tsStarts[i] = it.row.ts;
+      data.callsiteId[i] = it.row.callsiteId;
     }
 
     return data;