tp: Remove Android IO tables depending on raw

Bug:329344794
Change-Id: I8fbf4c28c5c117ddb51f7d71bc8c677aece4eb9d

src/trace_processor/metrics/sql/android/android_io.sql

diff --git a/src/trace_processor/metrics/sql/android/android_io.sql b/src/trace_processor/metrics/sql/android/android_io.sql
index 657f85f..3950906 100644
--- a/src/trace_processor/metrics/sql/android/android_io.sql
+++ b/src/trace_processor/metrics/sql/android/android_io.sql
@@ -44,6 +44,6 @@
                 'distinct_thread_count', distinct_thread_count
             )
         )
-        FROM android_io_f2fs_aggregate_write_stats
+        FROM _android_io_f2fs_aggregate_write_stats
     )
 );
\ No newline at end of file

src/trace_processor/metrics/sql/android/android_io_unagg.sql

diff --git a/src/trace_processor/metrics/sql/android/android_io_unagg.sql b/src/trace_processor/metrics/sql/android/android_io_unagg.sql
index 5be4c22..bcbfb04 100644
--- a/src/trace_processor/metrics/sql/android/android_io_unagg.sql
+++ b/src/trace_processor/metrics/sql/android/android_io_unagg.sql
@@ -30,6 +30,6 @@
                 'dev', dev
             )
         )
-        FROM android_io_f2fs_write_stats
+        FROM _android_io_f2fs_write_stats
     )
 );
\ No newline at end of file

src/trace_processor/perfetto_sql/stdlib/android/io.sql

diff --git a/src/trace_processor/perfetto_sql/stdlib/android/io.sql b/src/trace_processor/perfetto_sql/stdlib/android/io.sql
index b5d7021..304a018 100644
--- a/src/trace_processor/perfetto_sql/stdlib/android/io.sql
+++ b/src/trace_processor/perfetto_sql/stdlib/android/io.sql
@@ -13,8 +13,10 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 
+-- TODO(b/329344794): Rewrite to fetch data from other tables than `raw`.
+
 -- Aggregates f2fs IO and latency stats by counter name.
-CREATE PERFETTO VIEW android_io_f2fs_counter_stats(
+CREATE PERFETTO VIEW _android_io_f2fs_counter_stats(
   -- Counter name on which all the other values are aggregated on.
   name STRING,
   -- Sum of all counter values for the counter name.
@@ -45,7 +47,7 @@
 ORDER BY sum DESC;
 
 -- Aggregates f2fs_write stats by inode and thread.
-CREATE PERFETTO VIEW android_io_f2fs_write_stats(
+CREATE PERFETTO VIEW _android_io_f2fs_write_stats(
   -- Utid of the thread.
   utid INT,
   -- Tid of the thread.
@@ -99,7 +101,7 @@
 
 -- Aggregates f2fs write stats. Counts distinct datapoints, total write operations,
 -- and bytes written
-CREATE PERFETTO VIEW android_io_f2fs_aggregate_write_stats(
+CREATE PERFETTO VIEW _android_io_f2fs_aggregate_write_stats(
   -- Total number of writes in the trace.
   total_write_count INT,
   -- Number of distinct processes.
@@ -119,4 +121,4 @@
       COUNT(DISTINCT dev) as distinct_device_count,
       COUNT(DISTINCT ino) distict_inode_count,
       COUNT(DISTINCT tid) distinct_thread_count
-from android_io_f2fs_write_stats;
\ No newline at end of file
+from _android_io_f2fs_write_stats;
\ No newline at end of file

test/trace_processor/diff_tests/stdlib/android/tests.py

diff --git a/test/trace_processor/diff_tests/stdlib/android/tests.py b/test/trace_processor/diff_tests/stdlib/android/tests.py
index 07801ad..a3ec34f 100644
--- a/test/trace_processor/diff_tests/stdlib/android/tests.py
+++ b/test/trace_processor/diff_tests/stdlib/android/tests.py
@@ -392,7 +392,7 @@
         trace=DataPath('android_monitor_contention_trace.atr'),
         query="""
       INCLUDE PERFETTO MODULE android.io;
-      SELECT * FROM android_io_f2fs_counter_stats;
+      SELECT * FROM _android_io_f2fs_counter_stats;
       """,
         out=Csv("""
         "name","sum","max","min","dur","count","avg"
@@ -452,7 +452,7 @@
         trace=DataPath('android_monitor_contention_trace.atr'),
         query="""
       INCLUDE PERFETTO MODULE android.io;
-      SELECT tid, thread_name, pid, process_name, ino, dev, bytes, write_count FROM android_io_f2fs_write_stats;
+      SELECT tid, thread_name, pid, process_name, ino, dev, bytes, write_count FROM _android_io_f2fs_write_stats;
       """,
         out=Csv("""
         "tid","thread_name","pid","process_name","ino","dev","bytes","write_count"
@@ -479,7 +479,7 @@
         INCLUDE PERFETTO MODULE android.io;
         SELECT total_write_count, distinct_processes, total_bytes_written,
                distinct_device_count, distict_inode_count, distinct_thread_count
-        FROM android_io_f2fs_aggregate_write_stats
+        FROM _android_io_f2fs_aggregate_write_stats
         """,
         out=Csv("""
         "total_write_count","distinct_processes","total_bytes_written","distinct_device_count","distict_inode_count","distinct_thread_count"