Skip to content

tp: compile each pipeline source through one relation step #7642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LalitMaganti merged 1 commit into from
Oct 1, 2026
Merged

tp: compile each pipeline source through one relation step #7642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 20 additions & 27 deletions src/trace_processor/perfetto_sql/parser/perfetto_sql_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,28 +114,21 @@ base::StatusOr<PerfettoSqlParser::CreateFunction::Returns> BuildReturnType(
}

// ---------------------------------------------------------------------------
// Macro rewrite tree -> SqlSource
// Rewrite tree -> SqlSource
// ---------------------------------------------------------------------------

// Walks the flat list of macro rewrites produced by syntaqlite and, for a
// given AST node, builds a SqlSource whose `Rewriter` structure mirrors the
// nesting of macro calls. This lets SQLite-side error tracebacks resolve
// through macro expansions back to the authored call site.
//
// The flat list has O(N) entries reported in insertion order (outer macros
// before their nested calls). Rather than re-scanning the list for each
// rewrite we materialize a parent -> children adjacency once in the
// constructor, so every subsequent lookup descends the tree in O(subtree).
class MacroRewriteBuilder {
// The macro rewrites syntaqlite recorded for a statement, as a tree, taken
// when it is constructed. Gives the SqlSource of any AST node with them
// applied; the SqlSources nest like the rewrites, so SQLite errors trace back
// through every expansion to where the user wrote the text.
class RewriteTree {
public:
// `stmt_doc_offset` is the byte offset of the current statement within
// `stmt`. Syntaqlite v0.5 reports every layer-0 offset (node extents,
// spans, macro call offsets) statement-relative, so call sites that
// slice `stmt` add this offset to translate into document coordinates.
MacroRewriteBuilder(SyntaqliteParser* p,
const SqlSource& stmt,
uint32_t stmt_doc_offset,
const base::FlatHashMap<std::string, Macro>& macros)
// `stmt_doc_offset` is where the statement starts in `stmt`; syntaqlite
// reports offsets relative to the statement.
RewriteTree(SyntaqliteParser* p,
const SqlSource& stmt,
uint32_t stmt_doc_offset,
const base::FlatHashMap<std::string, Macro>& macros)
: p_(p), stmt_(stmt), stmt_doc_offset_(stmt_doc_offset), macros_(macros) {
uint32_t total = syntaqlite_result_rewrite_count(p_);
no_macros_ = (total == 0);
Expand Down Expand Up @@ -335,7 +328,7 @@ class MacroRewriteBuilder {
std::vector<uint32_t> source_rooted_;
};

SqlSource NodeSource(const MacroRewriteBuilder& rb, uint32_t node_id) {
SqlSource NodeSource(const RewriteTree& rb, uint32_t node_id) {
auto s = rb.NodeSource(node_id);
PERFETTO_CHECK(s.has_value());
return std::move(*s);
Expand All @@ -358,7 +351,7 @@ uint32_t CurrentStatementDocOffset(SyntaqliteParser* p) {

base::StatusOr<pipeline::LogicalPlan> CompilePipeline(
SyntaqliteParser* p,
const MacroRewriteBuilder& rb,
const RewriteTree& rb,
const pipeline::Catalog* catalog,
uint32_t pipeline_id) {
if (!catalog) {
Expand All @@ -373,7 +366,7 @@ base::StatusOr<pipeline::LogicalPlan> CompilePipeline(

base::StatusOr<PerfettoSqlParser::CreateTable::Body> ParseCreateTableBody(
SyntaqliteParser* p,
const MacroRewriteBuilder& rb,
const RewriteTree& rb,
const pipeline::Catalog* catalog,
const SyntaqliteCreatePerfettoTableStmt& n) {
using Body = PerfettoSqlParser::CreateTable::Body;
Expand All @@ -386,7 +379,7 @@ base::StatusOr<PerfettoSqlParser::CreateTable::Body> ParseCreateTableBody(

base::StatusOr<Statement> ParseCreateTable(
SyntaqliteParser* p,
const MacroRewriteBuilder& rb,
const RewriteTree& rb,
const pipeline::Catalog* catalog,
const SyntaqliteCreatePerfettoTableStmt& n) {
if (syntaqlite_node_is_present(n.table_impl)) {
Expand All @@ -409,7 +402,7 @@ base::StatusOr<Statement> ParseCreateTable(

base::StatusOr<Statement> ParseCreateView(
SyntaqliteParser* p,
const MacroRewriteBuilder& rb,
const RewriteTree& rb,
const SyntaqliteCreatePerfettoViewStmt& n) {
ASSIGN_OR_RETURN(auto schema, BuildArgDefs(p, n.schema));
std::string name = SpanText(p, n.view_name);
Expand All @@ -427,7 +420,7 @@ base::StatusOr<Statement> ParseCreateView(

base::StatusOr<Statement> ParseCreateFunction(
SyntaqliteParser* p,
const MacroRewriteBuilder& rb,
const RewriteTree& rb,
const SyntaqliteCreatePerfettoFunctionStmt& n) {
ASSIGN_OR_RETURN(auto args, BuildArgDefs(p, n.args));
for (const auto& arg : args) {
Expand Down Expand Up @@ -547,7 +540,7 @@ Statement ParseCreateMacro(SyntaqliteParser* p,
}

base::StatusOr<Statement> ParseStatement(SyntaqliteParser* p,
const MacroRewriteBuilder& rb,
const RewriteTree& rb,
const SqlSource& stmt,
uint32_t stmt_doc_offset,
const pipeline::Catalog* catalog,
Expand Down Expand Up @@ -734,7 +727,7 @@ bool PerfettoSqlParser::Impl::Next(
// source; callers that slice `stmt` add it back on.
uint32_t stmt_doc_offset = CurrentStatementDocOffset(synq);

MacroRewriteBuilder rb(synq, stmt, stmt_doc_offset, macros);
RewriteTree rb(synq, stmt, stmt_doc_offset, macros);
auto root_src = rb.NodeSource(root);
out_statement_sql = root_src.has_value() ? *std::move(root_src) : stmt;

Expand Down
Loading
Loading