commit a0ac59f3aa91004e00295a9cb1d4f1d3f827e513
author Luke Chang <lukechang@google.com> Wed Dec 15 15:29:43 2021 +0800
committer Luke Chang <lukechang@google.com> Wed Dec 15 15:41:36 2021 +0800
tree 913c0ce3fba9087262a06f36145d2a4a34417e1a
parent f9abf9948a180a56a3595ec54ff9f2f5c2c9947c

metric: fix incorrect function to remove suffix string

Bug: 210796750

Test: tools/diff_test_trace_processor.py <trace_processor_shell> \
      --trace-filter='netperf_metric'
Test: tools/diff_test_trace_processor.py <trace_processor_shell> \
      --query-metric-filter='netif_receive_skb'
Change-Id: I263c9b47726970a1c5b9580864071535d5721038

src/trace_processor/metrics/sql/android/android_netperf.sql

diff --git a/src/trace_processor/metrics/sql/android/android_netperf.sql b/src/trace_processor/metrics/sql/android/android_netperf.sql
index 900322f..afe6bd7 100644
--- a/src/trace_processor/metrics/sql/android/android_netperf.sql
+++ b/src/trace_processor/metrics/sql/android/android_netperf.sql
@@ -17,7 +17,7 @@
 CREATE VIEW rx_packets AS
   SELECT
     ts,
-    RTRIM(name, " Received KB") AS dev,
+    REPLACE(name, " Received KB", "") AS dev,
     EXTRACT_ARG(arg_set_id, 'cpu') AS cpu,
     EXTRACT_ARG(arg_set_id, 'len') AS len
   FROM counter c

test/trace_processor/network/netif_receive_skb.sql

diff --git a/test/trace_processor/network/netif_receive_skb.sql b/test/trace_processor/network/netif_receive_skb.sql
index 4ed6297..20dc468 100644
--- a/test/trace_processor/network/netif_receive_skb.sql
+++ b/test/trace_processor/network/netif_receive_skb.sql
@@ -1,6 +1,6 @@
 SELECT
   ts,
-  RTRIM(name, " Received KB") AS dev,
+  REPLACE(name, " Received KB", "") AS dev,
   EXTRACT_ARG(arg_set_id, 'cpu') AS cpu,
   EXTRACT_ARG(arg_set_id, 'len') AS len
 FROM