Merge "tp: partially revert aosp/2977479" into main

google · Mar 4, 2024 · e6db6e7 · e6db6e7
2 parents 0be7bdd + 4f8f413
commit e6db6e7
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc b/src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc
@@ -499,15 +499,9 @@ base::Status PerfettoSqlEngine::ExecuteCreateTable(
   runtime_tables_.Insert(create_table.name, std::move(table));
   base::StackString<1024> create("CREATE VIRTUAL TABLE %s USING runtime_table",
                                  create_table.name.c_str());
-  auto status =
-      Execute(SqlSource::FromTraceProcessorImplementation(create.ToStdString()))
-          .status();
-  if (!status.ok()) {
-    // If the registration of the table with SQLite failed, erase the state
-    // we hold.
-    PERFETTO_CHECK(runtime_tables_.Erase(create_table.name));
-  }
-  return status;
+  return Execute(
+             SqlSource::FromTraceProcessorImplementation(create.ToStdString()))
+      .status();
 }
 
 base::Status PerfettoSqlEngine::ExecuteCreateView(
@@ -734,16 +728,10 @@ base::Status PerfettoSqlEngine::ExecuteCreateFunction(
 
   base::StackString<1024> create(
       "CREATE VIRTUAL TABLE %s USING runtime_table_function", fn_name.c_str());
-  auto status = Execute(cf.sql.RewriteAllIgnoreExisting(
-                            SqlSource::FromTraceProcessorImplementation(
-                                create.ToStdString())))
-                    .status();
-  if (!status.ok()) {
-    // If the registration of the table with SQLite failed, erase the state
-    // we hold.
-    PERFETTO_CHECK(runtime_table_fn_states_.Erase(lower_name));
-  }
-  return status;
+  return Execute(cf.sql.RewriteAllIgnoreExisting(
+                     SqlSource::FromTraceProcessorImplementation(
+                         create.ToStdString())))
+      .status();
 }
 
 base::Status PerfettoSqlEngine::ExecuteCreateMacro(