Skip to content

bench: yard_export emits predicate-owned subquery plans #2

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
Aly700 merged 2 commits into from
Sep 2, 2026
Merged

bench: yard_export emits predicate-owned subquery plans #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de892a
bench: yard_export emits predicate-owned subquery plans in the tree
Aly700 Sep 2, 2026
b63d0f9
docs: re-export yard routes with subquery trees
Aly700 Sep 2, 2026
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
62 changes: 59 additions & 3 deletions benchmarks/yard_export.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,49 @@ std::string node_detail(const std::string& line) {
return line.substr(bracket + 1, line.size() - bracket - 2);
}

struct OwnedSubquery {
std::string detail;
const plan::LogicalPlan* plan{nullptr};
};

void collect_scalar_subquery(const plan::BoundScalarExpr& expression,
std::vector<OwnedSubquery>& subqueries) {
if (const auto* subquery = std::get_if<plan::BoundScalarSubquery>(&expression.value);
subquery != nullptr && subquery->plan != nullptr) {
subqueries.push_back({"Subquery[" + subquery->name + "]", subquery->plan.get()});
}
}

void collect_predicate_subqueries(const plan::BoundPredicate& predicate,
std::vector<OwnedSubquery>& subqueries) {
if (predicate.kind == sql::PredicateKind::Comparison) {
collect_scalar_subquery(predicate.comparison.left, subqueries);
collect_scalar_subquery(predicate.comparison.right, subqueries);
}
Comment on lines +171 to +174

@chatgpt-codex-connector chatgpt-codex-connector Bot Sep 2, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Traverse scalar operands for every predicate kind

When a scalar subquery is used as the operand of IS NULL/IS NOT NULL, or as the left operand of IN/NOT IN, this comparison-only branch never visits predicate.null_check or predicate.in_value. As a result, yard_export omits those owned plans from the JSON tree (and for IN, emits only the membership subquery), even though the logical-plan printer includes both. Handle predicate kinds explicitly and collect scalar subqueries from each applicable operand.

Useful? React with 👍 / 👎.

if (predicate.subquery != nullptr) {
subqueries.push_back({"Subquery[" + predicate.subquery_name + "]", predicate.subquery.get()});
}
if (predicate.left != nullptr) collect_predicate_subqueries(*predicate.left, subqueries);
if (predicate.right != nullptr) collect_predicate_subqueries(*predicate.right, subqueries);
}

std::string tree_json(const plan::LogicalPlan& node, const execution::Catalog& catalog, int indent);

std::string subquery_tree_json(const OwnedSubquery& subquery,
const execution::Catalog& catalog,
int indent) {
const auto estimate = optimizer::estimate_cost(*subquery.plan, catalog);
const std::string pad(static_cast<std::size_t>(indent), ' ');
std::string out = "{\n" + pad + " \"op\": \"Subquery\"," +
"\n" + pad + " \"detail\": " + quoted(subquery.detail) +
",\n" + pad + " \"rows\": " + fixed(estimate.rows, 2) +
",\n" + pad + " \"cost\": " + fixed(estimate.cost, 2) +
",\n" + pad + " \"children\": [\n" + pad + " " +
tree_json(*subquery.plan, catalog, indent + 4) +
"\n" + pad + " ]\n" + pad + "}";
return out;
}

std::string tree_json(const plan::LogicalPlan& node, const execution::Catalog& catalog, int indent) {
const auto estimate = optimizer::estimate_cost(node, catalog);
const auto line = node_line(node);
Expand All @@ -166,10 +209,23 @@ std::string tree_json(const plan::LogicalPlan& node, const execution::Catalog& c
if (node.input) children.push_back(node.input.get());
if (node.left) children.push_back(node.left.get());
if (node.right) children.push_back(node.right.get());
for (std::size_t i = 0; i < children.size(); ++i) {
out += (i == 0 ? "\n" : ",\n") + pad + " " + tree_json(*children[i], catalog, indent + 4);
std::vector<OwnedSubquery> subqueries;
for (const auto& predicate : node.predicates) {
collect_predicate_subqueries(predicate, subqueries);
}
if (node.null_aware_predicate.has_value()) {
collect_predicate_subqueries(*node.null_aware_predicate, subqueries);
}
std::size_t child_index = 0;
for (const auto* child : children) {
out += (child_index++ == 0 ? "\n" : ",\n") + pad + " " +
tree_json(*child, catalog, indent + 4);
}
for (const auto& subquery : subqueries) {
out += (child_index++ == 0 ? "\n" : ",\n") + pad + " " +
subquery_tree_json(subquery, catalog, indent + 4);
}
out += children.empty() ? "]" : "\n" + pad + " ]";
out += child_index == 0 ? "]" : "\n" + pad + " ]";
out += "\n" + pad + "}";
return out;
}
Expand Down
Loading
Loading