Skip to content

Optimise SchemaFrame::is_reachable #2231

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
jviotti merged 1 commit into from
Feb 4, 2026
Merged

Optimise SchemaFrame::is_reachable #2231

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
28 changes: 20 additions & 8 deletions src/core/jsonschema/frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,9 @@ auto SchemaFrame::populate_reachability(const Location &base,
WeakPointer::Hasher, WeakPointer::Comparator>
has_non_pointer_location;

this->pointer_to_location_.reserve(this->locations_.size());
has_non_pointer_location.reserve(this->locations_.size());
pointers_with_non_orphan.reserve(this->locations_.size());
for (const auto &entry : this->locations_) {
auto [iterator, inserted] = this->pointer_to_location_.try_emplace(
std::cref(entry.second.pointer), std::vector<const Location *>{});
Expand Down Expand Up @@ -1715,6 +1718,7 @@ auto SchemaFrame::populate_reachability(const Location &base,
bool changed{true};
while (changed) {
changed = false;
std::vector<std::reference_wrapper<const WeakPointer>> newly_reachable;

auto write_iterator = unreachable_with_sources.begin();
for (auto read_iterator = unreachable_with_sources.begin();
Expand All @@ -1739,15 +1743,8 @@ auto SchemaFrame::populate_reachability(const Location &base,
}

if (became_reachable) {
const auto &reached_pointer{read_iterator->pointer.get()};
cache[read_iterator->pointer] = true;
for (auto &[cache_pointer, cache_reachable] : cache) {
if (!cache_reachable &&
cache_pointer.get().starts_with(reached_pointer) &&
pointers_with_non_orphan.contains(cache_pointer)) {
cache_reachable = true;
}
}
newly_reachable.push_back(read_iterator->pointer);
changed = true;
} else {
if (write_iterator != read_iterator) {
Expand All @@ -1758,6 +1755,21 @@ auto SchemaFrame::populate_reachability(const Location &base,
}
unreachable_with_sources.erase(write_iterator,
unreachable_with_sources.end());

for (auto &[cache_pointer, cache_reachable] : cache) {
if (cache_reachable) {
continue;
}
if (!pointers_with_non_orphan.contains(cache_pointer)) {
continue;
}
for (const auto &reached : newly_reachable) {
if (cache_pointer.get().starts_with(reached.get())) {
cache_reachable = true;
break;
}
}
}
}

return cache;
Expand Down