commit 8b80f0d2cd90ae9fb654271b1519fc8e28d66316
author Anna Mayzner <mayzner@google.com> Thu Jan 04 17:49:45 2024 +0000
committer Anna Mayzner <mayzner@google.com> Thu Jan 04 17:49:45 2024 +0000
tree 608ceba6f8ec085dde34448cb17ba0447a2dfdde
parent af1e9ac30fdf344ac58d2d5fb7a47ebef916fce2

tp: Rename Column to ColumnLegacy to prepare for deprecation

Change-Id: I539f7451e4a86d64ce8dfc93c082e79ffc30870b

src/trace_processor/tables/macros_internal.h

diff --git a/src/trace_processor/tables/macros_internal.h b/src/trace_processor/tables/macros_internal.h
index b2f1f15..22085f2 100644
--- a/src/trace_processor/tables/macros_internal.h
+++ b/src/trace_processor/tables/macros_internal.h
@@ -67,14 +67,14 @@
       : Table(pool), allow_inserts_(true), parent_(parent) {
     if (!parent) {
       overlays_.emplace_back();
-      columns_.emplace_back(Column::IdColumn(this, 0, 0));
+      columns_.emplace_back(ColumnLegacy::IdColumn(this, 0, 0));
       columns_.emplace_back(
-          Column("type", &type_, Column::kNonNull, this, 1, 0));
+          ColumnLegacy("type", &type_, ColumnLegacy::kNonNull, this, 1, 0));
       return;
     }
 
     overlays_.resize(parent->overlays().size() + 1);
-    for (const Column& col : parent->columns()) {
+    for (const ColumnLegacy& col : parent->columns()) {
       columns_.emplace_back(col, this, col.index_in_table(),
                             col.overlay_index());
     }
@@ -92,7 +92,7 @@
     }
     overlays_.emplace_back(ColumnStorageOverlay(row_count_));
 
-    for (const Column& col : parent.columns()) {
+    for (const ColumnLegacy& col : parent.columns()) {
       columns_.emplace_back(col, this, col.index_in_table(),
                             col.overlay_index());
     }

src/trace_processor/tables/py_tables_unittest.cc

diff --git a/src/trace_processor/tables/py_tables_unittest.cc b/src/trace_processor/tables/py_tables_unittest.cc
index 36facd6..502e372 100644
--- a/src/trace_processor/tables/py_tables_unittest.cc
+++ b/src/trace_processor/tables/py_tables_unittest.cc
@@ -50,8 +50,9 @@
   ASSERT_EQ(TestEventTable::ColumnIndex::arg_set_id, 3u);
 
   ASSERT_EQ(TestEventTable::ColumnFlag::ts,
-            Column::Flag::kSorted | Column::Flag::kNonNull);
-  ASSERT_EQ(TestEventTable::ColumnFlag::arg_set_id, Column::Flag::kNonNull);
+            ColumnLegacy::Flag::kSorted | ColumnLegacy::Flag::kNonNull);
+  ASSERT_EQ(TestEventTable::ColumnFlag::arg_set_id,
+            ColumnLegacy::Flag::kNonNull);
 }
 
 TEST_F(PyTablesUnittest, ArgsTableProprties) {
@@ -61,9 +62,9 @@
   ASSERT_EQ(TestArgsTable::ColumnIndex::type, 1u);
   ASSERT_EQ(TestArgsTable::ColumnIndex::arg_set_id, 2u);
 
-  ASSERT_EQ(TestArgsTable::ColumnFlag::arg_set_id, Column::Flag::kSorted |
-                                                       Column::Flag::kSetId |
-                                                       Column::Flag::kNonNull);
+  ASSERT_EQ(TestArgsTable::ColumnFlag::arg_set_id,
+            ColumnLegacy::Flag::kSorted | ColumnLegacy::Flag::kSetId |
+                ColumnLegacy::Flag::kNonNull);
 }
 
 TEST_F(PyTablesUnittest, InsertEvent) {
@@ -123,7 +124,7 @@
   ASSERT_EQ(row_ref->dur(), 10u);
 }
 TEST_F(PyTablesUnittest, ChildTableStatics) {
-  ASSERT_EQ(TestSliceTable::ColumnFlag::dur, Column::Flag::kNonNull);
+  ASSERT_EQ(TestSliceTable::ColumnFlag::dur, ColumnLegacy::Flag::kNonNull);
   ASSERT_EQ(TestSliceTable::ColumnIndex::id, 0u);
   ASSERT_EQ(TestSliceTable::ColumnIndex::type, 1u);
   ASSERT_EQ(TestSliceTable::ColumnIndex::ts, 2u);