tp: Rename storage::Storage to column::Column

Change-Id: I4b054333dcbd314c8dc16b59a3887f2bded29a46
diff --git a/Android.bp b/Android.bp
index 8363428..ee7f6b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2251,8 +2251,8 @@
         ":perfetto_src_shared_lib_test_protos_protos",
         ":perfetto_src_shared_lib_test_utils",
         ":perfetto_src_trace_processor_containers_containers",
+        ":perfetto_src_trace_processor_db_column_column",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_db_storage_storage",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
@@ -10761,6 +10761,47 @@
     ],
 }
 
+// GN: //src/trace_processor/db/column:column
+filegroup {
+    name: "perfetto_src_trace_processor_db_column_column",
+    srcs: [
+        "src/trace_processor/db/column/arrangement_overlay.cc",
+        "src/trace_processor/db/column/column.cc",
+        "src/trace_processor/db/column/dense_null_overlay.cc",
+        "src/trace_processor/db/column/dummy_storage.cc",
+        "src/trace_processor/db/column/id_storage.cc",
+        "src/trace_processor/db/column/null_overlay.cc",
+        "src/trace_processor/db/column/numeric_storage.cc",
+        "src/trace_processor/db/column/selector_overlay.cc",
+        "src/trace_processor/db/column/set_id_storage.cc",
+        "src/trace_processor/db/column/string_storage.cc",
+        "src/trace_processor/db/column/utils.cc",
+    ],
+}
+
+// GN: //src/trace_processor/db/column:fake_storage
+filegroup {
+    name: "perfetto_src_trace_processor_db_column_fake_storage",
+    srcs: [
+        "src/trace_processor/db/column/fake_storage.cc",
+    ],
+}
+
+// GN: //src/trace_processor/db/column:unittests
+filegroup {
+    name: "perfetto_src_trace_processor_db_column_unittests",
+    srcs: [
+        "src/trace_processor/db/column/arrangement_overlay_unittest.cc",
+        "src/trace_processor/db/column/dense_null_overlay_unittest.cc",
+        "src/trace_processor/db/column/id_storage_unittest.cc",
+        "src/trace_processor/db/column/null_overlay_unittest.cc",
+        "src/trace_processor/db/column/numeric_storage_unittest.cc",
+        "src/trace_processor/db/column/selector_overlay_unittest.cc",
+        "src/trace_processor/db/column/set_id_storage_unittest.cc",
+        "src/trace_processor/db/column/string_storage_unittest.cc",
+    ],
+}
+
 // GN: //src/trace_processor/db:compare
 filegroup {
     name: "perfetto_src_trace_processor_db_compare",
@@ -10779,47 +10820,6 @@
     ],
 }
 
-// GN: //src/trace_processor/db/storage:fake_storage
-filegroup {
-    name: "perfetto_src_trace_processor_db_storage_fake_storage",
-    srcs: [
-        "src/trace_processor/db/storage/fake_storage.cc",
-    ],
-}
-
-// GN: //src/trace_processor/db/storage:storage
-filegroup {
-    name: "perfetto_src_trace_processor_db_storage_storage",
-    srcs: [
-        "src/trace_processor/db/storage/arrangement_overlay.cc",
-        "src/trace_processor/db/storage/dense_null_overlay.cc",
-        "src/trace_processor/db/storage/dummy_storage.cc",
-        "src/trace_processor/db/storage/id_storage.cc",
-        "src/trace_processor/db/storage/null_overlay.cc",
-        "src/trace_processor/db/storage/numeric_storage.cc",
-        "src/trace_processor/db/storage/selector_overlay.cc",
-        "src/trace_processor/db/storage/set_id_storage.cc",
-        "src/trace_processor/db/storage/storage.cc",
-        "src/trace_processor/db/storage/string_storage.cc",
-        "src/trace_processor/db/storage/utils.cc",
-    ],
-}
-
-// GN: //src/trace_processor/db/storage:unittests
-filegroup {
-    name: "perfetto_src_trace_processor_db_storage_unittests",
-    srcs: [
-        "src/trace_processor/db/storage/arrangement_overlay_unittest.cc",
-        "src/trace_processor/db/storage/dense_null_overlay_unittest.cc",
-        "src/trace_processor/db/storage/id_storage_unittest.cc",
-        "src/trace_processor/db/storage/null_overlay_unittest.cc",
-        "src/trace_processor/db/storage/numeric_storage_unittest.cc",
-        "src/trace_processor/db/storage/selector_overlay_unittest.cc",
-        "src/trace_processor/db/storage/set_id_storage_unittest.cc",
-        "src/trace_processor/db/storage/string_storage_unittest.cc",
-    ],
-}
-
 // GN: //src/trace_processor/db:unittests
 filegroup {
     name: "perfetto_src_trace_processor_db_unittests",
@@ -13635,11 +13635,11 @@
         ":perfetto_src_shared_lib_unittests",
         ":perfetto_src_trace_processor_containers_containers",
         ":perfetto_src_trace_processor_containers_unittests",
+        ":perfetto_src_trace_processor_db_column_column",
+        ":perfetto_src_trace_processor_db_column_fake_storage",
+        ":perfetto_src_trace_processor_db_column_unittests",
         ":perfetto_src_trace_processor_db_compare",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_db_storage_fake_storage",
-        ":perfetto_src_trace_processor_db_storage_storage",
-        ":perfetto_src_trace_processor_db_storage_unittests",
         ":perfetto_src_trace_processor_db_unittests",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
@@ -14356,8 +14356,8 @@
         ":perfetto_src_protozero_proto_ring_buffer",
         ":perfetto_src_protozero_protozero",
         ":perfetto_src_trace_processor_containers_containers",
+        ":perfetto_src_trace_processor_db_column_column",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_db_storage_storage",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
@@ -14590,8 +14590,8 @@
         ":perfetto_src_protozero_proto_ring_buffer",
         ":perfetto_src_protozero_protozero",
         ":perfetto_src_trace_processor_containers_containers",
+        ":perfetto_src_trace_processor_db_column_column",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_db_storage_storage",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",