Merge "tp: fix hasty autosubmit+1 merge failures" into main
diff --git a/src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc b/src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc
index d4cc628..8b2e548 100644
--- a/src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc
+++ b/src/trace_processor/perfetto_sql/engine/perfetto_sql_engine.cc
@@ -223,7 +223,7 @@
if (parser.Next()) {
return base::ErrStatus("Too many statements found to prepare");
}
- return stmt;
+ return std::move(stmt);
}
void PerfettoSqlEngine::RegisterStaticTable(Table* table,
diff --git a/src/trace_processor/perfetto_sql/intrinsics/types/value.h b/src/trace_processor/perfetto_sql/intrinsics/types/value.h
index bdfda97..026ee23 100644
--- a/src/trace_processor/perfetto_sql/intrinsics/types/value.h
+++ b/src/trace_processor/perfetto_sql/intrinsics/types/value.h
@@ -36,7 +36,7 @@
} else if constexpr (std::is_same_v<T, std::string>) {
return 3;
} else {
- static_assert(false);
+ static_assert(!sizeof(T*), "T is not supported");
}
}
diff --git a/test/trace_processor/diff_tests/parser/parsing/tests.py b/test/trace_processor/diff_tests/parser/parsing/tests.py
index 988a430..c5a4b46 100644
--- a/test/trace_processor/diff_tests/parser/parsing/tests.py
+++ b/test/trace_processor/diff_tests/parser/parsing/tests.py
@@ -759,7 +759,7 @@
SELECT
freq,
GROUP_CONCAT(cpu) AS cpus
- FROM cpu_frequencies
+ FROM cpu_available_frequencies
GROUP BY freq
ORDER BY freq;
""",
@@ -1395,7 +1395,7 @@
SELECT
freq,
GROUP_CONCAT(cpu.cpu) AS cpus
- FROM cpu_frequencies
+ FROM cpu_available_frequencies
JOIN cpu using (ucpu)
WHERE machine_id is not NULL
GROUP BY freq
diff --git a/test/trace_processor/diff_tests/stdlib/graphs/scan_tests.py b/test/trace_processor/diff_tests/stdlib/graphs/scan_tests.py
index 6c05cf0..f88dd2a 100644
--- a/test/trace_processor/diff_tests/stdlib/graphs/scan_tests.py
+++ b/test/trace_processor/diff_tests/stdlib/graphs/scan_tests.py
@@ -134,7 +134,7 @@
"id","min_depth"
0,0
1,1
- 2,2
+ 2,1
3,2
4,0
5,1
